[trunk]remove OPJ_LIMIT_DECODING struct which is not useful for v2 API

diff --git a/src/lib/openjp2/openjpeg.c b/src/lib/openjp2/openjpeg.c
index 76dca35b3e165d92f268f1cf8e94f3dac82e561e..14b304c3abb0bfcca2c4b2f02e1579acf7a4c711 100644 (file)
--- 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 062f9ec793307b735d042070f1d818ca2fc800f3..060c9ad613f53aae631378c21520112633c041d2 100644 (file)
--- 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 {
        /*@}*/
 /* <<UniPG */
 
-       /** 
-       Specify whether the decoding should be done on the entire codestream, or be limited to the main header
-       Limiting the decoding to the main header makes it possible to extract the characteristics of the codestream
-       if == NO_LIMITATION, the entire codestream is decoded; 
-       if == LIMIT_TO_MAIN_HEADER, only the main header is decoded; 
-       */
-       OPJ_LIMIT_DECODING cp_limit_decoding;
 
        unsigned int flags;
 } opj_dparameters_t;