[trunk] WIP: update output filename of conformance dump test to be compatible with...

[openjpeg.git] / libopenjpeg / opj_includes.h

diff --git a/libopenjpeg/opj_includes.h b/libopenjpeg/opj_includes.h
index 4d48f2c8b9890b2e268170d4b0174ed174259236..d94237e7fbff290e120ab12337e81bc10a4451a6 100644 (file)
--- a/libopenjpeg/opj_includes.h
+++ b/libopenjpeg/opj_includes.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
@@ -40,6 +40,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <ctype.h>
+#include <assert.h>
 
 /*
  ==========================================================
@@ -54,13 +55,18 @@
  ==========================================================
 */
 
+/* Ignore GCC attributes if this is not GCC */
+#ifndef __GNUC__
+       #define __attribute__(x) /* __attribute__(x) */
+#endif
+
 /*
 The inline keyword is supported by C99 but not by C90. 
 Most compilers implement their own version of this keyword ... 
 */
 #ifndef INLINE
        #if defined(_MSC_VER)
-               #define INLINE __inline
+               #define INLINE __forceinline
        #elif defined(__GNUC__)
                #define INLINE __inline__
        #elif defined(__MWERKS__)
@@ -71,8 +77,38 @@ Most compilers implement their own version of this keyword ...
        #endif /* defined(<Compiler>) */
 #endif /* INLINE */
 
+/* Are restricted pointers available? (C99) */
+#if (__STDC_VERSION__ != 199901L)
+       /* Not a C99 compiler */
+       #ifdef __GNUC__
+               #define restrict __restrict__
+       #else
+               #define restrict /* restrict */
+       #endif
+#endif
+
+/* MSVC and Borland C do not have lrintf */
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+static INLINE long lrintf(float f){
+#ifdef _M_X64
+    return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f));
+#else
+    int i;
+ 
+    _asm{
+        fld f
+        fistp i
+    };
+ 
+    return i;
+#endif
+}
+#endif
+
 #include "j2k_lib.h"
+#include "opj_malloc.h"
 #include "event.h"
+#include "bio.h"
 #include "cio.h"
 
 #include "image.h"
@@ -84,19 +120,25 @@ Most compilers implement their own version of this keyword ...
 #include "raw.h"
 #include "bio.h"
 #include "tgt.h"
+#include "pi.h"
 #include "tcd.h"
 #include "t1.h"
 #include "dwt.h"
-#include "pi.h"
 #include "t2.h"
 #include "mct.h"
 #include "int.h"
 #include "fix.h"
 
+#include "cidx_manager.h"
+#include "indexbox_manager.h"
+
 /* JPWL>> */
 #ifdef USE_JPWL
-#include "../jpwl/jpwl.h"
+#include "./jpwl/jpwl.h"
 #endif /* USE_JPWL */
 /* <<JPWL */
 
+// V2
+#include "function_list.h"
+
 #endif /* OPJ_INCLUDES_H */