added a definition in getopt.h and an initial value in convert.c

diff --git a/CHANGES b/CHANGES
index e99405be377aced9ed01d01a7d21ac9b381227db..0582ec727a85d55e508df950b1176f853d5da75a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+December 5, 2010
+* [antonin] added a definition in getopt.h and an initial value in convert.c
+
 December 3, 2010
 * [antonin] workaround for name clash when building static and dynamic on WIN32 (see http://www.vtk.org/Bug/view.php?id=10190 for description) 
 

diff --git a/codec/compat/getopt.h b/codec/compat/getopt.h
index f84fbc06f3b7bb6538398ae8adbe143cff1329cd..779fe470b399019356eedf3f518b23a28402c915 100644 (file)
--- a/codec/compat/getopt.h
+++ b/codec/compat/getopt.h
@@ -24,6 +24,6 @@ extern char *optarg;
 extern int getopt(int nargc, char *const *nargv, const char *ostr);
 extern int getopt_long(int argc, char * const argv[], const char *optstring,
                        const struct option *longopts, int totlen);
-
+extern void reset_options_reading();
 
 #endif                         /* _GETOPT_H_ */

diff --git a/codec/convert.c b/codec/convert.c
index aaa22d536be86d1cec67819aab8c3e6e7ee46f36..de08e4c72cde2a273c13c86b72e0365fdbbca2e3 100644 (file)
--- a/codec/convert.c
+++ b/codec/convert.c
@@ -2373,8 +2373,8 @@ int imagetopng(opj_image_t * image, const char *write_idf)
        unsigned char *row_buf, *d;
        int has_alpha, width, height, nr_comp, color_type;
        int adjustR, adjustG, adjustB, x, y, fails, is16, force16;
-       int opj_prec, prec, ushift, dshift;
-       unsigned short mask;
+  int opj_prec, prec, ushift, dshift;
+       unsigned short mask = 0xffff;
        png_color_8 sig_bit;
 
        is16 = force16 = ushift = dshift = 0; fails = 1;