"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "layer0/Map.cpp" between
pymol-open-source-2.2.0.tar.gz and pymol-open-source-2.3.0.tar.gz

About: PyMOL is a Python-enhanced molecular graphics tool. It excels at 3D visualization of proteins, small molecules, density, surfaces, and trajectories. It also includes molecular editing, ray tracing, and movies. Open Source version.

Map.cpp  (pymol-open-source-2.2.0)	:	Map.cpp  (pymol-open-source-2.3.0)
skipping to change at line 29		skipping to change at line 29
#include"MemoryDebug.h"		#include"MemoryDebug.h"
#include"Err.h"		#include"Err.h"
#include"OOMac.h"		#include"OOMac.h"
#include"Map.h"		#include"Map.h"
#include"Setting.h"		#include"Setting.h"
#include"Feedback.h"		#include"Feedback.h"
#include"MemoryCache.h"		#include"MemoryCache.h"
#include"Base.h"		#include"Base.h"
#ifndef true
#define true 1
#endif
#ifndef false
#define false 0
#endif
static MapType *_MapNew(PyMOLGlobals * G, float range, float *vert, int nVert,		static MapType *_MapNew(PyMOLGlobals * G, float range, float *vert, int nVert,
float *extent, int *flag, int group_id, int block_id);		float *extent, int *flag, int group_id, int block_id);
float MapGetDiv(MapType * I)		float MapGetDiv(MapType * I)
{		{
return I->Div;		return I->Div;
}		}
void MapFree(MapType * I)		void MapFree(MapType * I)
{		{
skipping to change at line 591		skipping to change at line 583
int MapSetupExpress(MapType * I)		int MapSetupExpress(MapType * I)
{ /* setup a list of neighbors for each square */		{ /* setup a list of neighbors for each square */
PyMOLGlobals *G = I->G;		PyMOLGlobals *G = I->G;
int n = 0;		int n = 0;
int c, d, e, f, i, cm1, cp2, D1D2 = I->D1D2, D2 = I->Dim[2];		int c, d, e, f, i, cm1, cp2, D1D2 = I->D1D2, D2 = I->Dim[2];
int mx2 = I->iMax[2];		int mx2 = I->iMax[2];
int *link = I->Link;		int *link = I->Link;
int st, flag;		int st, flag;
int *i_ptr3, *i_ptr4, *i_ptr5;		int *i_ptr3, *i_ptr4, *i_ptr5;
int *e_list = NULL;		int *e_list = NULL;
#ifdef _MemoryCache_ON
int block_offset = I->block_base + cCache_map_elist_offset;
int group_id = I->group_id;
#endif
int mx0 = I->iMax[0], mx1 = I->iMax[1], a, am1, ap2, *i_ptr1, b, bm1, bp2, *i_ ptr2;		int mx0 = I->iMax[0], mx1 = I->iMax[1], a, am1, ap2, *i_ptr1, b, bm1, bp2, *i_ ptr2;
unsigned int mapSize;		unsigned int mapSize;
int ok = true;		int ok = true;
PRINTFD(G, FB_Map)		PRINTFD(G, FB_Map)
" MapSetupExpress-Debug: entered.\n" ENDFD;		" MapSetupExpress-Debug: entered.\n" ENDFD;
mapSize = I->Dim[0] * I->Dim[1] * I->Dim[2];		mapSize = I->Dim[0] * I->Dim[1] * I->Dim[2];
I->EHead =		I->EHead =
CacheCalloc(G, int, mapSize, group_id, I->block_base + cCache_map_ehead_offs et);		CacheCalloc(G, int, mapSize, group_id, I->block_base + cCache_map_ehead_offs et);
End of changes. 2 change blocks.
12 lines changed or deleted		0 lines changed or added

---