summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMickael Savinaud <savmickael@users.noreply.github.com>2011-07-18 08:58:18 +0000
committerMickael Savinaud <savmickael@users.noreply.github.com>2011-07-18 08:58:18 +0000
commit9cd5752e387b908485cb79dc26c84671cdc42679 (patch)
treef17655b959461337f90546546cae3c095bddd8a7
parent65f7f8dc506e3c889e137bef1c730644fc7798eb (diff)
correct build error (mislocated declaration) with convert to tiff function when HAVE_LIBTIFF is defined
-rw-r--r--CHANGES5
-rw-r--r--applications/codec/convert.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 486ed83f..b383bb87 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,7 +5,10 @@ What's New for OpenJPEG
! : changed
+ : added
-July 10, 2011
+July 18, 2011
+! [mickael] correct build error (mislocated declaration) with convert to tiff function when HAVE_LIBTIFF is defined
+
+July 13, 2011
! [mickael] improved some CMakeLists files linked to the build of applications which used thirdparty
_______ R812 : 'openjpeg-1.5' branch created ______________________________
diff --git a/applications/codec/convert.c b/applications/codec/convert.c
index 9310938a..f3170a72 100644
--- a/applications/codec/convert.c
+++ b/applications/codec/convert.c
@@ -1925,9 +1925,9 @@ int imagetotif(opj_image_t * image, const char *outfile)
{
unsigned char *dat8;
tsize_t i, ssize;
+ int step, restx;
ssize = TIFFStripSize(tif);
dat8 = (unsigned char*)buf;
- int step, restx;
if(bps == 8)
{