Extra tokens at the end of #endif directive corrected in openjpeg.c, j2k.c and image_...

diff --git a/ChangeLog b/ChangeLog
index bd2aaed3decbdafcc4b02b83a9773e1ce13f783b..3b62d45bd5b2abeae501079189eaa8c588bf132b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ What's New for OpenJPEG
 + : added
 
 January 31, 2007
+! [FOD] Extra tokens at the end of #endif directive corrected in openjpeg.c, j2k.c and image_to_j2k.c -> no more warnings in linux compilation
 ! [FOD] Linux Makefile added for the codec
 
 January 30, 2007

diff --git a/codec/image_to_j2k.c b/codec/image_to_j2k.c
index 4ecf0df12dfec0bec2c991d26eddb7a4408c3686..98745ee6ff018fc0c47c7505b287cc690ad68166 100644 (file)
--- a/codec/image_to_j2k.c
+++ b/codec/image_to_j2k.c
@@ -978,7 +978,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
 
                        }
                        break;
-#endif USE_JPWL
+#endif /* USE_JPWL */
 /* <<UniPG */
 
                                /* ------------------------------------------------------ */

diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index 1416684fc34ffb23dde07868f5ba7385ec1a3e81..6e232f27d2d79b382339a8cdd3defd2876c0f099 100644 (file)
--- a/libopenjpeg/j2k.c
+++ b/libopenjpeg/j2k.c
@@ -1586,7 +1586,7 @@ opj_image_t* j2k_decode(opj_j2k_t *j2k, opj_cio_t *cio) {
                        }
 
                }
-#endif USE_JPWL
+#endif /* USE_JPWL */
 /* <<UniPG */
                if (id >> 8 != 0xff) {
                        opj_image_destroy(image);

diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 78da551cf334c44bc41ba324b88c2f3e2a3ad898..e90fbb68bee49f7cbf3b84352fcfdc783b72b1eb 100644 (file)
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -261,7 +261,7 @@ void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *paramete
                                parameters->jpwl_sens_TPH[i] = -1; /* absent */
                        }
                };
-#endif USE_JPWL
+#endif /* USE_JPWL */
 /* <<UniPG */
        }
 }