From 8750e183c652de44d332e786842ca33182c375be Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stephan=20M=C3=BChlstrasser?= Date: Wed, 7 Sep 2016 08:41:01 +0200 Subject: [PATCH] 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. --- src/lib/openjp2/openjpeg.h | 2 -- src/lib/openjp2/opj_includes.h | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/openjp2/openjpeg.h b/src/lib/openjp2/openjpeg.h index d000a3a6..c07e9c84 100644 --- 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 typedef size_t OPJ_SIZE_T; diff --git a/src/lib/openjp2/opj_includes.h b/src/lib/openjp2/opj_includes.h index 60b7316d..54d203a5 100644 --- 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" -- 2.30.2