fixed MCT check bug in t1_getwmsedec. See http://groups.google.com/group/openjpeg...

[openjpeg.git] / jpwl / jpwl.h

diff --git a/jpwl/jpwl.h b/jpwl/jpwl.h
index 65edce777f141cf5a2fa49b521d8006a6b30f33b..a96840ccf9f4ab8b5a013948a5b33cb4d74ccc24 100644 (file)
--- a/jpwl/jpwl.h
+++ b/jpwl/jpwl.h
@@ -179,7 +179,7 @@ typedef struct jpwl_marker {
        /** marker value (J2K_MS_EPC, etc.) */
        int id;
        /** union keeping the pointer to the real marker struct */
-       union {
+       union jpwl_marks {
                /** pointer to EPB marker */
                jpwl_epb_ms_t *epbmark;
                /** pointer to EPC marker */
@@ -188,7 +188,7 @@ typedef struct jpwl_marker {
                jpwl_esd_ms_t *esdmark;
                /** pointer to RED marker */
                jpwl_red_ms_t *redmark;
-       };
+       } m;
        /** position where the marker should go, in the pre-JPWL codestream */ 
        unsigned long int pos;
        /** same as before, only written as a double, so we can sort it better */
@@ -334,6 +334,8 @@ bool jpwl_esd_fill(opj_j2k_t *j2k, jpwl_esd_ms_t *esdmark, unsigned char *buf);
 
 bool jpwl_epb_fill(opj_j2k_t *j2k, jpwl_epb_ms_t *epbmark, unsigned char *buf, unsigned char *post_buf);
 
+void j2k_add_marker(opj_codestream_info_t *cstr_info, unsigned short int type, int pos, int len);
+
 /** corrects the data in the JPWL codestream
 @param j2k J2K compressor handle
 @return true if correction is performed correctly