Fix histogram reset after recalculation
This commit is contained in:
1 parent
ef317dd366
commit
aae4b307fa
4 files changed
+15
-47
No files matched your search
+12
-37
@@ -50,31 +50,21 @@ typedef long long Int64;
|
||||
typedef unsigned long long UInt64;
|
||||
#endif
|
||||
|
||||
static inline void* mem_malloc( size_t nitems )
|
||||
{
|
||||
void *d;
|
||||
if( ( d = malloc( nitems ) ) == NULL )
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
return d;
|
||||
}
|
||||
|
||||
|
||||
static inline void mem_free( void *ptr )
|
||||
{
|
||||
if( ptr != NULL )
|
||||
{
|
||||
free( ptr );
|
||||
ptr = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
#define DATA_ALIGN 1 ///< use 32-bit aligned malloc/free
|
||||
#if DATA_ALIGN && _WIN32 && ( _MSC_VER > 1300 )
|
||||
#define xMalloc( len ) _aligned_malloc( len, 32 )
|
||||
#define xFree( ptr ) _aligned_free ( ptr )
|
||||
#define xMemSet( type, len, ptr )
|
||||
#else
|
||||
#define xMemSet( type, len, ptr ) memset ( ptr, 0, (len)*sizeof(type) )
|
||||
#define xMalloc( len ) malloc ( len )
|
||||
#define xFreeMem( ptr ) free ( ptr )
|
||||
#endif
|
||||
|
||||
static inline Void* xMallocMem( SizeT nitems )
|
||||
{
|
||||
Void *d;
|
||||
if( ( d = malloc( nitems ) ) == NULL )
|
||||
if( ( d = xMalloc( nitems ) ) == NULL )
|
||||
{
|
||||
printf( "malloc failed.\n" );
|
||||
return NULL;
|
||||
@@ -90,20 +80,6 @@ static inline Void* xCallocMem( SizeT nitems, SizeT size )
|
||||
return d;
|
||||
}
|
||||
|
||||
static inline Void xFreePointer( Void *pointer )
|
||||
{
|
||||
if( pointer != NULL )
|
||||
{
|
||||
free( pointer );
|
||||
pointer = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
static inline Void xFreeMem( Void *mem )
|
||||
{
|
||||
xFreePointer( mem );
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
Int getMem1D( T **array1D, Int dim0 )
|
||||
{
|
||||
@@ -182,7 +158,7 @@ Void freeMem1D( T *array1D )
|
||||
{
|
||||
if( array1D )
|
||||
{
|
||||
mem_free( array1D );
|
||||
xFreeMem( array1D );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -258,7 +234,6 @@ Void freeMem3ImageComponents( T*** array3D )
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
} // NAMESPACE
|
||||
|
||||
#endif // __LIBMEMORY_H__
|
||||
Reference in new issue
Block a user