This is an automated email from the git hooks/post-receive script. gert-guest pushed a commit to branch master in repository gdcm.
commit a102f5dd8bcd7bd2c7499a9335638f8ec20b8237 Author: Gert Wollny <[email protected]> Date: Mon Jul 11 14:17:09 2016 +0000 remove obolete patches and prepare upload --- debian/changelog | 7 +- debian/patches/05_add_global_doxydoc_target.patch | 72 --- .../06_dcm_group2_buggyfiles_fallback.patch | 49 -- debian/patches/08_supportvtk6.3.patch | 642 --------------------- debian/patches/09_set_java_15.patch | 28 - debian/patches/10_gdcm_openjpeg2_git4f793f.patch | 128 ---- debian/patches/11_gdcm_openjpeg2_git0511b1.patch | 30 - .../patches/12_gdcm_system_charls_includes.patch | 23 - debian/patches/series | 8 - 9 files changed, 4 insertions(+), 983 deletions(-) diff --git a/debian/changelog b/debian/changelog index a000fc3..464aafe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -gdcm (2.6.4-1) UNRELEASED; urgency=medium +gdcm (2.6.4-1) unstable; urgency=medium * Imported Upstream version 2.6.4 - * update patches + * update patches and remove patches 05-12 because they were applied + upstream - -- Gert Wollny <[email protected]> Mon, 11 Jul 2016 13:39:17 +0000 + -- Gert Wollny <[email protected]> Mon, 11 Jul 2016 14:14:40 +0000 gdcm (2.6.3-6) unstable; urgency=medium diff --git a/debian/patches/05_add_global_doxydoc_target.patch b/debian/patches/05_add_global_doxydoc_target.patch deleted file mode 100644 index 0afcee7..0000000 --- a/debian/patches/05_add_global_doxydoc_target.patch +++ /dev/null @@ -1,72 +0,0 @@ -Description: Add a target for docu-generation and remove this from ALL - This patch adds a target that makes is possibe to create the Doxygen - docu from the base build directory without invoking the ALL target. - At the same time this documentation creation is removed from the ALL - target to avoid the it is build various times. Rationale is to enable - binary-arch/indep and install-arch/indep without the overhead of - recreating the documentation various times. (Unfortunately the make - seems to re-run at least the PDF document creation each time. - (This is a Debian specific patch). -Author: Gert Wollny <[email protected]> -Forwarded: not-needed - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -554,6 +554,12 @@ - endif() - #----------------------------------------------------------------------------- - -+# Add a target so that the documentation can be build from the -+# root dir -+if(GDCM_DOCUMENTATION) -+ add_custom_target(DoxygenDoc) -+endif() -+ - # Need to subdirs in Source/Common before Wrapping - # to have gdcmConfigure.h around - subdirs(Utilities) ---- a/Utilities/doxygen/CMakeLists.txt -+++ b/Utilities/doxygen/CMakeLists.txt -@@ -154,7 +154,6 @@ - endif() - # add target to 'ALL' - add_custom_target(GDCMDoxygenPDF -- ALL - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/latex/gdcm-${GDCM_VERSION}.pdf - COMMENT "GDCM: Executing GDCMDoxygenPDF" - ) -@@ -162,13 +161,14 @@ - ${CMAKE_CURRENT_BINARY_DIR}/latex/gdcm-${GDCM_VERSION}.pdf - DESTINATION ${GDCM_INSTALL_DOC_DIR} - ) -+ add_dependencies(DoxygenDoc GDCMDoxygenPDF) - else() - # make DoxygenDoc depends on the final tarball thus all file are garantee to be generated - add_custom_target(GDCMDoxygenDoc -- ALL - DEPENDS ${GDCM_DOC_TARBALL} - COMMENT "GDCM: Executing GDCMDoxygenDoc" - ) -+ add_dependency(DoxygenDoc GDCMDoxygenDoc) - endif() - - # Install html pages: ---- a/Utilities/doxygen/vtk/CMakeLists.txt -+++ b/Utilities/doxygen/vtk/CMakeLists.txt -@@ -103,7 +103,6 @@ - ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh @ONLY ) - - add_custom_target(${DOXYGEN_PROJECT_NAME}DoxygenDoc -- ALL - ${BASH} - ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh) - -@@ -111,6 +110,8 @@ - ${DOXYGEN_PROJECT_NAME}DoxygenDoc - GDCMDoxygenPDF - ) -+ add_dependencies(DoxygenDoc -+ ${DOXYGEN_PROJECT_NAME}DoxygenDoc) - - if(INCLUDE_QT_DOCUMENTATION) - add_custom_target(QtDoxygenTags diff --git a/debian/patches/06_dcm_group2_buggyfiles_fallback.patch b/debian/patches/06_dcm_group2_buggyfiles_fallback.patch deleted file mode 100644 index aac2fe5..0000000 --- a/debian/patches/06_dcm_group2_buggyfiles_fallback.patch +++ /dev/null @@ -1,49 +0,0 @@ -Description: Tolerate some buggy DICOM files -Author: Mathieu Malaterre <[email protected]> - ---- a/Source/DataStructureAndEncodingDefinition/gdcmFileMetaInformation.cxx -+++ b/Source/DataStructureAndEncodingDefinition/gdcmFileMetaInformation.cxx -@@ -526,6 +526,7 @@ - //ExplicitAttribute<0x0002,0x0000> metagl; - //metagl.Read(is); - -+ std::streampos start = is.tellg(); - // TODO: Can now load data from std::ios::cur to std::ios::cur + metagl.GetValue() - - ExplicitDataElement xde; -@@ -545,10 +546,35 @@ - //#endif - Insert( xde ); - // See PS 3.5, Data Element Structure With Explicit VR -+ try { -+ // GDCM is a hack, so let's read all possible group 2 element, until the last one -+ // and leave the group length value aside. - while( ReadExplicitDataElement<SwapperNoOp>(is, xde ) ) - { - Insert( xde ); - } -+ } -+ catch( std::exception & ex ) -+ { -+ // we've read a little bit too much. We are possibly in the case where an -+ // implicit dataelement with group 2 (technically impossible) was found -+ // (first dataelement). Let's start over again, but this time use group -+ // length as the sentinel for the last group 2 element: -+ is.seekg(start,std::ios::beg); -+ // Group Length: -+ ReadExplicitDataElement<SwapperNoOp>(is, xde ); -+ -+ Attribute<0x0002, 0x0000> filemetagrouplength; -+ filemetagrouplength.SetFromDataElement( xde ); -+ const unsigned int glen = filemetagrouplength.GetValue(); -+ -+ unsigned int cur_len = 0; -+ while( cur_len < glen && ReadExplicitDataElement<SwapperNoOp>(is, xde ) ) -+ { -+ Insert( xde ); -+ cur_len += xde.GetLength(); -+ } -+ } - - // Now is a good time to compute the transfer syntax: - ComputeDataSetTransferSyntax(); diff --git a/debian/patches/08_supportvtk6.3.patch b/debian/patches/08_supportvtk6.3.patch deleted file mode 100644 index df007df..0000000 --- a/debian/patches/08_supportvtk6.3.patch +++ /dev/null @@ -1,642 +0,0 @@ -Description: Support VTK6.3 -Author: Thiago Franco de Moraes <[email protected]> -Forwarded: not needed - - -diff --git a/Utilities/VTK/Applications/gdcm2vtk.cxx b/Utilities/VTK/Applications/gdcm2vtk.cxx -index 4841dce..59bc0eb 100644 ---- a/Utilities/VTK/Applications/gdcm2vtk.cxx -+++ b/Utilities/VTK/Applications/gdcm2vtk.cxx -@@ -64,6 +64,10 @@ - - #include <getopt.h> - -+#ifndef vtkFloatingPointType -+#define vtkFloatingPointType double -+#endif -+ - void PrintVersion() - { - std::cout << "gdcm2vtk: gdcm " << gdcm::Version::GetVersion() << " "; -diff --git a/Utilities/VTK/Applications/gdcmviewer.cxx b/Utilities/VTK/Applications/gdcmviewer.cxx -index 57facd6..7be48be 100644 ---- a/Utilities/VTK/Applications/gdcmviewer.cxx -+++ b/Utilities/VTK/Applications/gdcmviewer.cxx -@@ -88,6 +88,11 @@ class vtkAngleWidget; - - #include <getopt.h> - #include <assert.h> -+ -+#ifndef vtkFloatingPointType -+#define vtkFloatingPointType double -+#endif -+ - //---------------------------------------------------------------------------- - // vtkImageViewer2 new interface wants SetSlice, but vtkImageViewer does not have - // this new interface (what a pain), so let's fake a new interface to -@@ -95,7 +100,7 @@ class vtkAngleWidget; - class vtkGDCMImageViewer : public vtkImageViewer - { - public: -- vtkTypeRevisionMacro(vtkGDCMImageViewer,vtkImageViewer); -+ vtkTypeMacro(vtkGDCMImageViewer,vtkImageViewer); - - static vtkGDCMImageViewer *New() - { -@@ -118,7 +123,7 @@ public: - double GetOverlayVisibility() { return 0; } - void SetOverlayVisibility(double vis) {(void)vis;} - }; --vtkCxxRevisionMacro(vtkGDCMImageViewer, "$Revision: 1.30 $") -+//vtkCxxRevisionMacro(vtkGDCMImageViewer, "$Revision: 1.30 $") - vtkInstantiatorNewMacro(vtkGDCMImageViewer) - - #if VTK_MAJOR_VERSION >= 5 -@@ -126,7 +131,7 @@ vtkInstantiatorNewMacro(vtkGDCMImageViewer) - class vtkImageColorViewer : public vtkImageViewer2 - { - public: -- vtkTypeRevisionMacro(vtkImageColorViewer,vtkImageViewer2); -+ vtkTypeMacro(vtkImageColorViewer,vtkImageViewer2); - - static vtkImageColorViewer *New() - { -@@ -164,7 +169,7 @@ public: - private: - vtkImageActor *OverlayImageActor; - }; --vtkCxxRevisionMacro(vtkImageColorViewer, "$Revision: 1.30 $") -+//vtkCxxRevisionMacro(vtkImageColorViewer, "$Revision: 1.30 $") - vtkInstantiatorNewMacro(vtkImageColorViewer) - #endif - -diff --git a/Utilities/VTK/Examples/Cxx/Compute3DSpacing.cxx b/Utilities/VTK/Examples/Cxx/Compute3DSpacing.cxx -index d37deb9..cd6065d 100644 ---- a/Utilities/VTK/Examples/Cxx/Compute3DSpacing.cxx -+++ b/Utilities/VTK/Examples/Cxx/Compute3DSpacing.cxx -@@ -16,6 +16,10 @@ - #include "vtkStringArray.h" - #include "gdcmIPPSorter.h" - -+#ifndef vtkFloatingPointType -+#define vtkFloatingPointType double -+#endif -+ - /* - * Simple example to check computation of spacing within vtkGDCMImageReader2 - * This is a direct implementation of: -diff --git a/Utilities/VTK/Examples/Cxx/gdcmorthoplanes.cxx b/Utilities/VTK/Examples/Cxx/gdcmorthoplanes.cxx -index d86101a..1b4217d 100644 ---- a/Utilities/VTK/Examples/Cxx/gdcmorthoplanes.cxx -+++ b/Utilities/VTK/Examples/Cxx/gdcmorthoplanes.cxx -@@ -51,7 +51,7 @@ - #include "gdcmIPPSorter.h" - - #ifndef vtkFloatingPointType --#define vtkFloatingPointType float -+#define vtkFloatingPointType double - #endif - - //---------------------------------------------------------------------------- -diff --git a/Utilities/VTK/VTK4/vtkMedicalImageProperties.cxx b/Utilities/VTK/VTK4/vtkMedicalImageProperties.cxx -index 34c55a7..0903242 100644 ---- a/Utilities/VTK/VTK4/vtkMedicalImageProperties.cxx -+++ b/Utilities/VTK/VTK4/vtkMedicalImageProperties.cxx -@@ -39,7 +39,7 @@ - #include <assert.h> - - //---------------------------------------------------------------------------- --vtkCxxRevisionMacro(vtkMedicalImageProperties, "1.21") -+//vtkCxxRevisionMacro(vtkMedicalImageProperties, "1.21") - vtkStandardNewMacro(vtkMedicalImageProperties) - - static const char *vtkMedicalImagePropertiesOrientationString[] = { -diff --git a/Utilities/VTK/VTK4/vtkMedicalImageProperties.h b/Utilities/VTK/VTK4/vtkMedicalImageProperties.h -index 7ae1103..38322e9 100644 ---- a/Utilities/VTK/VTK4/vtkMedicalImageProperties.h -+++ b/Utilities/VTK/VTK4/vtkMedicalImageProperties.h -@@ -51,7 +51,7 @@ class VTK_IO_EXPORT vtkMedicalImageProperties : public vtkObject - { - public: - static vtkMedicalImageProperties *New(); -- vtkTypeRevisionMacro(vtkMedicalImageProperties,vtkObject); -+ vtkTypeMacro(vtkMedicalImageProperties,vtkObject); - void PrintSelf(ostream& os, vtkIndent indent); - - // Description: -diff --git a/Utilities/VTK/VTK4/vtkStringArray.cxx b/Utilities/VTK/VTK4/vtkStringArray.cxx -index 940a9ba..5b5c7c8 100644 ---- a/Utilities/VTK/VTK4/vtkStringArray.cxx -+++ b/Utilities/VTK/VTK4/vtkStringArray.cxx -@@ -18,7 +18,7 @@ - #include <vector> - #include <string> - --vtkCxxRevisionMacro(vtkStringArray, "$Revision: 1.1 $") -+//vtkCxxRevisionMacro(vtkStringArray, "$Revision: 1.1 $") - vtkStandardNewMacro(vtkStringArray) - - struct vtkStringArrayInternals -diff --git a/Utilities/VTK/VTK4/vtkStringArray.h b/Utilities/VTK/VTK4/vtkStringArray.h -index 90748d7..848ac7f 100644 ---- a/Utilities/VTK/VTK4/vtkStringArray.h -+++ b/Utilities/VTK/VTK4/vtkStringArray.h -@@ -34,7 +34,7 @@ class VTK_EXPORT vtkStringArray : public vtkObject - { - public: - static vtkStringArray *New(); -- vtkTypeRevisionMacro(vtkStringArray,vtkObject); -+ vtkTypeMacro(vtkStringArray,vtkObject); - virtual void PrintSelf(ostream& os, vtkIndent indent); - - //BTX -diff --git a/Utilities/VTK/vtkGDCMImageReader.cxx b/Utilities/VTK/vtkGDCMImageReader.cxx -index 7b64dce..3f96217 100644 ---- a/Utilities/VTK/vtkGDCMImageReader.cxx -+++ b/Utilities/VTK/vtkGDCMImageReader.cxx -@@ -51,7 +51,7 @@ - - #include <sstream> - --vtkCxxRevisionMacro(vtkGDCMImageReader, "$Revision: 1.1 $") -+//vtkCxxRevisionMacro(vtkGDCMImageReader, "$Revision: 1.1 $") - vtkStandardNewMacro(vtkGDCMImageReader) - - static inline bool vtkGDCMImageReader_IsCharTypeSigned() -diff --git a/Utilities/VTK/vtkGDCMImageReader.h b/Utilities/VTK/vtkGDCMImageReader.h -index bf016f1..731b053 100644 ---- a/Utilities/VTK/vtkGDCMImageReader.h -+++ b/Utilities/VTK/vtkGDCMImageReader.h -@@ -103,7 +103,7 @@ class VTK_EXPORT vtkGDCMImageReader : public vtkMedicalImageReader2 - { - public: - static vtkGDCMImageReader *New(); -- vtkTypeRevisionMacro(vtkGDCMImageReader,vtkMedicalImageReader2); -+ vtkTypeMacro(vtkGDCMImageReader,vtkMedicalImageReader2); - virtual void PrintSelf(ostream& os, vtkIndent indent); - - // Description: is the given file name a DICOM file containing an image ? -diff --git a/Utilities/VTK/vtkGDCMImageReader2.cxx b/Utilities/VTK/vtkGDCMImageReader2.cxx -index 5dafdbf..80bf550 100644 ---- a/Utilities/VTK/vtkGDCMImageReader2.cxx -+++ b/Utilities/VTK/vtkGDCMImageReader2.cxx -@@ -49,7 +49,7 @@ - - #include <sstream> - --vtkCxxRevisionMacro(vtkGDCMImageReader2, "$Revision: 1.1 $") -+//vtkCxxRevisionMacro(vtkGDCMImageReader2, "$Revision: 1.1 $") - vtkStandardNewMacro(vtkGDCMImageReader2) - - static inline bool vtkGDCMImageReader2_IsCharTypeSigned() -diff --git a/Utilities/VTK/vtkGDCMImageReader2.h b/Utilities/VTK/vtkGDCMImageReader2.h -index 4e3e09b..92e69d1 100644 ---- a/Utilities/VTK/vtkGDCMImageReader2.h -+++ b/Utilities/VTK/vtkGDCMImageReader2.h -@@ -95,7 +95,7 @@ class VTK_EXPORT vtkGDCMImageReader2 : public vtkMedicalImageReader2 - { - public: - static vtkGDCMImageReader2 *New(); -- vtkTypeRevisionMacro(vtkGDCMImageReader2,vtkMedicalImageReader2); -+ vtkTypeMacro(vtkGDCMImageReader2,vtkMedicalImageReader2); - virtual void PrintSelf(ostream& os, vtkIndent indent); - - // Description: is the given file name a DICOM file containing an image ? -diff --git a/Utilities/VTK/vtkGDCMImageWriter.cxx b/Utilities/VTK/vtkGDCMImageWriter.cxx -index 9785525..ad3444e 100644 ---- a/Utilities/VTK/vtkGDCMImageWriter.cxx -+++ b/Utilities/VTK/vtkGDCMImageWriter.cxx -@@ -47,7 +47,7 @@ - - #include <limits> - --vtkCxxRevisionMacro(vtkGDCMImageWriter, "$Revision: 1.1 $") -+//vtkCxxRevisionMacro(vtkGDCMImageWriter, "$Revision: 1.1 $") - vtkStandardNewMacro(vtkGDCMImageWriter) - - //vtkCxxSetObjectMacro(vtkGDCMImageWriter,LookupTable,vtkLookupTable) -@@ -66,7 +66,7 @@ inline bool vtkGDCMImageWriter_IsCharTypeSigned() - } - - #ifndef vtkFloatingPointType --#define vtkFloatingPointType float -+#define vtkFloatingPointType double - #endif - - //---------------------------------------------------------------------------- -diff --git a/Utilities/VTK/vtkGDCMImageWriter.h b/Utilities/VTK/vtkGDCMImageWriter.h -index 2fc8760..6e3981d 100644 ---- a/Utilities/VTK/vtkGDCMImageWriter.h -+++ b/Utilities/VTK/vtkGDCMImageWriter.h -@@ -48,7 +48,7 @@ class VTK_EXPORT vtkGDCMImageWriter : public vtkImageWriter - { - public: - static vtkGDCMImageWriter *New(); -- vtkTypeRevisionMacro(vtkGDCMImageWriter,vtkImageWriter); -+ vtkTypeMacro(vtkGDCMImageWriter,vtkImageWriter); - virtual void PrintSelf(ostream& os, vtkIndent indent); - - // Description: -diff --git a/Utilities/VTK/vtkGDCMMedicalImageProperties.cxx b/Utilities/VTK/vtkGDCMMedicalImageProperties.cxx -index 5b1a955..b3c3bdc 100644 ---- a/Utilities/VTK/vtkGDCMMedicalImageProperties.cxx -+++ b/Utilities/VTK/vtkGDCMMedicalImageProperties.cxx -@@ -17,7 +17,7 @@ - #include "gdcmFile.h" - - //---------------------------------------------------------------------------- --vtkCxxRevisionMacro(vtkGDCMMedicalImageProperties, "1.21") -+//vtkCxxRevisionMacro(vtkGDCMMedicalImageProperties, "1.21") - vtkStandardNewMacro(vtkGDCMMedicalImageProperties) - - class vtkGDCMMedicalImagePropertiesInternals -diff --git a/Utilities/VTK/vtkGDCMMedicalImageProperties.h b/Utilities/VTK/vtkGDCMMedicalImageProperties.h -index 826d1b9..7c05874 100644 ---- a/Utilities/VTK/vtkGDCMMedicalImageProperties.h -+++ b/Utilities/VTK/vtkGDCMMedicalImageProperties.h -@@ -34,7 +34,7 @@ class VTK_EXPORT vtkGDCMMedicalImageProperties : public vtkMedicalImagePropertie - { - public: - static vtkGDCMMedicalImageProperties *New(); -- vtkTypeRevisionMacro(vtkGDCMMedicalImageProperties,vtkMedicalImageProperties); -+ vtkTypeMacro(vtkGDCMMedicalImageProperties,vtkMedicalImageProperties); - void PrintSelf(ostream& os, vtkIndent indent); - - // Description: -diff --git a/Utilities/VTK/vtkGDCMPolyDataReader.cxx b/Utilities/VTK/vtkGDCMPolyDataReader.cxx -index de88431..0c7445c 100644 ---- a/Utilities/VTK/vtkGDCMPolyDataReader.cxx -+++ b/Utilities/VTK/vtkGDCMPolyDataReader.cxx -@@ -30,7 +30,7 @@ - #include "gdcmSequenceOfItems.h" - #include "gdcmDirectoryHelper.h" - --vtkCxxRevisionMacro(vtkGDCMPolyDataReader, "$Revision: 1.74 $") -+//vtkCxxRevisionMacro(vtkGDCMPolyDataReader, "$Revision: 1.74 $") - vtkStandardNewMacro(vtkGDCMPolyDataReader) - - //---------------------------------------------------------------------------- -diff --git a/Utilities/VTK/vtkGDCMPolyDataReader.h b/Utilities/VTK/vtkGDCMPolyDataReader.h -index 251cacb..abec5ee 100644 ---- a/Utilities/VTK/vtkGDCMPolyDataReader.h -+++ b/Utilities/VTK/vtkGDCMPolyDataReader.h -@@ -39,7 +39,7 @@ class VTK_EXPORT vtkGDCMPolyDataReader : public vtkPolyDataAlgorithm - { - public: - static vtkGDCMPolyDataReader *New(); -- vtkTypeRevisionMacro(vtkGDCMPolyDataReader,vtkPolyDataAlgorithm); -+ vtkTypeMacro(vtkGDCMPolyDataReader,vtkPolyDataAlgorithm); - virtual void PrintSelf(ostream& os, vtkIndent indent); - - // Description: -diff --git a/Utilities/VTK/vtkGDCMPolyDataWriter.cxx b/Utilities/VTK/vtkGDCMPolyDataWriter.cxx -index ead79a3..e2c661c 100644 ---- a/Utilities/VTK/vtkGDCMPolyDataWriter.cxx -+++ b/Utilities/VTK/vtkGDCMPolyDataWriter.cxx -@@ -40,7 +40,7 @@ - #include "gdcmAttribute.h" - #include "gdcmDirectoryHelper.h" - --vtkCxxRevisionMacro(vtkGDCMPolyDataWriter, "$Revision: 1.74 $") -+//vtkCxxRevisionMacro(vtkGDCMPolyDataWriter, "$Revision: 1.74 $") - vtkStandardNewMacro(vtkGDCMPolyDataWriter) - vtkCxxSetObjectMacro(vtkGDCMPolyDataWriter,MedicalImageProperties,vtkMedicalImageProperties) - vtkCxxSetObjectMacro(vtkGDCMPolyDataWriter,RTStructSetProperties,vtkRTStructSetProperties) -diff --git a/Utilities/VTK/vtkGDCMPolyDataWriter.h b/Utilities/VTK/vtkGDCMPolyDataWriter.h -index aa456f3..afbc9f1 100644 ---- a/Utilities/VTK/vtkGDCMPolyDataWriter.h -+++ b/Utilities/VTK/vtkGDCMPolyDataWriter.h -@@ -39,7 +39,7 @@ class VTK_EXPORT vtkGDCMPolyDataWriter : public vtkPolyDataWriter - { - public: - static vtkGDCMPolyDataWriter *New(); -- vtkTypeRevisionMacro(vtkGDCMPolyDataWriter,vtkPolyDataWriter); -+ vtkTypeMacro(vtkGDCMPolyDataWriter,vtkPolyDataWriter); - virtual void PrintSelf(ostream& os, vtkIndent indent); - - // Description: -diff --git a/Utilities/VTK/vtkGDCMTesting.cxx b/Utilities/VTK/vtkGDCMTesting.cxx -index 0cd2c26..79fb87f 100644 ---- a/Utilities/VTK/vtkGDCMTesting.cxx -+++ b/Utilities/VTK/vtkGDCMTesting.cxx -@@ -18,7 +18,7 @@ - #include "gdcmTesting.h" - #include "gdcmFilename.h" - --vtkCxxRevisionMacro(vtkGDCMTesting, "$Revision: 1.31 $") -+//vtkCxxRevisionMacro(vtkGDCMTesting, "$Revision: 1.31 $") - vtkStandardNewMacro(vtkGDCMTesting) - - // DICOM Filename, MHD MD5, RAW MD5 -diff --git a/Utilities/VTK/vtkGDCMTesting.h b/Utilities/VTK/vtkGDCMTesting.h -index 57fe57d..a011b17 100644 ---- a/Utilities/VTK/vtkGDCMTesting.h -+++ b/Utilities/VTK/vtkGDCMTesting.h -@@ -27,7 +27,7 @@ class VTK_EXPORT vtkGDCMTesting : public vtkObject - { - public: - static vtkGDCMTesting *New(); -- vtkTypeRevisionMacro(vtkGDCMTesting,vtkObject); -+ vtkTypeMacro(vtkGDCMTesting,vtkObject); - void PrintSelf(ostream& os, vtkIndent indent); - - static const char *GetVTKDataRoot(); -diff --git a/Utilities/VTK/vtkGDCMThreadedImageReader.cxx b/Utilities/VTK/vtkGDCMThreadedImageReader.cxx -index 93e281e..eb75839 100644 ---- a/Utilities/VTK/vtkGDCMThreadedImageReader.cxx -+++ b/Utilities/VTK/vtkGDCMThreadedImageReader.cxx -@@ -43,7 +43,7 @@ - #include <sys/sysctl.h> - #endif - --vtkCxxRevisionMacro(vtkGDCMThreadedImageReader, "$Revision: 1.1 $") -+//vtkCxxRevisionMacro(vtkGDCMThreadedImageReader, "$Revision: 1.1 $") - vtkStandardNewMacro(vtkGDCMThreadedImageReader) - - // Output Ports are as follow: -diff --git a/Utilities/VTK/vtkGDCMThreadedImageReader.h b/Utilities/VTK/vtkGDCMThreadedImageReader.h -index 2f554b1..9210d1f 100644 ---- a/Utilities/VTK/vtkGDCMThreadedImageReader.h -+++ b/Utilities/VTK/vtkGDCMThreadedImageReader.h -@@ -43,7 +43,7 @@ class VTK_EXPORT vtkGDCMThreadedImageReader : public vtkGDCMImageReader - { - public: - static vtkGDCMThreadedImageReader *New(); -- vtkTypeRevisionMacro(vtkGDCMThreadedImageReader,vtkGDCMImageReader); -+ vtkTypeMacro(vtkGDCMThreadedImageReader,vtkGDCMImageReader); - virtual void PrintSelf(ostream& os, vtkIndent indent); - - // Description: -diff --git a/Utilities/VTK/vtkGDCMThreadedImageReader2.cxx b/Utilities/VTK/vtkGDCMThreadedImageReader2.cxx -index 9a856bc..6df2ea2 100644 ---- a/Utilities/VTK/vtkGDCMThreadedImageReader2.cxx -+++ b/Utilities/VTK/vtkGDCMThreadedImageReader2.cxx -@@ -25,7 +25,7 @@ - - #include <assert.h> - --vtkCxxRevisionMacro(vtkGDCMThreadedImageReader2, "$Revision: 1.1 $") -+//vtkCxxRevisionMacro(vtkGDCMThreadedImageReader2, "$Revision: 1.1 $") - vtkStandardNewMacro(vtkGDCMThreadedImageReader2) - vtkCxxSetObjectMacro(vtkGDCMThreadedImageReader2,FileNames,vtkStringArray) - -diff --git a/Utilities/VTK/vtkGDCMThreadedImageReader2.h b/Utilities/VTK/vtkGDCMThreadedImageReader2.h -index 5b60101..8b6473d 100644 ---- a/Utilities/VTK/vtkGDCMThreadedImageReader2.h -+++ b/Utilities/VTK/vtkGDCMThreadedImageReader2.h -@@ -50,7 +50,7 @@ class VTK_EXPORT vtkGDCMThreadedImageReader2 : public vtkThreadedImageAlgorithm - { - public: - static vtkGDCMThreadedImageReader2 *New(); -- vtkTypeRevisionMacro(vtkGDCMThreadedImageReader2,vtkThreadedImageAlgorithm); -+ vtkTypeMacro(vtkGDCMThreadedImageReader2,vtkThreadedImageAlgorithm); - virtual void PrintSelf(ostream& os, vtkIndent indent); - - vtkGetMacro(FileLowerLeft,int); -diff --git a/Utilities/VTK/vtkImageColorViewer.cxx b/Utilities/VTK/vtkImageColorViewer.cxx -index e1fa303..3d6df39 100644 ---- a/Utilities/VTK/vtkImageColorViewer.cxx -+++ b/Utilities/VTK/vtkImageColorViewer.cxx -@@ -49,7 +49,7 @@ - #include "vtkInformation.h" - #endif - --vtkCxxRevisionMacro(vtkImageColorViewer, "$Revision: 1.3 $") -+//vtkCxxRevisionMacro(vtkImageColorViewer, "$Revision: 1.3 $") - vtkStandardNewMacro(vtkImageColorViewer) - - //---------------------------------------------------------------------------- -diff --git a/Utilities/VTK/vtkImageColorViewer.h b/Utilities/VTK/vtkImageColorViewer.h -index 6d83592..7673dba 100644 ---- a/Utilities/VTK/vtkImageColorViewer.h -+++ b/Utilities/VTK/vtkImageColorViewer.h -@@ -71,7 +71,7 @@ class VTK_EXPORT vtkImageColorViewer : public vtkObject - { - public: - static vtkImageColorViewer *New(); -- vtkTypeRevisionMacro(vtkImageColorViewer,vtkObject); -+ vtkTypeMacro(vtkImageColorViewer,vtkObject); - void PrintSelf(ostream& os, vtkIndent indent); - - // Description: -diff --git a/Utilities/VTK/vtkImageMapToColors16.cxx b/Utilities/VTK/vtkImageMapToColors16.cxx -index ae8d7e7..0300da7 100644 ---- a/Utilities/VTK/vtkImageMapToColors16.cxx -+++ b/Utilities/VTK/vtkImageMapToColors16.cxx -@@ -37,7 +37,7 @@ - #include "vtkScalarsToColors.h" - #include "vtkPointData.h" - --vtkCxxRevisionMacro(vtkImageMapToColors16, "$Revision: 1.30 $") -+//vtkCxxRevisionMacro(vtkImageMapToColors16, "$Revision: 1.30 $") - vtkStandardNewMacro(vtkImageMapToColors16) - vtkCxxSetObjectMacro(vtkImageMapToColors16,LookupTable,vtkScalarsToColors) - -diff --git a/Utilities/VTK/vtkImageMapToColors16.h b/Utilities/VTK/vtkImageMapToColors16.h -index c7d0cd3..48f763f 100644 ---- a/Utilities/VTK/vtkImageMapToColors16.h -+++ b/Utilities/VTK/vtkImageMapToColors16.h -@@ -50,7 +50,7 @@ class VTK_EXPORT vtkImageMapToColors16 : public vtkThreadedImageAlgorithm - { - public: - static vtkImageMapToColors16 *New(); -- vtkTypeRevisionMacro(vtkImageMapToColors16,vtkThreadedImageAlgorithm); -+ vtkTypeMacro(vtkImageMapToColors16,vtkThreadedImageAlgorithm); - void PrintSelf(ostream& os, vtkIndent indent); - - // Description: -diff --git a/Utilities/VTK/vtkImageMapToWindowLevelColors2.cxx b/Utilities/VTK/vtkImageMapToWindowLevelColors2.cxx -index a9233e2..337583a 100644 ---- a/Utilities/VTK/vtkImageMapToWindowLevelColors2.cxx -+++ b/Utilities/VTK/vtkImageMapToWindowLevelColors2.cxx -@@ -37,7 +37,7 @@ - #include "vtkScalarsToColors.h" - #include "vtkPointData.h" - --vtkCxxRevisionMacro(vtkImageMapToWindowLevelColors2, "$Revision: 1.3 $") -+//vtkCxxRevisionMacro(vtkImageMapToWindowLevelColors2, "$Revision: 1.3 $") - vtkStandardNewMacro(vtkImageMapToWindowLevelColors2) - - // Constructor sets default values -diff --git a/Utilities/VTK/vtkImageMapToWindowLevelColors2.h b/Utilities/VTK/vtkImageMapToWindowLevelColors2.h -index dc2db27..1ea8dde 100644 ---- a/Utilities/VTK/vtkImageMapToWindowLevelColors2.h -+++ b/Utilities/VTK/vtkImageMapToWindowLevelColors2.h -@@ -49,7 +49,7 @@ class VTK_EXPORT vtkImageMapToWindowLevelColors2 : public vtkImageMapToColors - { - public: - static vtkImageMapToWindowLevelColors2 *New(); -- vtkTypeRevisionMacro(vtkImageMapToWindowLevelColors2,vtkImageMapToColors); -+ vtkTypeMacro(vtkImageMapToWindowLevelColors2,vtkImageMapToColors); - void PrintSelf(ostream& os, vtkIndent indent); - - // Description: -diff --git a/Utilities/VTK/vtkImagePlanarComponentsToComponents.cxx b/Utilities/VTK/vtkImagePlanarComponentsToComponents.cxx -index 01a189a..af0e544 100644 ---- a/Utilities/VTK/vtkImagePlanarComponentsToComponents.cxx -+++ b/Utilities/VTK/vtkImagePlanarComponentsToComponents.cxx -@@ -41,7 +41,7 @@ - - #include <assert.h> - --vtkCxxRevisionMacro(vtkImagePlanarComponentsToComponents, "$Revision: 1.31 $") -+//vtkCxxRevisionMacro(vtkImagePlanarComponentsToComponents, "$Revision: 1.31 $") - vtkStandardNewMacro(vtkImagePlanarComponentsToComponents) - - //---------------------------------------------------------------------------- -diff --git a/Utilities/VTK/vtkImagePlanarComponentsToComponents.h b/Utilities/VTK/vtkImagePlanarComponentsToComponents.h -index d9bb13f..d378549 100644 ---- a/Utilities/VTK/vtkImagePlanarComponentsToComponents.h -+++ b/Utilities/VTK/vtkImagePlanarComponentsToComponents.h -@@ -49,8 +49,8 @@ class VTK_EXPORT vtkImagePlanarComponentsToComponents : public vtkImageAlgorithm - { - public: - static vtkImagePlanarComponentsToComponents *New(); -- //vtkTypeRevisionMacro(vtkImagePlanarComponentsToComponents,vtkThreadedImageAlgorithm); -- vtkTypeRevisionMacro(vtkImagePlanarComponentsToComponents,vtkImageAlgorithm); -+ //vtkTypeMacro(vtkImagePlanarComponentsToComponents,vtkThreadedImageAlgorithm); -+ vtkTypeMacro(vtkImagePlanarComponentsToComponents,vtkImageAlgorithm); - - void PrintSelf(ostream& os, vtkIndent indent); - -diff --git a/Utilities/VTK/vtkImageRGBToYBR.cxx b/Utilities/VTK/vtkImageRGBToYBR.cxx -index 8914346..3b2a400 100644 ---- a/Utilities/VTK/vtkImageRGBToYBR.cxx -+++ b/Utilities/VTK/vtkImageRGBToYBR.cxx -@@ -34,7 +34,7 @@ - #include "vtkMath.h" - #include "vtkObjectFactory.h" - --vtkCxxRevisionMacro(vtkImageRGBToYBR, "$Revision: 1.31 $") -+//vtkCxxRevisionMacro(vtkImageRGBToYBR, "$Revision: 1.31 $") - vtkStandardNewMacro(vtkImageRGBToYBR) - - //---------------------------------------------------------------------------- -diff --git a/Utilities/VTK/vtkImageRGBToYBR.h b/Utilities/VTK/vtkImageRGBToYBR.h -index 132429b..7bcec29 100644 ---- a/Utilities/VTK/vtkImageRGBToYBR.h -+++ b/Utilities/VTK/vtkImageRGBToYBR.h -@@ -45,7 +45,7 @@ class VTK_EXPORT vtkImageRGBToYBR : public vtkThreadedImageAlgorithm - { - public: - static vtkImageRGBToYBR *New(); -- vtkTypeRevisionMacro(vtkImageRGBToYBR,vtkThreadedImageAlgorithm); -+ vtkTypeMacro(vtkImageRGBToYBR,vtkThreadedImageAlgorithm); - - void PrintSelf(ostream& os, vtkIndent indent); - -diff --git a/Utilities/VTK/vtkImageYBRToRGB.cxx b/Utilities/VTK/vtkImageYBRToRGB.cxx -index 06c54c7..60aad2c 100644 ---- a/Utilities/VTK/vtkImageYBRToRGB.cxx -+++ b/Utilities/VTK/vtkImageYBRToRGB.cxx -@@ -34,7 +34,7 @@ - #include "vtkMath.h" - #include "vtkObjectFactory.h" - --vtkCxxRevisionMacro(vtkImageYBRToRGB, "$Revision: 1.31 $") -+//vtkCxxRevisionMacro(vtkImageYBRToRGB, "$Revision: 1.31 $") - vtkStandardNewMacro(vtkImageYBRToRGB) - - //---------------------------------------------------------------------------- -diff --git a/Utilities/VTK/vtkImageYBRToRGB.h b/Utilities/VTK/vtkImageYBRToRGB.h -index d83cc57..8c7e14f 100644 ---- a/Utilities/VTK/vtkImageYBRToRGB.h -+++ b/Utilities/VTK/vtkImageYBRToRGB.h -@@ -45,7 +45,7 @@ class VTK_EXPORT vtkImageYBRToRGB : public vtkThreadedImageAlgorithm - { - public: - static vtkImageYBRToRGB *New(); -- vtkTypeRevisionMacro(vtkImageYBRToRGB,vtkThreadedImageAlgorithm); -+ vtkTypeMacro(vtkImageYBRToRGB,vtkThreadedImageAlgorithm); - - void PrintSelf(ostream& os, vtkIndent indent); - -diff --git a/Utilities/VTK/vtkLookupTable16.cxx b/Utilities/VTK/vtkLookupTable16.cxx -index 8559104..45be3be 100644 ---- a/Utilities/VTK/vtkLookupTable16.cxx -+++ b/Utilities/VTK/vtkLookupTable16.cxx -@@ -32,7 +32,7 @@ - - #include <cassert> - --vtkCxxRevisionMacro(vtkLookupTable16, "$Revision: 1.107 $") -+//vtkCxxRevisionMacro(vtkLookupTable16, "$Revision: 1.107 $") - vtkStandardNewMacro(vtkLookupTable16) - - vtkLookupTable16::vtkLookupTable16(int sze, int ext) -diff --git a/Utilities/VTK/vtkLookupTable16.h b/Utilities/VTK/vtkLookupTable16.h -index ea65d67..2ddd2f4 100644 ---- a/Utilities/VTK/vtkLookupTable16.h -+++ b/Utilities/VTK/vtkLookupTable16.h -@@ -46,7 +46,7 @@ class VTK_EXPORT vtkLookupTable16 : public vtkLookupTable - public: - static vtkLookupTable16 *New(); - -- vtkTypeRevisionMacro(vtkLookupTable16,vtkLookupTable); -+ vtkTypeMacro(vtkLookupTable16,vtkLookupTable); - void PrintSelf(ostream& os, vtkIndent indent); - - void Build(); -diff --git a/Utilities/VTK/vtkRTStructSetProperties.cxx b/Utilities/VTK/vtkRTStructSetProperties.cxx -index 6f03a6b..6310b60 100644 ---- a/Utilities/VTK/vtkRTStructSetProperties.cxx -+++ b/Utilities/VTK/vtkRTStructSetProperties.cxx -@@ -28,7 +28,7 @@ - #include <assert.h> - - //---------------------------------------------------------------------------- --vtkCxxRevisionMacro(vtkRTStructSetProperties, "1.21") -+//vtkCxxRevisionMacro(vtkRTStructSetProperties, "1.21") - vtkStandardNewMacro(vtkRTStructSetProperties) - - -diff --git a/Utilities/VTK/vtkRTStructSetProperties.h b/Utilities/VTK/vtkRTStructSetProperties.h -index a5aef7c..0beb5ef 100644 ---- a/Utilities/VTK/vtkRTStructSetProperties.h -+++ b/Utilities/VTK/vtkRTStructSetProperties.h -@@ -28,7 +28,7 @@ class VTK_EXPORT vtkRTStructSetProperties : public vtkObject - { - public: - static vtkRTStructSetProperties *New(); -- vtkTypeRevisionMacro(vtkRTStructSetProperties,vtkObject); -+ vtkTypeMacro(vtkRTStructSetProperties,vtkObject); - void PrintSelf(ostream& os, vtkIndent indent); - - // Description: -diff --git a/Utilities/gdcmopenjpeg-v1/common/format_defs.h b/Utilities/gdcmopenjpeg-v1/common/format_defs.h -index d4be93b..5c31b18 100644 ---- a/Utilities/gdcmopenjpeg-v1/common/format_defs.h -+++ b/Utilities/gdcmopenjpeg-v1/common/format_defs.h -@@ -45,4 +45,4 @@ - #define TGA_DFMT 16 - #define PNG_DFMT 17 - --#endif /* _OPJ_FORMAT_DEFS_H_ */ -\ No newline at end of file -+#endif /* _OPJ_FORMAT_DEFS_H_ */ -diff --git a/Utilities/wxWidgets/wxVTKRenderWindowInteractor.cxx b/Utilities/wxWidgets/wxVTKRenderWindowInteractor.cxx -index 69f6110..44e17e3 100644 ---- a/Utilities/wxWidgets/wxVTKRenderWindowInteractor.cxx -+++ b/Utilities/wxWidgets/wxVTKRenderWindowInteractor.cxx -@@ -134,7 +134,7 @@ BEGIN_EVENT_TABLE(wxVTKRenderWindowInteractor, wxWindow) - EVT_SIZE (wxVTKRenderWindowInteractor::OnSize) - END_EVENT_TABLE() - --vtkCxxRevisionMacro(wxVTKRenderWindowInteractor, "$Revision: 1.42 $") -+//vtkCxxRevisionMacro(wxVTKRenderWindowInteractor, "$Revision: 1.42 $") - vtkInstantiatorNewMacro(wxVTKRenderWindowInteractor) - - //--------------------------------------------------------------------------- -diff --git a/Utilities/wxWidgets/wxVTKRenderWindowInteractor.h b/Utilities/wxWidgets/wxVTKRenderWindowInteractor.h -index ead4444..0652395 100644 ---- a/Utilities/wxWidgets/wxVTKRenderWindowInteractor.h -+++ b/Utilities/wxWidgets/wxVTKRenderWindowInteractor.h -@@ -102,7 +102,7 @@ class wxVTKRenderWindowInteractor : public wxWindow, public vtkRenderWindowInter - const wxSize &size = wxDefaultSize, - long style = wxWANTS_CHARS | wxNO_FULL_REPAINT_ON_RESIZE, - const wxString &name = wxPanelNameStr); -- vtkTypeRevisionMacro(wxVTKRenderWindowInteractor,vtkRenderWindowInteractor); -+ vtkTypeMacro(wxVTKRenderWindowInteractor,vtkRenderWindowInteractor); - static wxVTKRenderWindowInteractor * New(); - void PrintSelf(ostream& os, vtkIndent indent); - diff --git a/debian/patches/09_set_java_15.patch b/debian/patches/09_set_java_15.patch deleted file mode 100644 index 75d350a..0000000 --- a/debian/patches/09_set_java_15.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: Support java versions from 1.5 on -Author: Tobias Frost <[email protected]> -Forwarded: not needed - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -524,8 +524,8 @@ - option(GDCM_USE_JPEGLS "Build GDCM with JPEG-LS support" ON) - mark_as_advanced(GDCM_USE_JPEGLS) - if(GDCM_WRAP_JAVA) -- set(GDCM_JAVA_SOURCE_VERSION "1.7" CACHE STRING "javac source version") -- set(GDCM_JAVA_TARGET_VERSION "1.7" CACHE STRING "javac target version") -+ set(GDCM_JAVA_SOURCE_VERSION "1.5" CACHE STRING "javac source version") -+ set(GDCM_JAVA_TARGET_VERSION "1.5" CACHE STRING "javac target version") - mark_as_advanced(GDCM_JAVA_SOURCE_VERSION GDCM_JAVA_TARGET_VERSION) - endif() - if(GDCM_WRAP_CSHARP) ---- a/Wrapping/Java/CMakeLists.txt -+++ b/Wrapping/Java/CMakeLists.txt -@@ -14,7 +14,7 @@ - - # $ export JAVA_HOME=/usr/lib/j2sdk1.6-sun/ - # $ export JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun/ --find_package(Java 1.7 REQUIRED) # javac, jar -+find_package(Java 1.5 REQUIRED) # javac, jar - find_package(JNI REQUIRED) - include_directories( - ${JNI_INCLUDE_DIRS} diff --git a/debian/patches/10_gdcm_openjpeg2_git4f793f.patch b/debian/patches/10_gdcm_openjpeg2_git4f793f.patch deleted file mode 100644 index ce87d4d..0000000 --- a/debian/patches/10_gdcm_openjpeg2_git4f793f.patch +++ /dev/null @@ -1,128 +0,0 @@ -commit 4f793f6005c794de633d01e42e00d37f80340fac -Author: Mathieu Malaterre <[email protected]> -Date: Thu May 26 08:58:26 2016 +0200 - - Minimal changes to make GDCM compiles against OPJ 2.1.0 - -diff --git a/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx b/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx -index 63de2c6..d6f3192 100644 ---- a/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx -+++ b/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx -@@ -78,6 +78,10 @@ void info_callback(const char *msg, void *) { - #define RAW_DFMT 15 - #define TGA_DFMT 16 - #define PNG_DFMT 17 -+#define CODEC_JP2 OPJ_CODEC_JP2 -+#define CODEC_J2K OPJ_CODEC_J2K -+#define CLRSPC_GRAY OPJ_CLRSPC_GRAY -+#define CLRSPC_SRGB OPJ_CLRSPC_SRGB - #endif // OPENJPEG_MAJOR_VERSION == 1 - - #if OPENJPEG_MAJOR_VERSION == 2 -@@ -190,7 +194,7 @@ opj_stream_t* OPJ_CALLCONV opj_stream_create_memory_stream (myfile* p_mem,OPJ_UI - { - return 00; - } -- opj_stream_set_user_data(l_stream,p_mem); -+ opj_stream_set_user_data(l_stream,p_mem,NULL); - opj_stream_set_read_function(l_stream,(opj_stream_read_fn) opj_read_from_memory); - opj_stream_set_write_function(l_stream, (opj_stream_write_fn) opj_write_from_memory); - opj_stream_set_skip_function(l_stream, (opj_stream_skip_fn) opj_skip_from_memory); -@@ -534,13 +538,18 @@ std::pair<char *, size_t> JPEG2000Codec::DecodeByStreamsCommon(char *dummy_buffe - s[1] = 0; - opj_set_error_handler(dinfo, gdcm_error_callback, s); - -+#ifdef OPJ_J2K_STREAM_CHUNK_SIZE -+ cio = opj_stream_create_memory_stream(fsrc,OPJ_J2K_STREAM_CHUNK_SIZE, true); -+#else - cio = opj_stream_create_memory_stream(fsrc,J2K_STREAM_CHUNK_SIZE, true); -+#endif - - /* setup the decoder decoding parameters using user parameters */ - opj_setup_decoder(dinfo, ¶meters); - bool bResult; - OPJ_INT32 l_tile_x0,l_tile_y0; - OPJ_UINT32 l_tile_width,l_tile_height,l_nb_tiles_x,l_nb_tiles_y; -+#if 0 - bResult = opj_read_header( - dinfo, - &image, -@@ -551,17 +560,25 @@ std::pair<char *, size_t> JPEG2000Codec::DecodeByStreamsCommon(char *dummy_buffe - &l_nb_tiles_x, - &l_nb_tiles_y, - cio); -+#else -+ bResult = opj_read_header( -+ cio, -+ dinfo, -+ &image); -+#endif - assert( bResult ); - - #if OPENJPEG_MAJOR_VERSION == 1 - #else -+#if 0 - // needs to be before call to opj_decode... - reversible = opj_get_reversible(dinfo, ¶meters ); - assert( reversible == 0 || reversible == 1 ); - #endif -+#endif - -- image = opj_decode(dinfo, cio); -- //assert( image ); -+ bResult = opj_decode(dinfo, cio,image); -+ assert( bResult ); - bResult = bResult && (image != 00); - bResult = bResult && opj_end_decompress(dinfo,cio); - if (!image || !check_comp_valid(image) ) -@@ -1050,7 +1067,7 @@ bool JPEG2000Codec::CodeFrameIntoBuffer(char * outdata, size_t outlen, size_t & - - /* open a byte stream for writing */ - /* allocate memory for all tiles */ -- cio = opj_stream_create_memory_stream(fsrc,J2K_STREAM_CHUNK_SIZE,false); -+ cio = opj_stream_create_memory_stream(fsrc,OPJ_J2K_STREAM_CHUNK_SIZE,false); - if (! cio) - { - return false; -@@ -1277,13 +1294,14 @@ bool JPEG2000Codec::GetHeaderInfo(const char * dummy_buffer, size_t buf_size, Tr - // the hack is not used when reading meta-info of a j2k stream: - opj_set_error_handler(dinfo, gdcm_error_callback, NULL); - -- cio = opj_stream_create_memory_stream(fsrc,J2K_STREAM_CHUNK_SIZE, true); -+ cio = opj_stream_create_memory_stream(fsrc,OPJ_J2K_STREAM_CHUNK_SIZE, true); - - /* setup the decoder decoding parameters using user parameters */ - opj_setup_decoder(dinfo, ¶meters); - bool bResult; - OPJ_INT32 l_tile_x0,l_tile_y0; - OPJ_UINT32 l_tile_width,l_tile_height,l_nb_tiles_x,l_nb_tiles_y; -+#if 0 - bResult = opj_read_header( - dinfo, - &image, -@@ -1294,6 +1312,12 @@ bool JPEG2000Codec::GetHeaderInfo(const char * dummy_buffer, size_t buf_size, Tr - &l_nb_tiles_x, - &l_nb_tiles_y, - cio); -+#else -+ bResult = opj_read_header( -+ cio, -+ dinfo, -+ &image); -+#endif - //image = opj_decode(dinfo, cio); - //bResult = bResult && (image != 00); - //bResult = bResult && opj_end_decompress(dinfo,cio); -@@ -1331,10 +1355,12 @@ bool JPEG2000Codec::GetHeaderInfo(const char * dummy_buffer, size_t buf_size, Tr - return false; - } - #else -+#if 0 - reversible = opj_get_reversible(dinfo, ¶meters ); - assert( reversible == 0 || reversible == 1 ); - // FIXME - assert( mct == 0 || mct == 1 ); -+#endif - #endif // OPENJPEG_MAJOR_VERSION == 1 - LossyFlag = !reversible; - diff --git a/debian/patches/11_gdcm_openjpeg2_git0511b1.patch b/debian/patches/11_gdcm_openjpeg2_git0511b1.patch deleted file mode 100644 index a4c81d3..0000000 --- a/debian/patches/11_gdcm_openjpeg2_git0511b1.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 0511b1d6d356a1c5d1f4e22cd5bb862ef233a332 -Author: Mathieu Malaterre <[email protected]> -Date: Thu May 26 12:02:34 2016 +0200 - - This is a legitimate init - - DICOM standard allow storing lossless J2K within the broad JPEG 2000 TS - -diff --git a/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx b/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx -index d6f3192..3025621 100644 ---- a/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx -+++ b/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx -@@ -574,6 +574,8 @@ std::pair<char *, size_t> JPEG2000Codec::DecodeByStreamsCommon(char *dummy_buffe - // needs to be before call to opj_decode... - reversible = opj_get_reversible(dinfo, ¶meters ); - assert( reversible == 0 || reversible == 1 ); -+#else -+ reversible = 0; - #endif - #endif - -@@ -1360,6 +1362,8 @@ bool JPEG2000Codec::GetHeaderInfo(const char * dummy_buffer, size_t buf_size, Tr - assert( reversible == 0 || reversible == 1 ); - // FIXME - assert( mct == 0 || mct == 1 ); -+#else -+ reversible = 0; - #endif - #endif // OPENJPEG_MAJOR_VERSION == 1 - LossyFlag = !reversible; diff --git a/debian/patches/12_gdcm_system_charls_includes.patch b/debian/patches/12_gdcm_system_charls_includes.patch deleted file mode 100644 index 4135715..0000000 --- a/debian/patches/12_gdcm_system_charls_includes.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: Update charls includes for the system version 1.1 -Author: Gert Wollny <[email protected]> -Forwarded: yes - -diff --git a/Utilities/gdcm_charls.h b/Utilities/gdcm_charls.h -index c8f2c54..ba36b60 100644 ---- a/Utilities/gdcm_charls.h -+++ b/Utilities/gdcm_charls.h -@@ -18,12 +18,13 @@ - #include "gdcmTypes.h" - #ifdef GDCM_USE_SYSTEM_CHARLS - // It is expected that 1.0 API is used (JlsParameters instead of JlsParamaters) -+# include <CharLS/header.h> - # include <CharLS/interface.h> - # include <CharLS/util.h> - # include <CharLS/defaulttraits.h> - # include <CharLS/losslesstraits.h> - # include <CharLS/colortransform.h> --# include <CharLS/streams.h> -+//# include <CharLS/streams.h> - # include <CharLS/processline.h> - #else - #include "gdcmcharls/header.h" diff --git a/debian/patches/series b/debian/patches/series index 54e2f9c..9e084ff 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,11 +1,3 @@ 02_fixhurd.patch 03_linkvtkdoc.patch 04_multiarch.patch -#05_add_global_doxydoc_target.patch -#06_dcm_group2_buggyfiles_fallback.patch -#07_don_t_link_vtkjava_modules.patch -#08_supportvtk6.3.patch -#09_set_java_15.patch -#10_gdcm_openjpeg2_git4f793f.patch -#11_gdcm_openjpeg2_git0511b1.patch -#12_gdcm_system_charls_includes.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gdcm.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
