[med-svn] r5726 - in trunk/packages/gdcm/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-01-28 13:35:42 +0000 (Fri, 28 Jan 2011)
New Revision: 5726

Removed:
   trunk/packages/gdcm/trunk/debian/patches/use_openjpegv1.patch
Modified:
   trunk/packages/gdcm/trunk/debian/changelog
   trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install
   trunk/packages/gdcm/trunk/debian/patches/series
   trunk/packages/gdcm/trunk/debian/rules
Log:
Finish GDCM 2.0.17

Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog	2011-01-28 10:59:54 UTC (rev 5725)
+++ trunk/packages/gdcm/trunk/debian/changelog	2011-01-28 13:35:42 UTC (rev 5726)
@@ -1,7 +1,7 @@
 gdcm (2.0.17-1) experimental; urgency=low
 
   * New upstream
-  * Force using of OpenJPEG v1 API
+  * Do not use system OpenJPEG v1, prefer OpenJPEG v2
 
  -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Fri, 28 Jan 2011 10:19:57 +0100
 

Modified: trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install	2011-01-28 10:59:54 UTC (rev 5725)
+++ trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install	2011-01-28 13:35:42 UTC (rev 5726)
@@ -7,6 +7,7 @@
 usr/lib/libgdcmjpeg16.so
 usr/lib/libgdcmjpeg8.so
 usr/lib/libgdcmcharls.so
+usr/lib/libgdcmopenjpeg.so
 usr/lib/gdcm-2.*/*.cmake
 usr/include/gdcm-2.*/gdcm*
 usr/include/gdcm-2.*/zip*
@@ -15,3 +16,5 @@
 usr/include/gdcm-2.*/gdcmjpeg/8/*
 usr/include/gdcm-2.*/gdcmjpeg/j*.h
 usr/include/gdcm-2.*/gdcmcharls/*.h
+usr/include/gdcm-2.*/gdcmopenjpeg/*.h
+usr/lib/gdcmopenjpeg-2.0/*.cmake

Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series	2011-01-28 10:59:54 UTC (rev 5725)
+++ trunk/packages/gdcm/trunk/debian/patches/series	2011-01-28 13:35:42 UTC (rev 5726)
@@ -1 +0,0 @@
-use_openjpegv1.patch

Deleted: trunk/packages/gdcm/trunk/debian/patches/use_openjpegv1.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/use_openjpegv1.patch	2011-01-28 10:59:54 UTC (rev 5725)
+++ trunk/packages/gdcm/trunk/debian/patches/use_openjpegv1.patch	2011-01-28 13:35:42 UTC (rev 5726)
@@ -1,37 +0,0 @@
-Index: gdcm-2.0.17/Source/Common/gdcmConfigure.h.in
-===================================================================
---- 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
- 
- #ifndef GDCM_USE_SYSTEM_OPENJPEG
--#define OPENJPEG_MAJOR_VERSION 2
-+#define OPENJPEG_MAJOR_VERSION 1
- #else
- //#define OPENJPEG_MAJOR_VERSION @OPENJPEG_MAJOR_VERSION@
--#define OPENJPEG_MAJOR_VERSION 2
-+#define OPENJPEG_MAJOR_VERSION 1
- #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(

Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules	2011-01-28 10:59:54 UTC (rev 5725)
+++ trunk/packages/gdcm/trunk/debian/rules	2011-01-28 13:35:42 UTC (rev 5726)
@@ -94,7 +94,7 @@
 		-DGDCM_USE_SYSTEM_EXPAT:BOOL=ON \
 		-DGDCM_USE_SYSTEM_UUID:BOOL=ON \
 		-DGDCM_USE_SYSTEM_ZLIB:BOOL=ON \
-		-DGDCM_USE_SYSTEM_OPENJPEG:BOOL=ON \
+		-DGDCM_USE_SYSTEM_OPENJPEG:BOOL=OFF \
 		-DGDCM_USE_SYSTEM_OPENSSL:BOOL=ON \
 		-DGDCM_USE_SYSTEM_POPPLER:BOOL=ON \
 		-DGDCM_VTK_JAVA_JAR:FILEPATH=/usr/share/java/vtk.jar \