"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "contrib/champ/vla.c" between
pymol-v1.8.6.0.tar.bz2 and pymol-v2.1.0.tar.bz2

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.

vla.c  (pymol-v1.8.6.0.tar.bz2)	:	vla.c  (pymol-v2.1.0.tar.bz2)
skipping to change at line 68		skipping to change at line 68
#ifndef _os_memory_debug_on		#ifndef _os_memory_debug_on
void *VLAMalloc(unsigned int initSize,unsigned int recSize,unsigned int growFact or,int autoZero)		void *VLAMalloc(unsigned int initSize,unsigned int recSize,unsigned int growFact or,int autoZero)
#else		#else
void *_champVLAMalloc(const char *file,int line,unsigned int initSize,unsigned i nt recSize,unsigned int growFactor,int autoZero)		void *_champVLAMalloc(const char *file,int line,unsigned int initSize,unsigned i nt recSize,unsigned int growFactor,int autoZero)
#endif		#endif
{		{
VLARec *vla;		VLARec *vla;
#ifndef _os_memory_debug_on		#ifndef _os_memory_debug_on
if(autoZero)		if(autoZero)
vla=(void*)os_calloc((initSize*recSize)+sizeof(VLARec));		vla=(void*)os_calloc(1,(initSize*recSize)+sizeof(VLARec));
else		else
vla=(void*)os_malloc((initSize*recSize)+sizeof(VLARec));		vla=(void*)os_malloc((initSize*recSize)+sizeof(VLARec));
#else		#else
if(autoZero)		if(autoZero)
vla=OSMemoryCalloc(1,(initSize*recSize)+sizeof(VLARec),file,line,_OSMemoryVL A);		vla=OSMemoryCalloc(1,(initSize*recSize)+sizeof(VLARec),file,line,_OSMemoryVL A);
else		else
vla=OSMemoryMalloc((initSize*recSize)+sizeof(VLARec),file,line,_OSMemoryVLA) ;		vla=OSMemoryMalloc((initSize*recSize)+sizeof(VLARec),file,line,_OSMemoryVLA) ;
#endif		#endif
if(!vla)		if(!vla)
End of changes. 1 change blocks.
1 lines changed or deleted		1 lines changed or added

---