[1.5] Fix a warning about comparison of ulong >= 0. Thanks to winfried for report.

diff --git a/libopenjpeg/jpwl/jpwl.c b/libopenjpeg/jpwl/jpwl.c
index 4247f750640f8d2921f982e086423421993cd6d0..461b28a991f336f78f2d5f3993767413b2323135 100644 (file)
--- a/libopenjpeg/jpwl/jpwl.c
+++ b/libopenjpeg/jpwl/jpwl.c
@@ -191,6 +191,7 @@ void jpwl_prepare_marks(opj_j2k_t *j2k, opj_cio_t *cio, opj_image_t *image) {
        jpwl_epb_ms_t *epb_mark;\r
        jpwl_epc_ms_t *epc_mark;\r
        jpwl_esd_ms_t *esd_mark;\r
+  (void)image;\r
 \r
        /* find (SOC + SIZ) length */\r
        /* I assume SIZ is always the first marker after SOC */\r
@@ -405,7 +406,7 @@ void jpwl_prepare_marks(opj_j2k_t *j2k, opj_cio_t *cio, opj_image_t *image) {
 \r
                /* add all the lengths of the markers which are len-ready and stay within SOC and SOT */\r
                for (mm = 0; mm < jwmarker_num; mm++) {\r
-                       if ((jwmarker[mm].pos >=0) && (jwmarker[mm].pos < sot_pos)) {\r
+                       if ( jwmarker[mm].pos < sot_pos) { /* jwmarker[mm].pos >=0 since ulong */\r
                                if (jwmarker[mm].len_ready)\r
                                        left_MHmarks_len += jwmarker[mm].len + 2;\r
                                else {\r
@@ -632,7 +633,7 @@ void jpwl_prepare_marks(opj_j2k_t *j2k, opj_cio_t *cio, opj_image_t *image) {
                                        pprot = j2k->cp->pprot[packspec++];\r
                                }\r
 \r
-                               //printf("Tile %02d, pack %02d ==> %d\n", tileno, packno, pprot);\r
+                               /*printf("Tile %02d, pack %02d ==> %d\n", tileno, packno, pprot);*/\r
                \r
                        }\r
 \r
@@ -717,6 +718,7 @@ void jpwl_dump_marks(opj_j2k_t *j2k, opj_cio_t *cio, opj_image_t *image) {
        unsigned char *jpwl_buf, *orig_buf;\r
        unsigned long int orig_pos;\r
        double epbcoding_time = 0.0, esdcoding_time = 0.0;\r
+  (void)image;\r
 \r
        /* Order JPWL markers according to their wishlist position */\r
        qsort((void *) jwmarker, (size_t) jwmarker_num, sizeof (jpwl_marker_t), jpwl_markcomp);\r
@@ -1282,6 +1284,10 @@ opj_bool jpwl_check_tile(opj_j2k_t *j2k, opj_tcd_t *tcd, int tileno) {
                }\r
        }\r
 \r
+#else\r
+  (void)j2k;\r
+  (void)tcd;\r
+  (void)tileno;\r
 #endif\r
 \r
        return OPJ_TRUE;\r