[trunk] move typedef from opj_stdint.h to openjpeg.h and add an include of stdio...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b55c02af2965fcc1e9980a124c09202c9ca066a..946a76e461087b14354f1dfeea3e5efa4afb713e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,6 +187,7 @@ CHECK_INCLUDE_FILE("inttypes.h"     HAVE_INTTYPES_H)
 CHECK_INCLUDE_FILE("memory.h"       HAVE_MEMORY_H)
 CHECK_INCLUDE_FILE("stdint.h"       HAVE_STDINT_H)
 CHECK_INCLUDE_FILE("stdlib.h"       HAVE_STDLIB_H)
+CHECK_INCLUDE_FILE("stdio.h"        HAVE_STDIO_H)
 CHECK_INCLUDE_FILE("string.h"       HAVE_STRING_H)
 CHECK_INCLUDE_FILE("sys/stat.h"     HAVE_SYS_STAT_H)
 CHECK_INCLUDE_FILE("sys/types.h"    HAVE_SYS_TYPES_H)

diff --git a/src/lib/openjp2/openjpeg.h b/src/lib/openjp2/openjpeg.h
index e5104316c17a352c5c57dc8f3c16b68626ba0b81..9a2f107391ccb9027d011f308792df757345dd8d 100644 (file)
--- a/src/lib/openjp2/openjpeg.h
+++ b/src/lib/openjp2/openjpeg.h
@@ -80,7 +80,7 @@ defined with this macro as being exported.
 #endif /* OPJ_EXPORTS */
 #endif /* !OPJ_STATIC || !_WIN32 */
 
-typedef int OPJ_BOOL; /*FIXME it should be to follow the name of others OPJ_TYPE -> OPJ_BOOL*/
+typedef int OPJ_BOOL;
 #define OPJ_TRUE 1
 #define OPJ_FALSE 0
 
@@ -100,6 +100,11 @@ typedef uint32_t OPJ_UINT32;
 typedef int64_t  OPJ_INT64;
 typedef uint64_t OPJ_UINT64;
 
+typedef int64_t  OPJ_OFF_T; /* 64-bit file offset type */
+
+#include <stdio.h>
+typedef size_t   OPJ_SIZE_T;
+
 /* Avoid compile-time warning because parameter is not used */
 #define OPJ_ARG_NOT_USED(x) (void)(x)
 

diff --git a/src/lib/openjp2/opj_stdint.h b/src/lib/openjp2/opj_stdint.h
index 3dd2ec2ba379bef6f47daf137be09c5904415b97..fde17759e0b86bb0957dded001e5280533e9a019 100644 (file)
--- a/src/lib/openjp2/opj_stdint.h
+++ b/src/lib/openjp2/opj_stdint.h
@@ -43,10 +43,6 @@ typedef unsigned __int64  uint64_t;
 #error unsupported platform
 #endif
 #endif
-typedef size_t        OPJ_SIZE_T;
-
-/* 64-bit file offset type */
-typedef int64_t OPJ_OFF_T;
 
 #ifndef HAVE_SSIZE_T
 #if defined(_WIN32)

diff --git a/tests/unit/testempty0.c b/tests/unit/testempty0.c
index 7fbb9d4493945036f865c81fcff4210593834985..8edd2a6cac576f32a742966b465626a80b04e8a2 100644 (file)
--- a/tests/unit/testempty0.c
+++ b/tests/unit/testempty0.c
@@ -1,5 +1,3 @@
-#include <stdio.h>
-
 #include "openjpeg.h"
 
 int main(int argc, char **argv) { return 0; }