summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonin Descampe <antonin@gmail.com>2010-11-28 18:40:57 +0000
committerAntonin Descampe <antonin@gmail.com>2010-11-28 18:40:57 +0000
commit1c2ed5cc33df3cfb6f61657b930a5c300cf6993f (patch)
tree57cd2bb907e37eb72b3b7c20f6cf4b70a07a110a
parentefc709578a5501474f467e2faeb700c05137d8dc (diff)
fixed a bug in codec/convert.c that prevented to build executables with WIN32 compiler (thanks winfried)
-rw-r--r--CHANGES1
-rw-r--r--codec/convert.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index ea244b74..e4a6b4e0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ What's New for OpenJPEG
+ : added
November 28, 2010
+* [antonin] fixed a bug in codec/convert.c that prevented to build executables with WIN32 compiler (thanks winfried)
! [antonin] changed cmake behaviour: executables are now always statically linked. When -DBUIL_SHARED_LIBS option is ON (the default), the shared versions of the libraries are also built (but executables remain linked against the static libraries).
November 25, 2010
diff --git a/codec/convert.c b/codec/convert.c
index 45cf2563..aaa22d53 100644
--- a/codec/convert.c
+++ b/codec/convert.c
@@ -2373,7 +2373,7 @@ 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;;
+ int opj_prec, prec, ushift, dshift;
unsigned short mask;
png_color_8 sig_bit;