[med-svn] r5724 - trunk/packages/gdcm/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-01-28 10:30:59 +0000 (Fri, 28 Jan 2011)
New Revision: 5724

Modified:
   trunk/packages/gdcm/trunk/debian/patches/use_openjpegv1.patch
Log:
Fix compilation error

Modified: trunk/packages/gdcm/trunk/debian/patches/use_openjpegv1.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/use_openjpegv1.patch	2011-01-28 10:11:25 UTC (rev 5723)
+++ trunk/packages/gdcm/trunk/debian/patches/use_openjpegv1.patch	2011-01-28 10:30:59 UTC (rev 5724)
@@ -1,7 +1,7 @@
 Index: gdcm-2.0.17/Source/Common/gdcmConfigure.h.in
 ===================================================================
---- gdcm-2.0.17.orig/Source/Common/gdcmConfigure.h.in	2011-01-28 11:06:04.000000000 +0100
-+++ gdcm-2.0.17/Source/Common/gdcmConfigure.h.in	2011-01-28 11:06:23.000000000 +0100
+--- gdcm-2.0.17.orig/Source/Common/gdcmConfigure.h.in	2011-01-25 16:48:14.000000000 +0100
++++ gdcm-2.0.17/Source/Common/gdcmConfigure.h.in	2011-01-28 11:30:10.000000000 +0100
 @@ -61,10 +61,10 @@
  #cmakedefine GDCM_USE_SYSTEM_PVRG
  
@@ -15,3 +15,23 @@
  #endif //GDCM_USE_SYSTEM_OPENJPEG
  
  #ifndef OPENJPEG_MAJOR_VERSION
+Index: gdcm-2.0.17/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx
+===================================================================
+--- gdcm-2.0.17.orig/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx	2011-01-28 11:30:13.000000000 +0100
++++ gdcm-2.0.17/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx	2011-01-28 11:30:30.000000000 +0100
+@@ -446,6 +446,7 @@
+     return false;
+     }
+ 
++  int reversible;
+ #if OPENJPEG_MAJOR_VERSION == 1
+   /* catch events using our callbacks and give a local context */
+   opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, NULL);
+@@ -484,7 +485,6 @@
+   /* setup the decoder decoding parameters using user parameters */
+   opj_setup_decoder(dinfo, &parameters);
+   bool bResult;
+-  int reversible;
+   OPJ_INT32 l_tile_x0,l_tile_y0;
+   OPJ_UINT32 l_tile_width,l_tile_height,l_nb_tiles_x,l_nb_tiles_y;
+   bResult = opj_read_header(