[med-svn] r3492 - in trunk/packages/gdcm/trunk/debian: . lintian patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Tue Jun 16 08:40:10 UTC 2009
Author: malat-guest
Date: 2009-06-16 08:40:09 +0000 (Tue, 16 Jun 2009)
New Revision: 3492
Added:
trunk/packages/gdcm/trunk/debian/lintian/
trunk/packages/gdcm/trunk/debian/lintian/libgdcm2.0
Removed:
trunk/packages/gdcm/trunk/debian/patches/csharp-install.patch
trunk/packages/gdcm/trunk/debian/patches/gdcm210_branchbackport.patch
trunk/packages/gdcm/trunk/debian/patches/gdcm210_tagbackport.patch
Modified:
trunk/packages/gdcm/trunk/debian/changelog
trunk/packages/gdcm/trunk/debian/patches/series
Log:
add lintian rule
Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog 2009-06-16 08:26:21 UTC (rev 3491)
+++ trunk/packages/gdcm/trunk/debian/changelog 2009-06-16 08:40:09 UTC (rev 3492)
@@ -1,5 +1,6 @@
gdcm (2.0.12-1) unstable; urgency=low
+ * new upstream: 2.0.12
* Skipping 2.0.11 packaging as it does not provides anything more than 2.0.12
* Adding libvtkgdcm-cil, libgdcm-java and libvtkgdcm-java which provides,
namely the CLI binding to VTK/GDCM, the Java binding to gdcm and the Java
Added: trunk/packages/gdcm/trunk/debian/lintian/libgdcm2.0
===================================================================
--- trunk/packages/gdcm/trunk/debian/lintian/libgdcm2.0 (rev 0)
+++ trunk/packages/gdcm/trunk/debian/lintian/libgdcm2.0 2009-06-16 08:40:09 UTC (rev 3492)
@@ -0,0 +1,2 @@
+# W: libgdcm2.0: package-name-doesnt-match-sonames libgdcmCommon2.0 libgdcmDICT2.0 libgdcmDSED2.0 libgdcmIOD2.0 libgdcmMSFF2.0 libgdcmjpeg12-2.0 libgdcmjpeg16-2.0 libgdcmjpeg8-2.0
+libgdcm2.0 binary: package-name-doesnt-match-sonames
Deleted: trunk/packages/gdcm/trunk/debian/patches/csharp-install.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/csharp-install.patch 2009-06-16 08:26:21 UTC (rev 3491)
+++ trunk/packages/gdcm/trunk/debian/patches/csharp-install.patch 2009-06-16 08:40:09 UTC (rev 3492)
@@ -1,44 +0,0 @@
---- gdcm-2.0.10.orig/Wrapping/Csharp/CMakeLists.txt
-+++ gdcm-2.0.10/Wrapping/Csharp/CMakeLists.txt
-@@ -41,22 +41,6 @@
- SET_TARGET_PROPERTIES(${SWIG_MODULE_gdcm_REAL_NAME} PROPERTIES PREFIX "lib")
- ENDIF(UNIX)
-
--
--#Module are always place in the library destination
--#but for poor win32 user I decided to place them
--# right next to the other dlls
--IF(NOT GDCM_INSTALL_NO_LIBRARIES)
-- INSTALL(TARGETS ${SWIG_MODULE_gdcm_REAL_NAME}
-- RUNTIME DESTINATION ${GDCM_INSTALL_BIN_DIR} COMPONENT Runtime
-- LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Runtime
-- ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development
-- ${CPACK_NAMELINK_TYPE}
-- )
--
--ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
--
--
--
- ##IF(UNIX)
- ## FIND_PACKAGE(MONO REQUIRED)
- #FIND_PACKAGE(CSharp REQUIRED)
-@@ -171,14 +155,14 @@
-
- IF(NOT GDCM_INSTALL_NO_LIBRARIES)
- INSTALL(TARGETS ${SWIG_MODULE_gdcm_REAL_NAME}
-- RUNTIME DESTINATION ${GDCM_INSTALL_BIN_DIR} COMPONENT Runtime
-- LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Runtime
-- ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development
-+ RUNTIME DESTINATION ${GDCM_INSTALL_PACKAGE_DIR} COMPONENT Runtime
-+ LIBRARY DESTINATION ${GDCM_INSTALL_PACKAGE_DIR} COMPONENT Runtime
-+ ARCHIVE DESTINATION ${GDCM_INSTALL_PACKAGE_DIR} COMPONENT Development
- ${CPACK_NAMELINK_TYPE}
- )
- # because gdcm_csharp.dll is constructed with custom commands, it need the INSTALL(FILES signature:
- INSTALL(FILES ${GDCM_LIBRARY_DIR}/gdcm_csharp.dll
-- DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Runtime
-+ DESTINATION ${GDCM_INSTALL_PACKAGE_DIR} COMPONENT Runtime
- )
- ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
-
Deleted: trunk/packages/gdcm/trunk/debian/patches/gdcm210_branchbackport.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/gdcm210_branchbackport.patch 2009-06-16 08:26:21 UTC (rev 3491)
+++ trunk/packages/gdcm/trunk/debian/patches/gdcm210_branchbackport.patch 2009-06-16 08:40:09 UTC (rev 3492)
@@ -1,1050 +0,0 @@
-Patch was generated using the following
-command: diff -x .svn -r -u ../tags/gdcm-2-0-10 gdcm-2-0 > gdcm210_branchbackport.patch
-It includes all the important patch that were applied to gdcm-2-0 branch after gdcm 2.0.10
-was released
-
-diff -r -u -x .svn ../tags/gdcm-2-0-10/CMake/CTestCustom.ctest.in gdcm-2-0/CMake/CTestCustom.ctest.in
---- ../tags/gdcm-2-0-10/CMake/CTestCustom.ctest.in 2008-11-18 09:54:18.000000000 +0100
-+++ gdcm-2-0/CMake/CTestCustom.ctest.in 2008-12-09 12:49:03.000000000 +0100
-@@ -20,6 +20,7 @@
- "DCDUMP"
- "DCMDJPEG"
- "DCMDRLE"
-+ "vtk"
- )
-
- # ==3201== 8 bytes in 1 blocks are still reachable in loss record 2 of 8
-diff -r -u -x .svn ../tags/gdcm-2-0-10/CMake/FindDotNETFrameworkSDK.cmake gdcm-2-0/CMake/FindDotNETFrameworkSDK.cmake
---- ../tags/gdcm-2-0-10/CMake/FindDotNETFrameworkSDK.cmake 2008-11-18 09:54:18.000000000 +0100
-+++ gdcm-2-0/CMake/FindDotNETFrameworkSDK.cmake 2008-11-18 11:51:49.000000000 +0100
-@@ -41,3 +41,8 @@
- GET_FILENAME_COMPONENT(current_list_path ${CMAKE_CURRENT_LIST_FILE} PATH)
- SET(DotNETFrameworkSDK_USE_FILE ${current_list_path}/UseDotNETFrameworkSDK.cmake)
-
-+MARK_AS_ADVANCED(
-+ CSC_v1_EXECUTABLE
-+ CSC_v2_EXECUTABLE
-+ CSC_v3_EXECUTABLE
-+)
-diff -r -u -x .svn ../tags/gdcm-2-0-10/CMakeLists.txt gdcm-2-0/CMakeLists.txt
---- ../tags/gdcm-2-0-10/CMakeLists.txt 2008-12-15 09:49:34.000000000 +0100
-+++ gdcm-2-0/CMakeLists.txt 2008-11-18 09:54:17.000000000 +0100
-@@ -483,12 +483,6 @@
- SET(CPACK_NSIS_HELP_LINK "http://gdcm.sourceforge.net")
- SET(CPACK_NSIS_URL_INFO_ABOUT "http://gdcm.sourceforge.net")
- SET(CPACK_NSIS_MODIFY_PATH ON)
-- IF(${CMAKE_INSTALL_PREFIX} MATCHES ${CPACK_PACKAGE_INSTALL_DIRECTORY})
-- ELSE(${CMAKE_INSTALL_PREFIX} MATCHES ${CPACK_PACKAGE_INSTALL_DIRECTORY})
-- STRING(REPLACE ${PROJECT_NAME} ${CPACK_PACKAGE_INSTALL_DIRECTORY} dummy ${CMAKE_INSTALL_PREFIX} )
-- SET(CMAKE_INSTALL_PREFIX ${dummy} CACHE PATH "" FORCE)
-- ENDIF(${CMAKE_INSTALL_PREFIX} MATCHES ${CPACK_PACKAGE_INSTALL_DIRECTORY})
--
- ELSE(WIN32 AND NOT UNIX)
- # http://www.vtk.org/Wiki/CMake:CPackConfiguration
- # List of files to be stripped. Starting with CMake 2.6.0 CPACK_STRIP_FILES will be a boolean variable which enables
-diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/Common/gdcmSmartPointer.h gdcm-2-0/Source/Common/gdcmSmartPointer.h
---- ../tags/gdcm-2-0-10/Source/Common/gdcmSmartPointer.h 2008-11-18 09:54:25.000000000 +0100
-+++ gdcm-2-0/Source/Common/gdcmSmartPointer.h 2009-04-10 12:35:00.000000000 +0200
-@@ -93,6 +93,10 @@
- return operator = (tmp);
- }
-
-+ /// Explicit function to retrieve the pointer
-+ ObjectType *GetPointer() const
-+ { return Pointer; }
-+
- private:
- void Register()
- {
-diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/Common/gdcmString.h gdcm-2-0/Source/Common/gdcmString.h
---- ../tags/gdcm-2-0-10/Source/Common/gdcmString.h 2008-11-18 09:54:25.000000000 +0100
-+++ gdcm-2-0/Source/Common/gdcmString.h 2009-04-29 10:35:56.000000000 +0200
-@@ -28,7 +28,7 @@
- *
- * \note bla
- */
--template <char TDelimiter = EOF, unsigned int TMaxLength = 64, char TPadChar = ' '>
-+template <char TDelimiter = '\\', unsigned int TMaxLength = 64, char TPadChar = ' '>
- class /*GDCM_EXPORT*/ String : public std::string /* PLEASE do not export me */
- {
- // UI wants \0 for pad character, while ASCII ones wants space char... do not allow anything else
-diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/Common/gdcmTesting.cxx gdcm-2-0/Source/Common/gdcmTesting.cxx
---- ../tags/gdcm-2-0-10/Source/Common/gdcmTesting.cxx 2008-11-18 09:54:25.000000000 +0100
-+++ gdcm-2-0/Source/Common/gdcmTesting.cxx 2009-04-29 10:38:12.000000000 +0200
-@@ -17,6 +17,7 @@
-
- #include <string.h> // strcmp
- #include <stdlib.h> // malloc
-+#include <stdio.h> // fopen
-
- #include "gdcm_md5.h"
-
-diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/Common/zipstreamimpl.hpp gdcm-2-0/Source/Common/zipstreamimpl.hpp
---- ../tags/gdcm-2-0-10/Source/Common/zipstreamimpl.hpp 2008-11-18 09:54:25.000000000 +0100
-+++ gdcm-2-0/Source/Common/zipstreamimpl.hpp 2009-04-29 10:36:19.000000000 +0200
-@@ -35,6 +35,7 @@
- also when writing deflate back to disk, the add_footer must be called
- */
- #include <string.h> // memcpy
-+#include <stdio.h> // EOF
-
- //*****************************************************************************
- // template class basic_zip_streambuf
-diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataStructureAndEncodingDefinition/gdcmAttribute.h gdcm-2-0/Source/DataStructureAndEncodingDefinition/gdcmAttribute.h
---- ../tags/gdcm-2-0-10/Source/DataStructureAndEncodingDefinition/gdcmAttribute.h 2008-11-18 09:54:25.000000000 +0100
-+++ gdcm-2-0/Source/DataStructureAndEncodingDefinition/gdcmAttribute.h 2009-04-22 17:13:55.000000000 +0200
-@@ -161,6 +161,16 @@
- GetNumberOfValues(),os);
- ret.SetVR( GetVR() );
- assert( ret.GetVR() != VR::SQ );
-+ if( VRToEncoding<TVR>::Mode == VR::VRASCII )
-+ {
-+ if( GetVR() != VR::UI )
-+ {
-+ if( os.str().size() % 2 )
-+ {
-+ os << " ";
-+ }
-+ }
-+ }
- ret.SetByteValue( os.str().c_str(), os.str().size() );
- return ret;
- }
-diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataStructureAndEncodingDefinition/gdcmDataElement.h gdcm-2-0/Source/DataStructureAndEncodingDefinition/gdcmDataElement.h
---- ../tags/gdcm-2-0-10/Source/DataStructureAndEncodingDefinition/gdcmDataElement.h 2008-11-18 09:54:25.000000000 +0100
-+++ gdcm-2-0/Source/DataStructureAndEncodingDefinition/gdcmDataElement.h 2009-04-10 12:08:17.000000000 +0200
-@@ -112,8 +112,8 @@
- /// Return the Value of DataElement as a ByteValue (if possible)
- /// \warning: You need to check for NULL return value
- const ByteValue* GetByteValue() const {
-- const Value &v = GetValue();
-- const ByteValue *bv = dynamic_cast<const ByteValue*>(&v);
-+ // Get the raw pointer from the gdcm::SmartPointer
-+ const ByteValue *bv = dynamic_cast<const ByteValue*>(ValueField.GetPointer());
- return bv; // Will return NULL if not ByteValue
- }
-
-diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataStructureAndEncodingDefinition/gdcmElement.h gdcm-2-0/Source/DataStructureAndEncodingDefinition/gdcmElement.h
---- ../tags/gdcm-2-0-10/Source/DataStructureAndEncodingDefinition/gdcmElement.h 2008-11-18 09:54:25.000000000 +0100
-+++ gdcm-2-0/Source/DataStructureAndEncodingDefinition/gdcmElement.h 2009-05-06 15:47:13.000000000 +0200
-@@ -157,15 +157,15 @@
- assert( _is );
- // FIXME BUG: what if >> operation fails ?
- // gdcmData/MR00010001.dcm / SpacingBetweenSlices
-- _is >> data[0];
-+ _is >> std::ws >> data[0];
- char sep;
- //std::cout << "GetLength: " << af->GetLength() << std::endl;
- for(unsigned long i=1; i<length;++i) {
- assert( _is );
- // Get the separator in between the values
-- _is.get(sep);
-+ _is >> std::ws >> sep; //_is.get(sep);
- assert( sep == '\\' ); // FIXME: Bad use of assert
-- _is >> data[i];
-+ _is >> std::ws >> data[i];
- }
- }
-
-diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfFragments.h gdcm-2-0/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfFragments.h
---- ../tags/gdcm-2-0-10/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfFragments.h 2008-11-18 09:54:25.000000000 +0100
-+++ gdcm-2-0/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfFragments.h 2009-04-15 10:31:11.000000000 +0200
-@@ -150,7 +150,17 @@
- return os;
- }
-
-+//#if defined(SWIGPYTHON) || defined(SWIGCSHARP)
-+ // For now leave it there, this does not make sense in the C++ layer
-+ // Create a new object
-+ static SmartPointer<SequenceOfFragments> New()
-+ {
-+ return new SequenceOfFragments();
-+ }
-+//#endif
-+
- protected:
-+public:
- void Print(std::ostream &os) const {
- os << "SQ L= " << SequenceLengthField << "\n";
- os << "Table:" << Table << "\n";
-diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/MediaStorageAndFileFormat/gdcmCurve.cxx gdcm-2-0/Source/MediaStorageAndFileFormat/gdcmCurve.cxx
---- ../tags/gdcm-2-0-10/Source/MediaStorageAndFileFormat/gdcmCurve.cxx 2008-11-18 09:54:23.000000000 +0100
-+++ gdcm-2-0/Source/MediaStorageAndFileFormat/gdcmCurve.cxx 2009-03-23 11:41:56.000000000 +0100
-@@ -128,7 +128,15 @@
- else
- {
- // Yeah this is an overlay element
-- ++numoverlays;
-+ if( ds.FindDataElement( Tag(overlay.GetGroup(),0x3000 ) ) )
-+ {
-+ // ok so far so good...
-+ const DataElement& overlaydata = ds.GetDataElement(Tag(overlay.GetGroup(),0x3000));
-+ if( !overlaydata.IsEmpty() )
-+ {
-+ ++numoverlays;
-+ }
-+ }
- // Store found tag in overlay:
- overlay = de.GetTag();
- // Move on to the next possible one:
-diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/MediaStorageAndFileFormat/gdcmOverlay.cxx gdcm-2-0/Source/MediaStorageAndFileFormat/gdcmOverlay.cxx
---- ../tags/gdcm-2-0-10/Source/MediaStorageAndFileFormat/gdcmOverlay.cxx 2008-11-18 09:54:23.000000000 +0100
-+++ gdcm-2-0/Source/MediaStorageAndFileFormat/gdcmOverlay.cxx 2009-03-23 11:41:59.000000000 +0100
-@@ -120,24 +120,28 @@
- }
- else
- {
-- // Yeah this is a potential overlay element, let's check this is not a broken LEADTOOL image:
-- ++numoverlays;
-+ // Yeah this is a potential overlay element, let's check this is not a broken LEADTOOL image,
-+ // or prova0001.dcm:
-+ // (5000,0000) UL 0 # 4, 1 GenericGroupLength
-+ // (6000,0000) UL 0 # 4, 1 GenericGroupLength
-+ // (6001,0000) UL 28 # 4, 1 PrivateGroupLength
-+ // (6001,0010) LT [PAPYRUS 3.0] # 12, 1 PrivateCreator
-+ // (6001,1001) LT (no value available) # 0, 0 Unknown Tag & Data
- if( ds.FindDataElement( Tag(overlay.GetGroup(),0x3000 ) ) )
- {
- // ok so far so good...
- const DataElement& overlaydata = ds.GetDataElement(Tag(overlay.GetGroup(),0x3000));
-- if( overlaydata.IsEmpty() )
-+ if( !overlaydata.IsEmpty() )
- {
-- gdcmWarningMacro( "Overlay is empty" );
-- --numoverlays;
-+ ++numoverlays;
- }
- }
-- // Store found tag in overlay:
-- overlay = de.GetTag();
-- // Move on to the next possible one:
-- overlay.SetGroup( overlay.GetGroup() + 2 );
-- // reset to element 0x0 just in case...
-- overlay.SetElement( 0 );
-+ // Store found tag in overlay:
-+ overlay = de.GetTag();
-+ // Move on to the next possible one:
-+ overlay.SetGroup( overlay.GetGroup() + 2 );
-+ // reset to element 0x0 just in case...
-+ overlay.SetElement( 0 );
- }
- }
-
-diff -r -u -x .svn ../tags/gdcm-2-0-10/Testing/CMakeLists.txt gdcm-2-0/Testing/CMakeLists.txt
---- ../tags/gdcm-2-0-10/Testing/CMakeLists.txt 2008-11-18 09:54:45.000000000 +0100
-+++ gdcm-2-0/Testing/CMakeLists.txt 2008-12-19 10:59:25.000000000 +0100
-@@ -11,7 +11,7 @@
- # ctest...well except one, the case where a user set BUILD_TESTING=OFF
- # since this would deactivate the dashboard and would not submit...doh!
- # So instead let's create a test that would build gdcm with this option
--IF(UNIX AND GDCM_TEST_BOOSTRAP)
-+IF(UNIX AND GDCM_TEST_BOOTSTRAP)
- ADD_TEST(BuildGDCM ${CMAKE_CTEST_COMMAND}
- #${VTK_EXAMPLE_TEST_CONFIG_TYPE}
- --build-and-test ${GDCM_SOURCE_DIR} ${GDCM_BINARY_DIR}/GDCMLocal
-@@ -20,7 +20,7 @@
- --build-makeprogram ${CMAKE_MAKE_PROGRAM}
- --build-project GDCMLOCAL
- #--build-run-dir ${VTK_EXAMPLE_TEST_RUN_DIR}
-- --build-options -DGDCM_BUILD_TESTING:BOOL=OFF -DGDCM_BUILD_SHARED_LIBS:BOOL=ON -DGDCM_WRAP_PYTHON:BOOL=ON -DGDCM_SUPPORT_BROKEN_IMPLEMENTATION:BOOL=OFF
-+ --build-options -DGDCM_BUILD_TESTING:BOOL=OFF -DGDCM_BUILD_SHARED_LIBS:BOOL=ON -DGDCM_WRAP_PYTHON:BOOL=ON -DGDCM_WRAP_CSHARP:BOOL=ON -DGDCM_SUPPORT_BROKEN_IMPLEMENTATION:BOOL=OFF
- #--test-command "${VTK_BINARY_DIR}/Examples/Build/vtkLocal/bin/vtkLocalTest"
- )
- ADD_TEST(InstallGDCM ${CMAKE_CTEST_COMMAND}
-@@ -32,7 +32,7 @@
- --build-noclean
- --build-target install
- )
--ENDIF(UNIX AND GDCM_TEST_BOOSTRAP)
-+ENDIF(UNIX AND GDCM_TEST_BOOTSTRAP)
-
-
-
-diff -r -u -x .svn ../tags/gdcm-2-0-10/Testing/Source/Common/Cxx/TestString2.cxx gdcm-2-0/Testing/Source/Common/Cxx/TestString2.cxx
---- ../tags/gdcm-2-0-10/Testing/Source/Common/Cxx/TestString2.cxx 2008-11-18 09:54:45.000000000 +0100
-+++ gdcm-2-0/Testing/Source/Common/Cxx/TestString2.cxx 2009-04-29 10:38:43.000000000 +0200
-@@ -17,6 +17,7 @@
- #include <iostream>
-
- #include <string.h> // strlen
-+#include <stdio.h> // EOF
-
- int TestString2(int argc, char *argv[])
- {
-diff -r -u -x .svn ../tags/gdcm-2-0-10/Utilities/VTK/Applications/CMakeLists.txt gdcm-2-0/Utilities/VTK/Applications/CMakeLists.txt
---- ../tags/gdcm-2-0-10/Utilities/VTK/Applications/CMakeLists.txt 2008-11-18 09:54:28.000000000 +0100
-+++ gdcm-2-0/Utilities/VTK/Applications/CMakeLists.txt 2009-05-18 16:08:06.000000000 +0200
-@@ -16,13 +16,8 @@
-
- SET(GDCM_VTK_APPS
- gdcmviewer # vtkImageViewer2
-+ gdcm2vtk
- )
--IF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" GREATER 5.0 )
-- SET(GDCM_VTK_APPS
-- ${GDCM_VTK_APPS}
-- gdcm2vtk
-- )
--ENDIF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" GREATER 5.0 )
-
- FOREACH(app ${GDCM_VTK_APPS})
- ADD_EXECUTABLE(${app} ${app}.cxx)
-@@ -31,7 +26,7 @@
- ENDIF(GDCM_EXECUTABLE_PROPERTIES)
- TARGET_LINK_LIBRARIES(${app} ${VTKGDCM_NAME} vtkRendering)
- IF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" GREATER 5.0 )
-- TARGET_LINK_LIBRARIES(${app} vtkWidgets vtkVolumeRendering)
-+ TARGET_LINK_LIBRARIES(${app} vtkWidgets)
- ENDIF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" GREATER 5.0 )
- IF(WIN32 AND NOT CYGWIN)
- TARGET_LINK_LIBRARIES(${app} gdcmgetopt)
-diff -r -u -x .svn ../tags/gdcm-2-0-10/Utilities/VTK/CMakeLists.txt gdcm-2-0/Utilities/VTK/CMakeLists.txt
---- ../tags/gdcm-2-0-10/Utilities/VTK/CMakeLists.txt 2008-12-02 13:33:37.000000000 +0100
-+++ gdcm-2-0/Utilities/VTK/CMakeLists.txt 2009-04-16 16:15:34.000000000 +0200
-@@ -125,6 +125,49 @@
- )
- ENDIF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
-
-+IF(GDCM_WRAP_JAVA)
-+ IF(VTK_WRAP_JAVA)
-+ SET(VTK_WRAP_JAVA3_INIT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-+ # Lars Matthäus patch (package vtk => imply vtk subdir )
-+ SET(VTK_JAVA_HOME ${CMAKE_CURRENT_BINARY_DIR}/java/vtk)
-+ MAKE_DIRECTORY(${VTK_JAVA_HOME})
-+ INCLUDE(${VTK_CMAKE_DIR}/vtkWrapJava.cmake)
-+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-+
-+ VTK_WRAP_JAVA3(${VTKGDCM_NAME}Java vtkgdcmJAVA_SRCS "${vtkgdcm_SRCS}")
-+ ADD_LIBRARY(${VTKGDCM_NAME}Java SHARED ${vtkgdcmJAVA_SRCS})
-+ TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}Java ${VTKGDCM_NAME})
-+ FOREACH(c ${vtkgdcm_LIBS})
-+ TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}Java ${c}Java)
-+ ENDFOREACH(c)
-+
-+ ADD_CUSTOM_COMMAND(
-+ OUTPUT ${LIBRARY_OUTPUT_PATH}/vtkgdcm.jar
-+ COMMAND ${JAVA_COMPILE} ARGS -cp ${VTK_JAVA_JAR} "vtk/*.java"
-+ COMMAND ${JAVA_ARCHIVE} ARGS cvf ${LIBRARY_OUTPUT_PATH}/${PROJECT_NAME}.jar vtk/*.class
-+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/java
-+ DEPENDS ${VTKGDCM_NAME}Java
-+ COMMENT "*.java -> jar"
-+ )
-+ ADD_CUSTOM_TARGET(VTKGDCMJavaJar ALL
-+ DEPENDS ${LIBRARY_OUTPUT_PATH}/vtkgdcm.jar
-+ COMMENT "building vtkgdcm.jar"
-+ )
-+
-+ IF(NOT GDCM_INSTALL_NO_LIBRARIES)
-+ INSTALL(TARGETS ${VTKGDCM_NAME}Java
-+ RUNTIME DESTINATION ${GDCM_INSTALL_BIN_DIR} COMPONENT Runtime
-+ LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Runtime ${NAMELINK_SKIP}
-+ ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development
-+ )
-+ ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
-+
-+ ELSE(VTK_WRAP_JAVA)
-+ MESSAGE("GDCM_WRAP_JAVA canot be build without VTK_WRAP_JAVA")
-+ ENDIF(VTK_WRAP_JAVA)
-+
-+ENDIF(GDCM_WRAP_JAVA)
-+
- IF(GDCM_WRAP_PYTHON)
- IF(VTK_WRAP_PYTHON)
- SET(DEXTENSION "")
-@@ -176,7 +219,7 @@
- )
- # INSTALL(TARGETS ${VTKGDCM_NAME}PythonD ${VTKGDCM_NAME}Python
- # LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR}/${python_site_package} COMPONENT Development ${NAMELINK_ONLY}
--# )
-+# )
- # the python file is not a dev file, but part of the gdcm module...
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/vtkgdcm.py
- DESTINATION ${GDCM_INSTALL_LIB_DIR}/${python_site_package} COMPONENT Runtime
-diff -r -u -x .svn ../tags/gdcm-2-0-10/Utilities/VTK/vtkGDCMImageReader.cxx gdcm-2-0/Utilities/VTK/vtkGDCMImageReader.cxx
---- ../tags/gdcm-2-0-10/Utilities/VTK/vtkGDCMImageReader.cxx 2008-11-18 09:54:28.000000000 +0100
-+++ gdcm-2-0/Utilities/VTK/vtkGDCMImageReader.cxx 2009-04-16 16:01:07.000000000 +0200
-@@ -1203,6 +1203,7 @@
- }
- assert( len );
- pointer += len;
-+ this->UpdateProgress( (double)(j - dext[4] ) / ( dext[5] - dext[4] ));
- }
- }
- else
-diff -r -u -x .svn ../tags/gdcm-2-0-10/Wrapping/Java/CMakeLists.txt gdcm-2-0/Wrapping/Java/CMakeLists.txt
---- ../tags/gdcm-2-0-10/Wrapping/Java/CMakeLists.txt 2008-11-18 09:54:26.000000000 +0100
-+++ gdcm-2-0/Wrapping/Java/CMakeLists.txt 2009-04-15 10:33:12.000000000 +0200
-@@ -8,6 +8,7 @@
- "${GDCM_BINARY_DIR}/Source/Common"
- "${GDCM_SOURCE_DIR}/Source/Common"
- "${GDCM_SOURCE_DIR}/Source/DataStructureAndEncodingDefinition"
-+ "${GDCM_SOURCE_DIR}/Source/InformationObjectDefinition"
- "${GDCM_SOURCE_DIR}/Source/MediaStorageAndFileFormat"
- "${GDCM_SOURCE_DIR}/Source/DataDictionary"
- )
-@@ -25,8 +26,9 @@
- SET_SOURCE_FILES_PROPERTIES(gdcm.i PROPERTIES CPLUSPLUS ON)
- #INCLUDE(${GDCM_SOURCE_DIR}/CMake/UseSWIGExtra.cmake)
-
--# Some old swig 1.3 did not support this option:
--#SET(CMAKE_SWIG_OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/swig-java")
-+SET(GDCM_JAVA_HOME ${CMAKE_CURRENT_BINARY_DIR}/java/gdcm)
-+MAKE_DIRECTORY(${GDCM_JAVA_HOME})
-+SET(CMAKE_SWIG_OUTDIR "${GDCM_JAVA_HOME}")
-
- SET(CMAKE_SWIG_FLAGS "-package gdcm")
- SEPARATE_ARGUMENTS(CMAKE_SWIG_FLAGS)
-@@ -61,24 +63,16 @@
- #FILE(GLOB javafiles "${CMAKE_CURRENT_BINARY_DIR}/*.java")
- #MESSAGE("javafile:${javafiles}")
-
--# This is kindda hackish:
--# 1. run the custom command only when the gdcmJAVA_wrap.cxx has been generated (which means all *.java should be there)
- ADD_CUSTOM_COMMAND(
-- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gdcm.class
-- COMMAND ${JAVA_COMPILE} ARGS "*.java" #${javafiles}
-- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-- DEPENDS "${swig_generated_file_fullname}"
-- COMMENT "javac *.java"
--)
--
-+ OUTPUT ${LIBRARY_OUTPUT_PATH}/gdcm.jar
-+# 1. run the custom command only when the gdcmJAVA_wrap.cxx has been generated (which means all *.java should be there)
-+ COMMAND ${JAVA_COMPILE} ARGS "gdcm/*.java" #${javafiles}
- # 2. now that the *.class have been generated construct the jar file. We can only rely on the gdcm.java / gdcm.class
- # to build dependencie, I am pretty sure it will break parallel builds... oh well
--ADD_CUSTOM_COMMAND(
-- OUTPUT ${LIBRARY_OUTPUT_PATH}/gdcm.jar
-- COMMAND ${JAVA_ARCHIVE} ARGS cvf ${LIBRARY_OUTPUT_PATH}/gdcm.jar *.class
-- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gdcm.class
-- COMMENT "jar cvf -> gdcm.jar"
-+ COMMAND ${JAVA_ARCHIVE} ARGS cvf ${LIBRARY_OUTPUT_PATH}/gdcm.jar gdcm/*.class
-+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/java
-+ DEPENDS "${swig_generated_file_fullname}"
-+ COMMENT "javac *.java; jar cvf -> gdcm.jar"
- )
-
- # 3. ok now add the target
-@@ -107,7 +101,7 @@
- ${CPACK_NAMELINK_TYPE}
- )
- # because gdcm.jar is constructed with custom commands, it need the INSTALL(FILES signature:
-- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gdcm.jar
-+ INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/gdcm.jar
- DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Runtime
- )
- ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
-diff -r -u -x .svn ../tags/gdcm-2-0-10/Wrapping/Java/gdcm.i gdcm-2-0/Wrapping/Java/gdcm.i
---- ../tags/gdcm-2-0-10/Wrapping/Java/gdcm.i 2008-11-18 09:54:26.000000000 +0100
-+++ gdcm-2-0/Wrapping/Java/gdcm.i 2009-04-15 10:31:11.000000000 +0200
-@@ -3,7 +3,7 @@
- Program: GDCM (Grassroots DICOM). A DICOM library
- Module: $URL$
-
-- Copyright (c) 2006-2008 Mathieu Malaterre
-+ Copyright (c) 2006-2009 Mathieu Malaterre
- All rights reserved.
- See Copyright.txt or http://gdcm.sourceforge.net/Copyright.html for details.
-
-@@ -21,28 +21,109 @@
- #pragma SWIG nowarn=504,510
- %{
- #include "gdcmTypes.h"
-+#include "gdcmSmartPointer.h"
- #include "gdcmSwapCode.h"
-+#include "gdcmDirectory.h"
-+#include "gdcmTesting.h"
- #include "gdcmObject.h"
-+#include "gdcmPixelFormat.h"
-+#include "gdcmMediaStorage.h"
- #include "gdcmTag.h"
-+#include "gdcmPrivateTag.h"
- #include "gdcmVL.h"
- #include "gdcmVR.h"
-+#include "gdcmVM.h"
-+#include "gdcmObject.h"
-+#include "gdcmValue.h"
-+#include "gdcmByteValue.h"
- #include "gdcmDataElement.h"
-+#include "gdcmItem.h"
-+#include "gdcmSequenceOfItems.h"
- #include "gdcmDataSet.h"
-+//#include "gdcmString.h"
- #include "gdcmPreamble.h"
- #include "gdcmFile.h"
-+#include "gdcmPixmap.h"
-+#include "gdcmImage.h"
-+#include "gdcmIconImage.h"
-+#include "gdcmFragment.h"
-+#include "gdcmCSAHeader.h"
-+#include "gdcmPDBHeader.h"
-+#include "gdcmSequenceOfFragments.h"
-+#include "gdcmTransferSyntax.h"
-+#include "gdcmBasicOffsetTable.h"
-+//#include "gdcmLO.h"
-+#include "gdcmCSAElement.h"
-+#include "gdcmPDBElement.h"
-+#include "gdcmFileSet.h"
-+
- #include "gdcmReader.h"
- #include "gdcmImageReader.h"
-+#include "gdcmWriter.h"
-+#include "gdcmImageWriter.h"
- #include "gdcmStringFilter.h"
- #include "gdcmGlobal.h"
--#include "gdcmVR.h"
--#include "gdcmVM.h"
- #include "gdcmDicts.h"
- #include "gdcmDict.h"
-+#include "gdcmCSAHeaderDict.h"
- #include "gdcmDictEntry.h"
--#include "gdcmDirectory.h"
--#include "gdcmTesting.h"
-+#include "gdcmCSAHeaderDictEntry.h"
- #include "gdcmUIDGenerator.h"
-+//#include "gdcmConstCharWrapper.h"
- #include "gdcmScanner.h"
-+#include "gdcmAttribute.h"
-+#include "gdcmAnonymizer.h"
-+#include "gdcmSystem.h"
-+#include "gdcmTrace.h"
-+#include "gdcmUIDs.h"
-+#include "gdcmSorter.h"
-+#include "gdcmIPPSorter.h"
-+#include "gdcmSpectroscopy.h"
-+#include "gdcmPrinter.h"
-+#include "gdcmDumper.h"
-+#include "gdcmOrientation.h"
-+#include "gdcmFiducials.h"
-+#include "gdcmWaveform.h"
-+#include "gdcmPersonName.h"
-+#include "gdcmIconImage.h"
-+#include "gdcmCurve.h"
-+#include "gdcmDICOMDIR.h"
-+#include "gdcmValidate.h"
-+#include "gdcmApplicationEntity.h"
-+#include "gdcmDictPrinter.h"
-+#include "gdcmFilenameGenerator.h"
-+#include "gdcmVersion.h"
-+#include "gdcmFilename.h"
-+#include "gdcmEnumeratedValues.h"
-+#include "gdcmPatient.h"
-+#include "gdcmStudy.h"
-+#include "gdcmModule.h"
-+#include "gdcmModules.h"
-+#include "gdcmDefs.h"
-+#include "gdcmIOD.h"
-+#include "gdcmIODs.h"
-+#include "gdcmTableEntry.h"
-+#include "gdcmDefinedTerms.h"
-+#include "gdcmSeries.h"
-+#include "gdcmModuleEntry.h"
-+#include "gdcmNestedModuleEntries.h"
-+#include "gdcmIODEntry.h"
-+#include "gdcmRescaler.h"
-+#include "gdcmSegmentedPaletteColorLookupTable.h"
-+#include "gdcmUnpacker12Bits.h"
-+#include "gdcmDirectionCosines.h"
-+#include "gdcmTagPath.h"
-+#include "gdcmImageToImageFilter.h"
-+#include "gdcmSOPClassUIDToIOD.h"
-+#include "gdcmImageChangeTransferSyntax.h"
-+#include "gdcmImageApplyLookupTable.h"
-+#include "gdcmSplitMosaicFilter.h"
-+//#include "gdcmImageChangePhotometricInterpretation.h"
-+#include "gdcmImageChangePlanarConfiguration.h"
-+#include "gdcmImageFragmentSplitter.h"
-+#include "gdcmDataSetHelper.h"
-+#include "gdcmFileExplicitFilter.h"
-+#include "gdcmImageHelper.h"
-
- using namespace gdcm;
- %}
-@@ -67,12 +148,80 @@
- #define GDCM_EXPORT
- %include "gdcmSwapCode.h"
- %include "gdcmPixelFormat.h"
--//%include "gdcmMediaStorage.h"
--%rename(__getitem__) gdcm::Tag::operator[];
-+%extend gdcm::PixelFormat
-+{
-+ const char *toString() {
-+ static std::string buffer;
-+ std::ostringstream os;
-+ os << *self;
-+ buffer = os.str();
-+ return buffer.c_str();
-+ }
-+};
-+%include "gdcmMediaStorage.h"
-+//%rename(__getitem__) gdcm::Tag::operator[];
- %include "gdcmTag.h"
- %extend gdcm::Tag
- {
-- const char *__str__() {
-+ const char *toString() {
-+ static std::string buffer;
-+ std::ostringstream os;
-+ os << *self;
-+ buffer = os.str();
-+ return buffer.c_str();
-+ }
-+};
-+%include "gdcmPrivateTag.h"
-+%extend gdcm::PrivateTag
-+{
-+ const char *toString() {
-+ static std::string buffer;
-+ std::ostringstream os;
-+ os << *self;
-+ buffer = os.str();
-+ return buffer.c_str();
-+ }
-+};
-+%include "gdcmVL.h"
-+%extend gdcm::VL
-+{
-+ const char *toString() {
-+ static std::string buffer;
-+ std::ostringstream os;
-+ os << *self;
-+ buffer = os.str();
-+ return buffer.c_str();
-+ }
-+}
-+%include "gdcmVR.h"
-+%extend gdcm::VR
-+{
-+ const char *toString() {
-+ static std::string buffer;
-+ std::ostringstream os;
-+ os << *self;
-+ buffer = os.str();
-+ return buffer.c_str();
-+ }
-+};
-+%include "gdcmVM.h"
-+%template (FilenamesType) std::vector<std::string>;
-+%include "gdcmDirectory.h"
-+%extend gdcm::Directory
-+{
-+ const char *toString() {
-+ static std::string buffer;
-+ std::stringstream s;
-+ self->Print(s);
-+ buffer = s.str();
-+ return buffer.c_str();
-+ }
-+};
-+%include "gdcmObject.h"
-+%include "gdcmValue.h"
-+%extend gdcm::Value
-+{
-+ const char *toString() {
- static std::string buffer;
- std::ostringstream os;
- os << *self;
-@@ -80,10 +229,63 @@
- return buffer.c_str();
- }
- };
-+// Array marshaling for arrays of primitives
-+%define %cs_marshal_array(TYPE, CSTYPE)
-+ %typemap(ctype) TYPE[] "void*"
-+ %typemap(imtype, inattributes="[MarshalAs(UnmanagedType.LPArray)]") TYPE[] "CSTYPE[]"
-+ %typemap(cstype) TYPE[] "CSTYPE[]"
-+ %typemap(in) TYPE[] %{ $1 = (TYPE*)$input; %}
-+ %typemap(csin) TYPE[] "$csinput"
-+%enddef
-+
-+// The following macro invocations allow you to pass arrays of primitive
-+// types. Arrays of other things such as System.Drawing.Point are also
-+// possible.
-+%cs_marshal_array(bool, bool)
-+%cs_marshal_array(char, byte)
-+%cs_marshal_array(short, short)
-+%cs_marshal_array(unsigned short, ushort)
-+%cs_marshal_array(int, int)
-+%cs_marshal_array(unsigned int, uint)
-+%cs_marshal_array(long, int)
-+%cs_marshal_array(unsigned long, uint)
-+%cs_marshal_array(long long, long)
-+%cs_marshal_array(unsigned long long, ulong)
-+%cs_marshal_array(float, float)
-+%cs_marshal_array(double, double)
-+
-+
-+// %clear commands should be unnecessary, but do it just-in-case
-+%clear char* buffer;
-+%clear unsigned char* buffer;
-+
-+%ignore gdcm::ByteValue::WriteBuffer(std::ostream &os) const;
-+//%ignore gdcm::ByteValue::GetPointer() const;
-+//%ignore gdcm::ByteValue::GetBuffer(char *buffer, unsigned long length) const;
-+%include "gdcmByteValue.h"
-+%extend gdcm::ByteValue
-+{
-+ const char *toString() {
-+ static std::string buffer;
-+ std::ostringstream os;
-+ os << *self;
-+ buffer = os.str();
-+ return buffer.c_str();
-+ }
-+};
-+
-+
-+%apply char[] { const char* array }
-+
-+%include "gdcmSmartPointer.h"
-+%template(SmartPtrSQ) gdcm::SmartPointer<gdcm::SequenceOfItems>;
-+%template(SmartPtrFrag) gdcm::SmartPointer<gdcm::SequenceOfFragments>;
- %include "gdcmDataElement.h"
-+
-+%clear const char* array;
- %extend gdcm::DataElement
- {
-- const char *__str__() {
-+ const char *toString() {
- static std::string buffer;
- std::ostringstream os;
- os << *self;
-@@ -91,6 +293,29 @@
- return buffer.c_str();
- }
- };
-+%include "gdcmItem.h"
-+%extend gdcm::Item
-+{
-+ const char *toString() {
-+ static std::string buffer;
-+ std::ostringstream os;
-+ os << *self;
-+ buffer = os.str();
-+ return buffer.c_str();
-+ }
-+};
-+%include "gdcmSequenceOfItems.h"
-+%extend gdcm::SequenceOfItems
-+{
-+ const char *toString() {
-+ static std::string buffer;
-+ std::ostringstream os;
-+ os << *self;
-+ buffer = os.str();
-+ return buffer.c_str();
-+ }
-+};
-+%rename (CSharpDataSet) SWIGDataSet;
- %include "gdcmDataSet.h"
- //namespace std {
- // //struct lttag
-@@ -107,7 +332,7 @@
- //}
- %extend gdcm::DataSet
- {
-- const char *__str__() {
-+ const char *toString() {
- static std::string buffer;
- std::stringstream s;
- self->Print(s);
-@@ -115,24 +340,32 @@
- return buffer.c_str();
- }
- };
--//%include "gdcmTransferSyntax.h"
-+
- %include "gdcmPhotometricInterpretation.h"
- %include "gdcmObject.h"
- %include "gdcmLookupTable.h"
- %include "gdcmOverlay.h"
--%include "gdcmVL.h"
--//%include "gdcmVR.h"
--%include "gdcmValue.h"
--%include "gdcmByteValue.h"
-+//%include "gdcmVL.h"
- //%rename(DataElementSetPython) std::set<DataElement, lttag>;
- //%rename(DataElementSetPython2) DataSet::DataElementSet;
- //%template (DataElementSet) std::set<gdcm::DataElement>;
- //%rename (SetString2) gdcm::DataElementSet;
- %include "gdcmPreamble.h"
-+%include "gdcmTransferSyntax.h"
-+%extend gdcm::TransferSyntax
-+{
-+ const char *toString() {
-+ static std::string buffer;
-+ std::ostringstream os;
-+ os << *self;
-+ buffer = os.str();
-+ return buffer.c_str();
-+ }
-+};
- %include "gdcmFileMetaInformation.h"
- %extend gdcm::FileMetaInformation
- {
-- const char *__str__() {
-+ const char *toString() {
- static std::string buffer;
- std::ostringstream os;
- os << *self;
-@@ -143,7 +376,7 @@
- %include "gdcmFile.h"
- %extend gdcm::File
- {
-- const char *__str__() {
-+ const char *toString() {
- static std::string buffer;
- std::ostringstream os;
- os << *self;
-@@ -151,10 +384,39 @@
- return buffer.c_str();
- }
- };
-+
-+//%include "gdcm_arrays_csharp.i"
-+
-+%apply char[] { char* buffer }
-+%apply unsigned int[] { unsigned int dims[3] }
-+
-+//%apply byte OUTPUT[] { char* buffer } ;
-+//%ignore gdcm::Pixmap::GetBuffer(char*) const;
-+//%apply byte FIXED[] { char *buffer }
-+//%csmethodmodifiers gdcm::Pixmap::GetBuffer "public unsafe";
-+//%define %cs_marshal_array(TYPE, CSTYPE)
-+// %typemap(ctype) TYPE[] "void*"
-+// %typemap(imtype, inattributes="[MarshalAs(UnmanagedType.LPArray)]") TYPE[] "CSTYPE[]"
-+// %typemap(cstype) TYPE[] "CSTYPE[]"
-+// %typemap(in) TYPE[] %{ $1 = (TYPE*)$input; %}
-+// %typemap(csin) TYPE[] "$csinput"
-+//%enddef
-+//%cs_marshal_array(char, byte)
-+%include "gdcmPixmap.h"
-+//%extend gdcm::Pixmap
-+//{
-+// bool GetBuffer(byte[] buffer) {
-+// self->GetBuffer(buffer);
-+// }
-+//};
-+%clear char* buffer;
-+%clear unsigned int* dims;
-+
-+
- %include "gdcmImage.h"
- %extend gdcm::Image
- {
-- const char *__str__() {
-+ const char *toString() {
- static std::string buffer;
- std::stringstream s;
- self->Print(s);
-@@ -162,22 +424,98 @@
- return buffer.c_str();
- }
- };
-+%include "gdcmIconImage.h"
-+%include "gdcmFragment.h"
-+%include "gdcmPDBElement.h"
-+%extend gdcm::PDBElement
-+{
-+ const char *toString() {
-+ static std::string buffer;
-+ std::ostringstream os;
-+ os << *self;
-+ buffer = os.str();
-+ return buffer.c_str();
-+ }
-+};
-+%include "gdcmPDBHeader.h"
-+%extend gdcm::PDBHeader
-+{
-+ const char *toString() {
-+ static std::string buffer;
-+ std::stringstream s;
-+ self->Print(s);
-+ buffer = s.str();
-+ return buffer.c_str();
-+ }
-+};
-+%include "gdcmCSAElement.h"
-+%extend gdcm::CSAElement
-+{
-+ const char *toString() {
-+ static std::string buffer;
-+ std::ostringstream os;
-+ os << *self;
-+ buffer = os.str();
-+ return buffer.c_str();
-+ }
-+};
-+%include "gdcmCSAHeader.h"
-+%extend gdcm::CSAHeader
-+{
-+ const char *toString() {
-+ static std::string buffer;
-+ std::stringstream s;
-+ self->Print(s);
-+ buffer = s.str();
-+ return buffer.c_str();
-+ }
-+};
-+%include "gdcmSequenceOfFragments.h"
-+%include "gdcmBasicOffsetTable.h"
-+//%include "gdcmLO.h"
-+%include "gdcmFileSet.h"
-+
- %include "gdcmGlobal.h"
--//%include "gdcmVR.h"
--//%include "gdcmVM.h"
-+
- %include "gdcmDictEntry.h"
-+%extend gdcm::DictEntry
-+{
-+ const char *toString() {
-+ static std::string buffer;
-+ std::ostringstream os;
-+ os << *self;
-+ buffer = os.str();
-+ return buffer.c_str();
-+ }
-+};
-+%include "gdcmCSAHeaderDictEntry.h"
-+%extend gdcm::CSAHeaderDictEntry
-+{
-+ const char *toString() {
-+ static std::string buffer;
-+ std::ostringstream os;
-+ os << *self;
-+ buffer = os.str();
-+ return buffer.c_str();
-+ }
-+};
-+
- %include "gdcmDict.h"
-+%include "gdcmCSAHeaderDict.h"
- %include "gdcmDicts.h"
- %include "gdcmReader.h"
- %include "gdcmImageReader.h"
-+%include "gdcmWriter.h"
-+%include "gdcmImageWriter.h"
- %template (PairString) std::pair<std::string,std::string>;
-+//%template (MyM) std::map<gdcm::Tag,gdcm::ConstCharWrapper>;
- %include "gdcmStringFilter.h"
--//%template (FilenameType) std::string;
--%template (FilenamesType) std::vector<std::string>;
--%include "gdcmDirectory.h"
--%extend gdcm::Directory
-+%include "gdcmUIDGenerator.h"
-+//%template (ValuesType) std::set<std::string>;
-+%include "gdcmScanner.h"
-+%extend gdcm::Scanner
- {
-- const char *__str__() {
-+ const char *toString() {
- static std::string buffer;
- std::stringstream s;
- self->Print(s);
-@@ -185,25 +523,87 @@
- return buffer.c_str();
- }
- };
--%include "gdcmTesting.h"
--%include "gdcmUIDGenerator.h"
--//%{
--// typedef char * PString; // copied to wrapper code
--//%}
--//%template (FilenameToValue) std::map<const char*,const char*>;
--//%template (FilenameToValue) std::map<PString,PString>;
--//%template (FilenameToValue) std::map<std::string,std::string>;
--//%template (MappingType) std::map<gdcm::Tag,FilenameToValue>;
--//%template (ValuesType) std::set<std::string>;
--%include "gdcmScanner.h"
--%extend gdcm::Scanner
-+#define GDCM_STATIC_ASSERT(x)
-+%include "gdcmAttribute.h"
-+%include "gdcmAnonymizer.h"
-+
-+// System is a namespace in C#, need to rename to something different
-+%rename (PosixEmulation) System;
-+%include "gdcmSystem.h"
-+
-+%include "gdcmTrace.h"
-+%include "gdcmUIDs.h"
-+//%feature("director") gdcm::IPPSorter;
-+%include "gdcmSorter.h"
-+%include "gdcmIPPSorter.h"
-+%include "gdcmSpectroscopy.h"
-+%include "gdcmPrinter.h"
-+%include "gdcmDumper.h"
-+%include "gdcmOrientation.h"
-+%include "gdcmDirectionCosines.h"
-+%include "gdcmFiducials.h"
-+%include "gdcmWaveform.h"
-+%include "gdcmPersonName.h"
-+%include "gdcmIconImage.h"
-+%include "gdcmCurve.h"
-+%include "gdcmDICOMDIR.h"
-+%include "gdcmValidate.h"
-+%include "gdcmApplicationEntity.h"
-+%include "gdcmDictPrinter.h"
-+%include "gdcmFilenameGenerator.h"
-+%include "gdcmVersion.h"
-+%include "gdcmFilename.h"
-+%include "gdcmEnumeratedValues.h"
-+%include "gdcmPatient.h"
-+%include "gdcmStudy.h"
-+%include "gdcmModuleEntry.h"
-+%extend gdcm::ModuleEntry
- {
-- const char *__str__() {
-+ const char *toString() {
- static std::string buffer;
-- std::stringstream s;
-- self->Print(s);
-- buffer = s.str();
-+ std::ostringstream os;
-+ os << *self;
-+ buffer = os.str();
- return buffer.c_str();
- }
- };
-+%include "gdcmNestedModuleEntries.h"
-+%include "gdcmModule.h"
-+%include "gdcmModules.h"
-+%include "gdcmDefs.h"
-+%include "gdcmIOD.h"
-+%include "gdcmIODs.h"
-+%include "gdcmTableEntry.h"
-+%include "gdcmDefinedTerms.h"
-+%include "gdcmSeries.h"
-+%include "gdcmIODEntry.h"
-+%include "gdcmRescaler.h"
-+%include "gdcmSegmentedPaletteColorLookupTable.h"
-+%include "gdcmUnpacker12Bits.h"
-
-+%include "gdcmConfigure.h"
-+#ifdef GDCM_BUILD_TESTING
-+%include "gdcmTesting.h"
-+%ignore gdcm::Testing::ComputeFileMD5(const char*, char *);
-+%extend gdcm::Testing
-+{
-+ static const char *ComputeFileMD5(const char *filename) {
-+ static char buffer[33];
-+ gdcm::Testing::ComputeFileMD5(filename, buffer);
-+ return buffer;
-+ }
-+};
-+#endif
-+%include "gdcmTagPath.h"
-+%include "gdcmImageToImageFilter.h"
-+%include "gdcmSOPClassUIDToIOD.h"
-+%include "gdcmImageChangeTransferSyntax.h"
-+%include "gdcmImageApplyLookupTable.h"
-+%include "gdcmSplitMosaicFilter.h"
-+//%include "gdcmImageChangePhotometricInterpretation.h"
-+%include "gdcmImageChangePlanarConfiguration.h"
-+%include "gdcmImageFragmentSplitter.h"
-+%include "gdcmDataSetHelper.h"
-+%include "gdcmFileExplicitFilter.h"
-+%template (DoubleType) std::vector<double>;
-+%include "gdcmImageHelper.h"
Deleted: trunk/packages/gdcm/trunk/debian/patches/gdcm210_tagbackport.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/gdcm210_tagbackport.patch 2009-06-16 08:26:21 UTC (rev 3491)
+++ trunk/packages/gdcm/trunk/debian/patches/gdcm210_tagbackport.patch 2009-06-16 08:40:09 UTC (rev 3492)
@@ -1,182 +0,0 @@
-It includes all the important patch that were applied to gdcm-2-0-10 tag after gdcm 2.0.10
-was released
-
-Only in gdcm-2-0-10/Applications: Python
-diff -r -u -x .svn /home/mmalaterre/Software/debian-med/trunk/packages/gdcm/gdcm-2.0.10/CMakeLists.txt gdcm-2-0-10/CMakeLists.txt
---- /home/mmalaterre/Software/debian-med/trunk/packages/gdcm/gdcm-2.0.10/CMakeLists.txt 2008-11-18 10:23:57.000000000 +0100
-+++ gdcm-2-0-10/CMakeLists.txt 2008-12-15 09:49:34.000000000 +0100
-@@ -483,6 +483,12 @@
- SET(CPACK_NSIS_HELP_LINK "http://gdcm.sourceforge.net")
- SET(CPACK_NSIS_URL_INFO_ABOUT "http://gdcm.sourceforge.net")
- SET(CPACK_NSIS_MODIFY_PATH ON)
-+ IF(${CMAKE_INSTALL_PREFIX} MATCHES ${CPACK_PACKAGE_INSTALL_DIRECTORY})
-+ ELSE(${CMAKE_INSTALL_PREFIX} MATCHES ${CPACK_PACKAGE_INSTALL_DIRECTORY})
-+ STRING(REPLACE ${PROJECT_NAME} ${CPACK_PACKAGE_INSTALL_DIRECTORY} dummy ${CMAKE_INSTALL_PREFIX} )
-+ SET(CMAKE_INSTALL_PREFIX ${dummy} CACHE PATH "" FORCE)
-+ ENDIF(${CMAKE_INSTALL_PREFIX} MATCHES ${CPACK_PACKAGE_INSTALL_DIRECTORY})
-+
- ELSE(WIN32 AND NOT UNIX)
- # http://www.vtk.org/Wiki/CMake:CPackConfiguration
- # List of files to be stripped. Starting with CMake 2.6.0 CPACK_STRIP_FILES will be a boolean variable which enables
-Only in gdcm-2-0-10: debian
-diff -r -u -x .svn /home/mmalaterre/Software/debian-med/trunk/packages/gdcm/gdcm-2.0.10/Source/DataStructureAndEncodingDefinition/gdcmImplicitDataElement.txx gdcm-2-0-10/Source/DataStructureAndEncodingDefinition/gdcmImplicitDataElement.txx
---- /home/mmalaterre/Software/debian-med/trunk/packages/gdcm/gdcm-2.0.10/Source/DataStructureAndEncodingDefinition/gdcmImplicitDataElement.txx 2008-11-18 10:23:57.000000000 +0100
-+++ gdcm-2-0-10/Source/DataStructureAndEncodingDefinition/gdcmImplicitDataElement.txx 2008-12-05 11:10:25.000000000 +0100
-@@ -46,6 +46,21 @@
- throw Exception("Impossible");
- return is;
- }
-+
-+ /*
-+ * technically this should not be needed, but what if an implementor, forgot to set
-+ * VL = 0, then we should make sure to exit early
-+ */
-+ const Tag itemDelItem(0xfffe,0xe00d);
-+ if( TagField == itemDelItem )
-+ {
-+ if( ValueLengthField != 0 )
-+ {
-+ gdcmWarningMacro( "VL should be set to 0" );
-+ }
-+ ValueField = 0;
-+ return is;
-+ }
- //std::cerr << "imp cur tag=" << TagField << " VL=" << ValueLengthField << std::endl;
- if( ValueLengthField == 0 )
- {
-diff -r -u -x .svn /home/mmalaterre/Software/debian-med/trunk/packages/gdcm/gdcm-2.0.10/Source/DataStructureAndEncodingDefinition/gdcmItem.h gdcm-2-0-10/Source/DataStructureAndEncodingDefinition/gdcmItem.h
---- /home/mmalaterre/Software/debian-med/trunk/packages/gdcm/gdcm-2.0.10/Source/DataStructureAndEncodingDefinition/gdcmItem.h 2008-11-18 10:23:57.000000000 +0100
-+++ gdcm-2-0-10/Source/DataStructureAndEncodingDefinition/gdcmItem.h 2008-12-05 11:10:23.000000000 +0100
-@@ -195,6 +195,7 @@
- #endif
- if( TagField != Tag(0xfffe, 0xe000) && TagField != Tag(0xfffe, 0xe0dd) )
- {
-+ gdcmDebugMacro( "Invalid Item, found tag: " << TagField);
- throw Exception( "Not a valid Item" );
- }
- assert( TagField == Tag(0xfffe, 0xe000) || TagField == Tag(0xfffe, 0xe0dd) );
-Only in gdcm-2-0-10/Testing: .NoDartCoverage
-Only in gdcm-2-0-10: TODO
-Only in gdcm-2-0-10/Utilities/gdcmexpat: .NoDartCoverage
-Only in gdcm-2-0-10/Utilities/gdcmjpeg: .NoDartCoverage
-Only in gdcm-2-0-10/Utilities/gdcmmd5: .NoDartCoverage
-Only in gdcm-2-0-10/Utilities/gdcmopenjpeg: .NoDartCoverage
-Only in gdcm-2-0-10/Utilities/gdcmuuid: .NoDartCoverage
-Only in gdcm-2-0-10/Utilities/gdcmzlib: .NoDartCoverage
-diff -r -u -x .svn /home/mmalaterre/Software/debian-med/trunk/packages/gdcm/gdcm-2.0.10/Utilities/VTK/CMakeLists.txt gdcm-2-0-10/Utilities/VTK/CMakeLists.txt
---- /home/mmalaterre/Software/debian-med/trunk/packages/gdcm/gdcm-2.0.10/Utilities/VTK/CMakeLists.txt 2008-11-18 10:23:57.000000000 +0100
-+++ gdcm-2-0-10/Utilities/VTK/CMakeLists.txt 2008-12-02 13:33:37.000000000 +0100
-@@ -41,6 +41,9 @@
- # Use wrapping hints for this project.
- #SET(VTK_WRAP_HINTS "${PROJECT_SOURCE_DIR}/hints")
-
-+SET(VTKGDCM_NAME vtkgdcm CACHE STRING "vtk-gdcm lib name")
-+MARK_AS_ADVANCED(VTKGDCM_NAME)
-+
- # Create the instantiator for these classes.
- # FIXME: Are instantiator really needed when only doing python wrapping ?
- IF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 4.5 )
-@@ -55,7 +58,7 @@
- ${CMAKE_CURRENT_SOURCE_DIR}/VTK4
- )
- VTK_MAKE_INSTANTIATOR2(
-- "${PROJECT_NAME}Instantiator"
-+ "${VTKGDCM_NAME}Instantiator"
- vtkgdcmInstantiator_SRCS
- "${vtkgdcm_SRCS}"
- EXPORT_MACRO "" #GDCM_EXPORT
-@@ -80,12 +83,12 @@
-
- SET(VTK_USE_INSTANTIATOR_NEW 1)
- VTK_MAKE_INSTANTIATOR3(
-- "${PROJECT_NAME}Instantiator"
-+ "${VTKGDCM_NAME}Instantiator"
- vtkgdcmInstantiator_SRCS
- "${vtkgdcm_SRCS}"
-- "" #"VTK_${PROJECT_NAME}_EXPORT"
-+ "" #"VTK_${VTKGDCM_NAME}_EXPORT"
- ${PROJECT_BINARY_DIR}
-- "" #"${PROJECT_NAME}Configure.h"
-+ "" #"${VTKGDCM_NAME}Configure.h"
- )
- ENDIF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 4.5 )
-
-@@ -93,8 +96,6 @@
- #IF(NOT VTK_BUILD_SHARED_LIBS AND GDCM_BUILD_SHARED_LIBS)
- # ADD_LIBRARY(vtkgdcm STATIC ${vtkgdcm_SRCS} ${vtkgdcmInstantiator_SRCS})
- #ELSE(NOT VTK_BUILD_SHARED_LIBS AND GDCM_BUILD_SHARED_LIBS)
--SET(VTKGDCM_NAME vtkgdcm CACHE STRING "vtk-gdcm lib name")
--MARK_AS_ADVANCED(VTKGDCM_NAME)
- ADD_LIBRARY(${VTKGDCM_NAME} ${vtkgdcm_SRCS} ${vtkgdcmInstantiator_SRCS})
- #ENDIF(NOT VTK_BUILD_SHARED_LIBS AND GDCM_BUILD_SHARED_LIBS)
-
-@@ -128,52 +129,52 @@
- IF(VTK_WRAP_PYTHON)
- SET(DEXTENSION "")
- IF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 4.5 )
-- VTK_WRAP_PYTHON2(${PROJECT_NAME}Python vtkgdcmPYTHON_SRCS ${vtkgdcm_SRCS})
-+ VTK_WRAP_PYTHON2(${VTKGDCM_NAME}Python vtkgdcmPYTHON_SRCS ${vtkgdcm_SRCS})
- ELSE( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 4.5 )
- INCLUDE(${VTK_CMAKE_DIR}/vtkWrapPython.cmake)
- INCLUDE_DIRECTORIES(
- ${CMAKE_CURRENT_SOURCE_DIR}
- )
-- VTK_WRAP_PYTHON3(${PROJECT_NAME}Python vtkgdcmPYTHON_SRCS "${vtkgdcm_SRCS}")
-+ VTK_WRAP_PYTHON3(${VTKGDCM_NAME}Python vtkgdcmPYTHON_SRCS "${vtkgdcm_SRCS}")
- SET(DEXTENSION "D")
- ENDIF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 4.5 )
-- ADD_LIBRARY(${PROJECT_NAME}PythonD ${vtkgdcmPYTHON_SRCS})
-+ ADD_LIBRARY(${VTKGDCM_NAME}PythonD ${vtkgdcmPYTHON_SRCS})
- # this is a library set the version:
-- SET_TARGET_PROPERTIES(${PROJECT_NAME}PythonD PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
-- ADD_LIBRARY(${PROJECT_NAME}Python MODULE ${PROJECT_NAME}PythonInit.cxx)
-+ SET_TARGET_PROPERTIES(${VTKGDCM_NAME}PythonD PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
-+ ADD_LIBRARY(${VTKGDCM_NAME}Python MODULE ${VTKGDCM_NAME}PythonInit.cxx)
- # do not set the version on the Python module:
-- #SET_TARGET_PROPERTIES(${PROJECT_NAME}Python PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
-- TARGET_LINK_LIBRARIES(${PROJECT_NAME}PythonD ${VTKGDCM_NAME})
-+ #SET_TARGET_PROPERTIES(${VTKGDCM_NAME}Python PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
-+ TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD ${VTKGDCM_NAME})
- FOREACH(c ${vtkgdcm_LIBS})
-- TARGET_LINK_LIBRARIES(${PROJECT_NAME}PythonD ${c}Python${DEXTENSION})
-+ TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD ${c}Python${DEXTENSION})
- ENDFOREACH(c)
-- TARGET_LINK_LIBRARIES(${PROJECT_NAME}Python ${PROJECT_NAME}PythonD)
-+ TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}Python ${VTKGDCM_NAME}PythonD)
- # Python extension modules on Windows must have the extension ".pyd"
- # instead of ".dll" as of Python 2.5. Older python versions do support
- # this suffix.
- IF(WIN32 AND NOT CYGWIN)
-- SET_TARGET_PROPERTIES(${PROJECT_NAME}Python PROPERTIES SUFFIX ".pyd")
-+ SET_TARGET_PROPERTIES(${VTKGDCM_NAME}Python PROPERTIES SUFFIX ".pyd")
- ENDIF(WIN32 AND NOT CYGWIN)
-
- ADD_CUSTOM_COMMAND(
-- TARGET ${PROJECT_NAME}Python
-+ TARGET ${VTKGDCM_NAME}Python
- POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/vtkgdcm.py ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}
- DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/vtkgdcm.py"
- COMMENT "Copy vtkgdcm.py into ${LIBRARY_OUTPUT_PATH}"
- )
- IF(NOT GDCM_INSTALL_NO_LIBRARIES)
-- INSTALL(TARGETS ${PROJECT_NAME}Python
-+ INSTALL(TARGETS ${VTKGDCM_NAME}Python
- RUNTIME DESTINATION ${GDCM_INSTALL_BIN_DIR} COMPONENT Runtime
- LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR}/${python_site_package} COMPONENT Runtime ${NAMELINK_SKIP}
- ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR}/${python_site_package} COMPONENT Development
- )
-- INSTALL(TARGETS ${PROJECT_NAME}PythonD
-+ INSTALL(TARGETS ${VTKGDCM_NAME}PythonD
- RUNTIME DESTINATION ${GDCM_INSTALL_BIN_DIR} COMPONENT Runtime
- LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Runtime ${NAMELINK_SKIP}
- ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development
- )
--# INSTALL(TARGETS ${PROJECT_NAME}PythonD ${PROJECT_NAME}Python
-+# INSTALL(TARGETS ${VTKGDCM_NAME}PythonD ${VTKGDCM_NAME}Python
- # LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR}/${python_site_package} COMPONENT Development ${NAMELINK_ONLY}
- # )
- # the python file is not a dev file, but part of the gdcm module...
-Only in gdcm-2-0-10/Utilities/VTK: CMakeLists.txt.orig
-Only in gdcm-2-0-10/Utilities/VTK: CMakeLists.txt.rej
-Only in gdcm-2-0-10/Utilities/VTK: .NoDartCoverage
Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series 2009-06-16 08:26:21 UTC (rev 3491)
+++ trunk/packages/gdcm/trunk/debian/patches/series 2009-06-16 08:40:09 UTC (rev 3492)
@@ -1,5 +1,2 @@
-#csharp-install.patch
gdcmjpeg-versioning.patch
-#gdcm210_tagbackport.patch
-#gdcm210_branchbackport.patch
vtk_jar.patch
More information about the debian-med-commit
mailing list