minor changes in cmake flags

[openjpeg.git] / libopenjpeg / j2k_lib.h

diff --git a/libopenjpeg/j2k_lib.h b/libopenjpeg/j2k_lib.h
index bb936c8b4dc75c5e33a721a1fd26191847f92b7e..7df4d367757186e518befee2f7b165ac00ef10a9 100644 (file)
--- a/libopenjpeg/j2k_lib.h
+++ b/libopenjpeg/j2k_lib.h
@@ -29,13 +29,9 @@
 @file j2k_lib.h
 @brief Internal functions
 
-The functions in J2K_LIB.C are internal utilities mainly used for memory management.
+The functions in J2K_LIB.C are internal utilities mainly used for timing.
 */
 
-#ifndef __GNUC__
-#define __attribute__(x) /* */
-#endif
-
 /** @defgroup MISC MISC - Miscellaneous internal functions */
 /*@{*/
 
@@ -49,71 +45,6 @@ Difference in successive opj_clock() calls tells you the elapsed time
 */
 double opj_clock(void);
 
-/**
-Allocate a memory block with elements initialized to 0
-@param size Bytes to allocate
-@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
-*/
-void* __attribute__ ((malloc)) opj_malloc( size_t size );
-
-/**
-Allocate memory aligned to a 16 byte boundry
-@param size Bytes to allocate
-@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
-*/
-#ifdef WIN32
-
-#ifdef __GNUC__
-#include <mm_malloc.h>
-#else /* MSVC, Intel C++ */
-#include <malloc.h>
-#endif
-
-#ifdef _mm_malloc
-  #define opj_aligned_malloc(size) _mm_malloc(size, 16)
-  #else
-  #define opj_aligned_malloc(size) malloc(size)
- #endif
- 
- #ifdef _mm_free
-  #define opj_aligned_free(m) _mm_free(m)
-  #else
-  #define opj_aligned_free(m) free(m)
- #endif
-
-#else /* Not WIN32 */
-
-/* Linux x86_64 and OSX always align allocations to 16 bytes */
-#if defined(__amd64__) || defined(__APPLE__)
-#define opj_aligned_malloc(size) malloc(size)
-#else
-extern int posix_memalign (void **, size_t, size_t);
-
-static INLINE void* __attribute__ ((malloc)) opj_aligned_malloc(size_t size){
-       void* mem = NULL;
-       posix_memalign(&mem, 16, size);
-       return mem;
-}
-#endif
-
-#define opj_aligned_free(m) free(m)
-
-#endif
-
-/**
-Reallocate memory blocks.
-@param memblock Pointer to previously allocated memory block
-@param size New size in bytes
-@return Returns a void pointer to the reallocated (and possibly moved) memory block
-*/
-void* __attribute__ ((malloc)) opj_realloc( void *memblock, size_t size );
-
-/**
-Deallocates or frees a memory block.
-@param memblock Previously allocated memory block to be freed
-*/
-void opj_free( void *memblock );
-
 /* ----------------------------------------------------------------------- */
 /*@}*/