From 9cd5752e387b908485cb79dc26c84671cdc42679 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Mon, 18 Jul 2011 08:58:18 +0000 Subject: [PATCH] correct build error (mislocated declaration) with convert to tiff function when HAVE_LIBTIFF is defined --- CHANGES | 5 ++++- applications/codec/convert.c | 2 +- 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) {