[trunk] fixed warning related to r2837 and move new field at the end of

parameters structure.

diff --git a/src/lib/openjp2/openjpeg.h b/src/lib/openjp2/openjpeg.h
index b5b1e25aed5f9a0d7213524f0909dbc37c500afc..c8d806175c28edc677e5aacc36b58529eaa0708b 100644 (file)
--- a/src/lib/openjp2/openjpeg.h
+++ b/src/lib/openjp2/openjpeg.h
@@ -291,7 +291,7 @@ typedef enum CODEC_FORMAT {
        OPJ_CODEC_JPT  = 1,             /**< JPT-stream (JPEG 2000, JPIP) : read only */
     OPJ_CODEC_JP2  = 2,                /**< JP2 file format : read/write */
     OPJ_CODEC_JPP  = 3,                /**< JPP-stream (JPEG 2000, JPIP) : to be coded */
-    OPJ_CODEC_JPX  = 4,                /**< JPX file format (JPEG 2000 Part-2) : to be coded */
+    OPJ_CODEC_JPX  = 4         /**< JPX file format (JPEG 2000 Part-2) : to be coded */
 } OPJ_CODEC_FORMAT;
 
 
@@ -468,13 +468,6 @@ typedef struct opj_cparameters {
      * If == 0, component size limitation is not considered
      * */
        int max_comp_size;
-    /**
-     * Maximum size (in bytes) for the whole codestream.
-     * If == 0, codestream size limitation is not considered
-     * If it does not comply with tcp_rates, max_cs_size prevails
-     * and a warning is issued.
-     * */
-    int max_cs_size;
     /**
      * DEPRECATED: use RSIZ, OPJ_PROFILE_* and OPJ_EXTENSION_* instead
      * Profile name
@@ -491,6 +484,13 @@ typedef struct opj_cparameters {
        /** Naive implementation of MCT restricted to a single reversible array based 
         encoding without offset concerning all the components. */
        void * mct_data;
+    /**
+     * Maximum size (in bytes) for the whole codestream.
+     * If == 0, codestream size limitation is not considered
+     * If it does not comply with tcp_rates, max_cs_size prevails
+     * and a warning is issued.
+     * */
+    int max_cs_size;
     /** RSIZ value
         To be used to combine OPJ_PROFILE_*, OPJ_EXTENSION_* and (sub)levels values. */
     OPJ_UINT16 rsiz;