From 8562ed3018967d5c7bc44248c6de74889dcbc6ed Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Thu, 15 Nov 2012 13:02:33 +0000 Subject: [PATCH 1/1] [trunk]remove OPJ_LIMIT_DECODING struct which is not useful for v2 API --- src/lib/openjp2/openjpeg.c | 1 - src/lib/openjp2/openjpeg.h | 16 ---------------- 2 files changed, 17 deletions(-) diff --git a/src/lib/openjp2/openjpeg.c b/src/lib/openjp2/openjpeg.c index 76dca35b..14b304c3 100644 --- a/src/lib/openjp2/openjpeg.c +++ b/src/lib/openjp2/openjpeg.c @@ -452,7 +452,6 @@ void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *paramete /* default decoding parameters */ parameters->cp_layer = 0; parameters->cp_reduce = 0; - parameters->cp_limit_decoding = NO_LIMITATION; parameters->decod_format = -1; parameters->cod_format = -1; diff --git a/src/lib/openjp2/openjpeg.h b/src/lib/openjp2/openjpeg.h index 062f9ec7..060c9ad6 100644 --- a/src/lib/openjp2/openjpeg.h +++ b/src/lib/openjp2/openjpeg.h @@ -203,15 +203,6 @@ typedef enum CODEC_FORMAT { OPJ_CODEC_JP2 = 2 /**< JPEG-2000 file format : read/write */ } OPJ_CODEC_FORMAT; -/** - * Limit decoding to certain portions of the codestream. -*/ -typedef enum LIMIT_DECODING { - NO_LIMITATION = 0, /**< No limitation for the decoding. The entire codestream will de decoded */ - LIMIT_TO_MAIN_HEADER = 1, /**< The decoding is limited to the Main Header */ - DECODE_ALL_BUT_PACKETS = 2 /**< Decode everything except the JPEG 2000 packets */ -} OPJ_LIMIT_DECODING; - /* ========================================================== @@ -457,13 +448,6 @@ typedef struct opj_dparameters { /*@}*/ /* <