diff options
Diffstat (limited to 'converter/other/jpeg2000')
7 files changed, 3 insertions, 13 deletions
diff --git a/converter/other/jpeg2000/libjasper/common.mk b/converter/other/jpeg2000/libjasper/common.mk index a333f5d6..194ce3c1 100644 --- a/converter/other/jpeg2000/libjasper/common.mk +++ b/converter/other/jpeg2000/libjasper/common.mk @@ -24,8 +24,7 @@ INCLUDES := -I$(JASPERSRCDIR)/include $(INCLUDES) DEFS = -DHAVE_LIBM=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STDDEF_H=1 -DEXCLUDE_BMP_SUPPORT -DEXCLUDE_RAS_SUPPORT -DEXCLUDE_MIF_SUPPORT -DEXCLUDE_JPG_SUPPORT -DEXCLUDE_PGX_SUPPORT -DEXCLUDE_PNM_SUPPORT $(LIB_OBJECTS):%.o:%.c - $(CC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) \ - $(CFLAGS_PERSONAL) $(CADD) $< + $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS_ALL) $< $(LIB_OBJECTS): importinc diff --git a/converter/other/jpeg2000/libjasper/jpc/jpc_enc.c b/converter/other/jpeg2000/libjasper/jpc/jpc_enc.c index c964eeff..eb2020bf 100644 --- a/converter/other/jpeg2000/libjasper/jpc/jpc_enc.c +++ b/converter/other/jpeg2000/libjasper/jpc/jpc_enc.c @@ -11,7 +11,6 @@ #include "jasper/jas_string.h" #include "jasper/jas_malloc.h" #include "jasper/jas_image.h" -#include "jasper/jas_fix.h" #include "jasper/jas_tvp.h" #include "jasper/jas_version.h" #include "jasper/jas_math.h" diff --git a/converter/other/jpeg2000/libjasper/jpc/jpc_qmfb.c b/converter/other/jpeg2000/libjasper/jpc/jpc_qmfb.c index 3962f5ad..c2a87e19 100644 --- a/converter/other/jpeg2000/libjasper/jpc/jpc_qmfb.c +++ b/converter/other/jpeg2000/libjasper/jpc/jpc_qmfb.c @@ -122,7 +122,6 @@ #include <assert.h> -#include "jasper/jas_fix.h" #include "jasper/jas_malloc.h" #include "jasper/jas_math.h" diff --git a/converter/other/jpeg2000/libjasper/jpc/jpc_t1dec.c b/converter/other/jpeg2000/libjasper/jpc/jpc_t1dec.c index 437e9dd6..dd6ae05a 100644 --- a/converter/other/jpeg2000/libjasper/jpc/jpc_t1dec.c +++ b/converter/other/jpeg2000/libjasper/jpc/jpc_t1dec.c @@ -126,7 +126,6 @@ #include "netpbm/nstring.h" -#include "jasper/jas_fix.h" #include "jasper/jas_stream.h" #include "jasper/jas_math.h" diff --git a/converter/other/jpeg2000/libjasper/jpc/jpc_t1enc.c b/converter/other/jpeg2000/libjasper/jpc/jpc_t1enc.c index e9ec12d4..367dd020 100644 --- a/converter/other/jpeg2000/libjasper/jpc/jpc_t1enc.c +++ b/converter/other/jpeg2000/libjasper/jpc/jpc_t1enc.c @@ -126,7 +126,6 @@ #include "netpbm/nstring.h" -#include "jasper/jas_fix.h" #include "jasper/jas_malloc.h" #include "jasper/jas_math.h" @@ -190,11 +189,8 @@ encodeBlocksOfPrecinct(jpc_enc_prc_t * const prcP, cblkP->numbps = MAX(jpc_firstone(mx) + 1 - JPC_NUMEXTRABITS, 0); } - for (cblkno = 0; cblkno < prcP->numcblks; ++ cblkno) { - jpc_enc_cblk_t * const cblkP = &prcP->cblks[cblkno]; - - assert(cblkP->numbps <= bandP->numbps); - } + for (cblkno = 0; cblkno < prcP->numcblks; ++ cblkno) + assert(prcP->cblks[cblkno].numbps <= bandP->numbps); for (cblkno = 0, *errorP = NULL; cblkno < prcP->numcblks && !*errorP; diff --git a/converter/other/jpeg2000/libjasper/jpc/jpc_t2dec.c b/converter/other/jpeg2000/libjasper/jpc/jpc_t2dec.c index a05e1c10..32e68db7 100644 --- a/converter/other/jpeg2000/libjasper/jpc/jpc_t2dec.c +++ b/converter/other/jpeg2000/libjasper/jpc/jpc_t2dec.c @@ -125,7 +125,6 @@ #include <assert.h> #include "jasper/jas_types.h" -#include "jasper/jas_fix.h" #include "jasper/jas_malloc.h" #include "jasper/jas_math.h" #include "jasper/jas_stream.h" diff --git a/converter/other/jpeg2000/libjasper/jpc/jpc_t2enc.c b/converter/other/jpeg2000/libjasper/jpc/jpc_t2enc.c index 2d03cb29..9eb2e92c 100644 --- a/converter/other/jpeg2000/libjasper/jpc/jpc_t2enc.c +++ b/converter/other/jpeg2000/libjasper/jpc/jpc_t2enc.c @@ -124,7 +124,6 @@ #include <stdlib.h> #include <assert.h> -#include "jasper/jas_fix.h" #include "jasper/jas_malloc.h" #include "jasper/jas_math.h" #include "jasper/jas_debug.h" |