Moved type OPJ_BITFIELD from openjpeg.h to opj_includes.h

OPJ_BITFIELD is used only in internal headers and must not
appear in the public openjpeg.h header.

diff --git a/src/lib/openjp2/openjpeg.h b/src/lib/openjp2/openjpeg.h
index d000a3a616bafecc649072ab9fd0da8178d94fff..c07e9c84b347b51ade0db0e880a0d9bed4b2b63e 100644 (file)
--- a/src/lib/openjp2/openjpeg.h
+++ b/src/lib/openjp2/openjpeg.h
@@ -129,8 +129,6 @@ typedef uint64_t OPJ_UINT64;
 
 typedef int64_t  OPJ_OFF_T; /* 64-bit file offset type */
 
-typedef unsigned int OPJ_BITFIELD;
-
 #include <stdio.h>
 typedef size_t   OPJ_SIZE_T;
 

diff --git a/src/lib/openjp2/opj_includes.h b/src/lib/openjp2/opj_includes.h
index 60b7316ddb35a8806f9024042c0fa5c645de98ea..54d203a52a43cd76520b032baadde098aa4ac394 100644 (file)
--- a/src/lib/openjp2/opj_includes.h
+++ b/src/lib/openjp2/opj_includes.h
@@ -183,6 +183,9 @@ static INLINE long opj_lrintf(float f) {
 #      pragma intrinsic(__emul)
 #endif
 
+/* Type to use for bit-fields in internal headers */
+typedef unsigned int OPJ_BITFIELD;
+
 #include "opj_inttypes.h"
 #include "opj_clock.h"
 #include "opj_malloc.h"