correct build error (mislocated declaration) with convert to tiff function when HAVE_...

diff --git a/CHANGES b/CHANGES
index 486ed83f92f8c2eab7e268621e82d1a6f9632738..b383bb87746e39c51c99d832aa8695fa3c192def 100644 (file)
--- 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 9310938aea933e9d70d64f4efe96da6555fbf05f..f3170a726065f18591569fb9274128149cfe602d 100644 (file)
--- 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)
  {