walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

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

This commit is contained in:
Antonin Descampe 2010-12-05 15:10:10 +00:00
parent 02229c7c2d
commit cf39198a9a
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -5,6 +5,9 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : added
December 5, 2010
* [antonin] added a definition in getopt.h and an initial value in convert.c
December 3, 2010 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) * [antonin] workaround for name clash when building static and dynamic on WIN32 (see http://www.vtk.org/Bug/view.php?id=10190 for description)

2
codec/compat/getopt.h
View File

@ -24,6 +24,6 @@ extern char *optarg;
extern int getopt(int nargc, char *const *nargv, const char *ostr); extern int getopt(int nargc, char *const *nargv, const char *ostr);
extern int getopt_long(int argc, char * const argv[], const char *optstring, extern int getopt_long(int argc, char * const argv[], const char *optstring,
const struct option *longopts, int totlen); const struct option *longopts, int totlen);
extern void reset_options_reading();
#endif /* _GETOPT_H_ */ #endif /* _GETOPT_H_ */

4
codec/convert.c
View File

@ -2373,8 +2373,8 @@ int imagetopng(opj_image_t * image, const char *write_idf)
unsigned char *row_buf, *d; unsigned char *row_buf, *d;
int has_alpha, width, height, nr_comp, color_type; int has_alpha, width, height, nr_comp, color_type;
int adjustR, adjustG, adjustB, x, y, fails, is16, force16; int adjustR, adjustG, adjustB, x, y, fails, is16, force16;
int opj_prec, prec, ushift, dshift; int opj_prec, prec, ushift, dshift;
unsigned short mask; unsigned short mask = 0xffff;
png_color_8 sig_bit; png_color_8 sig_bit;
is16 = force16 = ushift = dshift = 0; fails = 1; is16 = force16 = ushift = dshift = 0; fails = 1;