From cf39198a9a93455ca65114258197c5fd4f8216e2 Mon Sep 17 00:00:00 2001 From: Antonin Descampe Date: Sun, 5 Dec 2010 15:10:10 +0000 Subject: added a definition in getopt.h and an initial value in convert.c --- codec/compat/getopt.h | 2 +- codec/convert.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'codec') diff --git a/codec/compat/getopt.h b/codec/compat/getopt.h index f84fbc06..779fe470 100644 --- 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 aaa22d53..de08e4c7 100644 --- 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; -- cgit v1.2.3