update j2k_lib with new opj type

[openjpeg.git] / libopenjpeg / j2k_lib.h

diff --git a/libopenjpeg/j2k_lib.h b/libopenjpeg/j2k_lib.h
index 84a68c06667cf9fa3c0e4e1dbe8b6af21aa42079..73a14c7dddd14c59aca4d8ed4aa773855d2f7a7d 100644 (file)
--- a/libopenjpeg/j2k_lib.h
+++ b/libopenjpeg/j2k_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Herv� Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -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 __GCC__
-#define __attribute__(x) /* */
-#endif
-
 /** @defgroup MISC MISC - Miscellaneous internal functions */
 /*@{*/
 
@@ -47,37 +43,7 @@ The functions in J2K_LIB.C are internal utilities mainly used for memory managem
 Difference in successive opj_clock() calls tells you the elapsed time
 @return Returns time in seconds
 */
-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
-*/
-#include <xmmintrin.h>
-#define opj_aligned_malloc(size)       _mm_malloc(size, 16)
-#define opj_aligned_free(m) _mm_free(m)
-
-/**
-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 );
+OPJ_FLOAT64 opj_clock(void);
 
 /* ----------------------------------------------------------------------- */
 /*@}*/