[trunk] remove old struct from V1 and not used in V2

diff --git a/src/lib/openjp2/openjpeg.h b/src/lib/openjp2/openjpeg.h
index 63f5fce6fe51d045c15ce9d75608dfcba9558461..1e23480aa87c2a249aeb47c3128dfea9e5c26b0b 100644 (file)
--- a/src/lib/openjp2/openjpeg.h
+++ b/src/lib/openjp2/openjpeg.h
@@ -496,51 +496,7 @@ typedef struct opj_dparameters {
 } opj_dparameters_t;
 
 
-/* ---> FIXME V1 style */
-/** Common fields between JPEG-2000 compression and decompression master structs. */
-
-#define opj_common_fields \
-       opj_event_mgr_t *event_mgr;     /**< pointer to the event manager */\
-       void * client_data;                     /**< Available for use by application */\
-       opj_bool is_decompressor;       /**< So common code can tell which is which */\
-       OPJ_CODEC_FORMAT codec_format;  /**< selected codec */\
-       void *j2k_handle;                       /**< pointer to the J2K codec */\
-       void *jp2_handle;                       /**< pointer to the JP2 codec */\
-       void *mj2_handle                        /**< pointer to the MJ2 codec */
-       
-/* Routines that are to be used by both halves of the library are declared
- * to receive a pointer to this structure.  There are no actual instances of
- * opj_common_struct_t, only of opj_cinfo_t and opj_dinfo_t.
- */
-typedef struct opj_common_struct {
-  opj_common_fields;           /* Fields common to both master struct types */
-  /* Additional fields follow in an actual opj_cinfo_t or
-   * opj_dinfo_t.  All three structs must agree on these
-   * initial fields!  (This would be a lot cleaner in C++.)
-   */
-} opj_common_struct_t;
-
-typedef opj_common_struct_t * opj_common_ptr;
-
-/**
- * Compression context info
- * */
-typedef struct opj_cinfo {
-       /** Fields shared with opj_dinfo_t */
-       opj_common_fields;      
-       /* other specific fields go here */
-} opj_cinfo_t;
-
-/**
- * Decompression context info
- * */
-typedef struct opj_dinfo {
-       /** Fields shared with opj_cinfo_t */
-       opj_common_fields;      
-       /* other specific fields go here */
-} opj_dinfo_t;
 
-/* <--- V1 style */
 
 /**
  * JPEG2000 codec V2.

diff --git a/src/lib/openjp2/t1.h b/src/lib/openjp2/t1.h
index ccc6325fdd190fa24ba8a00930c8776d44289157..e62f8fe313b76d7aa6c5b6c9e15455015210faab 100644 (file)
--- a/src/lib/openjp2/t1.h
+++ b/src/lib/openjp2/t1.h
@@ -91,8 +91,6 @@ typedef OPJ_INT16 opj_flag_t;
 Tier-1 coding (coding of code-block coefficients)
 */
 typedef struct opj_t1 {
-       /** codec context */
-       opj_common_ptr cinfo; /* TODO MSD : TO BE REMOVED */
 
        /** MQC component */
        opj_mqc_t *mqc;

diff --git a/src/lib/openjp2/t2.h b/src/lib/openjp2/t2.h
index e608f3e7a52e70fbe963d637da3bdd3eea41556d..a0956ce9fd047f293131ea0d02f4bd841f5a9c7f 100644 (file)
--- a/src/lib/openjp2/t2.h
+++ b/src/lib/openjp2/t2.h
@@ -43,8 +43,6 @@
 Tier-2 coding
 */
 typedef struct opj_t2 {
-       /** codec context */
-       opj_common_ptr cinfo;
 
        /** Encoding: pointer to the src image. Decoding: pointer to the dst image. */
        opj_image_t *image;