[med-svn] r3392 - trunk/packages/gdcm/trunk/debian/patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Mon May 18 13:56:31 UTC 2009
Author: malat-guest
Date: 2009-05-18 13:56:31 +0000 (Mon, 18 May 2009)
New Revision: 3392
Modified:
trunk/packages/gdcm/trunk/debian/patches/gdcm210_branchbackport.patch
Log:
ENH: gdcm2vtk would not be build with libvtk5-dev (=5.0)
Modified: trunk/packages/gdcm/trunk/debian/patches/gdcm210_branchbackport.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/gdcm210_branchbackport.patch 2009-05-18 12:34:26 UTC (rev 3391)
+++ trunk/packages/gdcm/trunk/debian/patches/gdcm210_branchbackport.patch 2009-05-18 13:56:31 UTC (rev 3392)
@@ -3,7 +3,7 @@
It includes all the important patch that were applied to gdcm-2-0 branch after gdcm 2.0.10
was released
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Applications/Cxx/gdcmconv.cxx gdcm-2-0/Applications/Cxx/gdcmconv.cxx
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Applications/Cxx/gdcmconv.cxx gdcm-2-0/Applications/Cxx/gdcmconv.cxx
--- ../tags/gdcm-2-0-10/Applications/Cxx/gdcmconv.cxx 2008-11-18 09:54:26.000000000 +0100
+++ gdcm-2-0/Applications/Cxx/gdcmconv.cxx 2008-11-18 09:54:17.000000000 +0100
@@ -1,7 +1,7 @@
@@ -15,7 +15,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Applications/Cxx/gdcmdump.cxx gdcm-2-0/Applications/Cxx/gdcmdump.cxx
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Applications/Cxx/gdcmdump.cxx gdcm-2-0/Applications/Cxx/gdcmdump.cxx
--- ../tags/gdcm-2-0-10/Applications/Cxx/gdcmdump.cxx 2008-11-18 09:54:26.000000000 +0100
+++ gdcm-2-0/Applications/Cxx/gdcmdump.cxx 2008-11-17 15:33:05.000000000 +0100
@@ -1,7 +1,7 @@
@@ -27,7 +27,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Applications/Cxx/gdcmimg.cxx gdcm-2-0/Applications/Cxx/gdcmimg.cxx
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Applications/Cxx/gdcmimg.cxx gdcm-2-0/Applications/Cxx/gdcmimg.cxx
--- ../tags/gdcm-2-0-10/Applications/Cxx/gdcmimg.cxx 2008-11-18 09:54:26.000000000 +0100
+++ gdcm-2-0/Applications/Cxx/gdcmimg.cxx 2008-11-17 15:33:05.000000000 +0100
@@ -1,7 +1,7 @@
@@ -39,7 +39,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Applications/Cxx/gdcminfo.cxx gdcm-2-0/Applications/Cxx/gdcminfo.cxx
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Applications/Cxx/gdcminfo.cxx gdcm-2-0/Applications/Cxx/gdcminfo.cxx
--- ../tags/gdcm-2-0-10/Applications/Cxx/gdcminfo.cxx 2008-11-18 09:54:26.000000000 +0100
+++ gdcm-2-0/Applications/Cxx/gdcminfo.cxx 2008-09-26 10:17:26.000000000 +0200
@@ -1,7 +1,7 @@
@@ -51,7 +51,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Applications/Cxx/gdcmpdf.cxx gdcm-2-0/Applications/Cxx/gdcmpdf.cxx
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Applications/Cxx/gdcmpdf.cxx gdcm-2-0/Applications/Cxx/gdcmpdf.cxx
--- ../tags/gdcm-2-0-10/Applications/Cxx/gdcmpdf.cxx 2008-11-18 09:54:26.000000000 +0100
+++ gdcm-2-0/Applications/Cxx/gdcmpdf.cxx 2008-11-17 15:33:05.000000000 +0100
@@ -1,7 +1,7 @@
@@ -63,7 +63,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Applications/Cxx/gdcmraw.cxx gdcm-2-0/Applications/Cxx/gdcmraw.cxx
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Applications/Cxx/gdcmraw.cxx gdcm-2-0/Applications/Cxx/gdcmraw.cxx
--- ../tags/gdcm-2-0-10/Applications/Cxx/gdcmraw.cxx 2008-11-18 09:54:26.000000000 +0100
+++ gdcm-2-0/Applications/Cxx/gdcmraw.cxx 2008-11-17 15:33:05.000000000 +0100
@@ -1,7 +1,7 @@
@@ -75,7 +75,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Applications/Cxx/gdcmscanner.cxx gdcm-2-0/Applications/Cxx/gdcmscanner.cxx
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Applications/Cxx/gdcmscanner.cxx gdcm-2-0/Applications/Cxx/gdcmscanner.cxx
--- ../tags/gdcm-2-0-10/Applications/Cxx/gdcmscanner.cxx 2008-11-18 09:54:26.000000000 +0100
+++ gdcm-2-0/Applications/Cxx/gdcmscanner.cxx 2008-09-26 10:17:26.000000000 +0200
@@ -1,7 +1,7 @@
@@ -87,7 +87,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Applications/Cxx/gdcmtar.cxx gdcm-2-0/Applications/Cxx/gdcmtar.cxx
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Applications/Cxx/gdcmtar.cxx gdcm-2-0/Applications/Cxx/gdcmtar.cxx
--- ../tags/gdcm-2-0-10/Applications/Cxx/gdcmtar.cxx 2008-11-18 09:54:26.000000000 +0100
+++ gdcm-2-0/Applications/Cxx/gdcmtar.cxx 2008-09-26 10:17:26.000000000 +0200
@@ -1,7 +1,7 @@
@@ -99,7 +99,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/CMake/CTestCustom.ctest.in gdcm-2-0/CMake/CTestCustom.ctest.in
+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 @@
@@ -110,7 +110,7 @@
)
# ==3201== 8 bytes in 1 blocks are still reachable in loss record 2 of 8
-diff -x .svn -r -u ../tags/gdcm-2-0-10/CMake/FindDotNETFrameworkSDK.cmake gdcm-2-0/CMake/FindDotNETFrameworkSDK.cmake
+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 @@
@@ -122,7 +122,7 @@
+ CSC_v2_EXECUTABLE
+ CSC_v3_EXECUTABLE
+)
-diff -x .svn -r -u ../tags/gdcm-2-0-10/CMakeLists.txt gdcm-2-0/CMakeLists.txt
+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 @@
@@ -138,7 +138,7 @@
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 -x .svn -r -u ../tags/gdcm-2-0-10/Source/Common/gdcmSmartPointer.h gdcm-2-0/Source/Common/gdcmSmartPointer.h
+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 @@
@@ -152,7 +152,7 @@
private:
void Register()
{
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/Common/gdcmString.h gdcm-2-0/Source/Common/gdcmString.h
+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 @@
@@ -164,7 +164,7 @@
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 -x .svn -r -u ../tags/gdcm-2-0-10/Source/Common/gdcmTesting.cxx gdcm-2-0/Source/Common/gdcmTesting.cxx
+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 @@
@@ -175,7 +175,7 @@
#include "gdcm_md5.h"
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/Common/zipstreamimpl.hpp gdcm-2-0/Source/Common/zipstreamimpl.hpp
+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 @@
@@ -186,7 +186,7 @@
//*****************************************************************************
// template class basic_zip_streambuf
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/Agfa.xml gdcm-2-0/Source/DataDictionary/Agfa.xml
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/Agfa.xml gdcm-2-0/Source/DataDictionary/Agfa.xml
--- ../tags/gdcm-2-0-10/Source/DataDictionary/Agfa.xml 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/Agfa.xml 2008-09-26 10:17:05.000000000 +0200
@@ -2,7 +2,7 @@
@@ -198,7 +198,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/cp699.xml gdcm-2-0/Source/DataDictionary/cp699.xml
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/cp699.xml gdcm-2-0/Source/DataDictionary/cp699.xml
--- ../tags/gdcm-2-0-10/Source/DataDictionary/cp699.xml 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/cp699.xml 2008-09-26 10:17:05.000000000 +0200
@@ -2,7 +2,7 @@
@@ -210,7 +210,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/CSAHeader.xml gdcm-2-0/Source/DataDictionary/CSAHeader.xml
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/CSAHeader.xml gdcm-2-0/Source/DataDictionary/CSAHeader.xml
--- ../tags/gdcm-2-0-10/Source/DataDictionary/CSAHeader.xml 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/CSAHeader.xml 2008-09-26 10:17:05.000000000 +0200
@@ -1,7 +1,7 @@
@@ -222,7 +222,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/DefaultDicts.xsl gdcm-2-0/Source/DataDictionary/DefaultDicts.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/DefaultDicts.xsl gdcm-2-0/Source/DataDictionary/DefaultDicts.xsl
--- ../tags/gdcm-2-0-10/Source/DataDictionary/DefaultDicts.xsl 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/DefaultDicts.xsl 2008-09-26 10:17:05.000000000 +0200
@@ -5,7 +5,7 @@
@@ -243,7 +243,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/dicom3tools.xsl gdcm-2-0/Source/DataDictionary/dicom3tools.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/dicom3tools.xsl gdcm-2-0/Source/DataDictionary/dicom3tools.xsl
--- ../tags/gdcm-2-0-10/Source/DataDictionary/dicom3tools.xsl 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/dicom3tools.xsl 2008-09-26 10:17:05.000000000 +0200
@@ -14,7 +14,7 @@
@@ -255,7 +255,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/DICOMV3.xml gdcm-2-0/Source/DataDictionary/DICOMV3.xml
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/DICOMV3.xml gdcm-2-0/Source/DataDictionary/DICOMV3.xml
--- ../tags/gdcm-2-0-10/Source/DataDictionary/DICOMV3.xml 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/DICOMV3.xml 2008-11-17 15:33:04.000000000 +0100
@@ -8,7 +8,7 @@
@@ -267,7 +267,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/gdcm1.xsl gdcm-2-0/Source/DataDictionary/gdcm1.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/gdcm1.xsl gdcm-2-0/Source/DataDictionary/gdcm1.xsl
--- ../tags/gdcm-2-0-10/Source/DataDictionary/gdcm1.xsl 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/gdcm1.xsl 2008-09-26 10:17:05.000000000 +0200
@@ -5,7 +5,7 @@
@@ -279,7 +279,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/gdcm2html.xsl gdcm-2-0/Source/DataDictionary/gdcm2html.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/gdcm2html.xsl gdcm-2-0/Source/DataDictionary/gdcm2html.xsl
--- ../tags/gdcm-2-0-10/Source/DataDictionary/gdcm2html.xsl 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/gdcm2html.xsl 2008-09-26 10:17:05.000000000 +0200
@@ -14,7 +14,7 @@
@@ -291,7 +291,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/gdcm2pdf.xsl gdcm-2-0/Source/DataDictionary/gdcm2pdf.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/gdcm2pdf.xsl gdcm-2-0/Source/DataDictionary/gdcm2pdf.xsl
--- ../tags/gdcm-2-0-10/Source/DataDictionary/gdcm2pdf.xsl 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/gdcm2pdf.xsl 2008-09-26 10:17:05.000000000 +0200
@@ -4,7 +4,7 @@
@@ -303,7 +303,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/getname.xsl gdcm-2-0/Source/DataDictionary/getname.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/getname.xsl gdcm-2-0/Source/DataDictionary/getname.xsl
--- ../tags/gdcm-2-0-10/Source/DataDictionary/getname.xsl 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/getname.xsl 2008-09-26 10:17:04.000000000 +0200
@@ -4,7 +4,7 @@
@@ -315,7 +315,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/getowner.xsl gdcm-2-0/Source/DataDictionary/getowner.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/getowner.xsl gdcm-2-0/Source/DataDictionary/getowner.xsl
--- ../tags/gdcm-2-0-10/Source/DataDictionary/getowner.xsl 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/getowner.xsl 2008-09-26 10:17:05.000000000 +0200
@@ -4,7 +4,7 @@
@@ -327,7 +327,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/getretired.xsl gdcm-2-0/Source/DataDictionary/getretired.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/getretired.xsl gdcm-2-0/Source/DataDictionary/getretired.xsl
--- ../tags/gdcm-2-0-10/Source/DataDictionary/getretired.xsl 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/getretired.xsl 2008-09-26 10:17:05.000000000 +0200
@@ -4,7 +4,7 @@
@@ -339,7 +339,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/HarvestedPrivate.xml gdcm-2-0/Source/DataDictionary/HarvestedPrivate.xml
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/HarvestedPrivate.xml gdcm-2-0/Source/DataDictionary/HarvestedPrivate.xml
--- ../tags/gdcm-2-0-10/Source/DataDictionary/HarvestedPrivate.xml 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/HarvestedPrivate.xml 2008-09-26 10:17:05.000000000 +0200
@@ -8,7 +8,7 @@
@@ -351,7 +351,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/order.xsl gdcm-2-0/Source/DataDictionary/order.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/order.xsl gdcm-2-0/Source/DataDictionary/order.xsl
--- ../tags/gdcm-2-0-10/Source/DataDictionary/order.xsl 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/order.xsl 2008-09-26 10:17:04.000000000 +0200
@@ -3,7 +3,7 @@
@@ -363,7 +363,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/Part67.xsl gdcm-2-0/Source/DataDictionary/Part67.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/Part67.xsl gdcm-2-0/Source/DataDictionary/Part67.xsl
--- ../tags/gdcm-2-0-10/Source/DataDictionary/Part67.xsl 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/Part67.xsl 2008-09-26 10:17:05.000000000 +0200
@@ -2,7 +2,7 @@
@@ -384,7 +384,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/Part6PDF.xsl gdcm-2-0/Source/DataDictionary/Part6PDF.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/Part6PDF.xsl gdcm-2-0/Source/DataDictionary/Part6PDF.xsl
--- ../tags/gdcm-2-0-10/Source/DataDictionary/Part6PDF.xsl 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/Part6PDF.xsl 2008-09-26 10:17:04.000000000 +0200
@@ -4,7 +4,7 @@
@@ -396,7 +396,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/Part6tod3t.xsl gdcm-2-0/Source/DataDictionary/Part6tod3t.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/Part6tod3t.xsl gdcm-2-0/Source/DataDictionary/Part6tod3t.xsl
--- ../tags/gdcm-2-0-10/Source/DataDictionary/Part6tod3t.xsl 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/Part6tod3t.xsl 2008-09-26 10:17:05.000000000 +0200
@@ -8,7 +8,7 @@
@@ -408,7 +408,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/Part6togdcm1.xsl gdcm-2-0/Source/DataDictionary/Part6togdcm1.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/Part6togdcm1.xsl gdcm-2-0/Source/DataDictionary/Part6togdcm1.xsl
--- ../tags/gdcm-2-0-10/Source/DataDictionary/Part6togdcm1.xsl 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/Part6togdcm1.xsl 2008-09-26 10:17:04.000000000 +0200
@@ -5,7 +5,7 @@
@@ -420,7 +420,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/Part6.xml gdcm-2-0/Source/DataDictionary/Part6.xml
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/Part6.xml gdcm-2-0/Source/DataDictionary/Part6.xml
--- ../tags/gdcm-2-0-10/Source/DataDictionary/Part6.xml 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/Part6.xml 2008-11-17 15:33:04.000000000 +0100
@@ -1,7 +1,7 @@
@@ -432,7 +432,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/Part7.xml gdcm-2-0/Source/DataDictionary/Part7.xml
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/Part7.xml gdcm-2-0/Source/DataDictionary/Part7.xml
--- ../tags/gdcm-2-0-10/Source/DataDictionary/Part7.xml 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/Part7.xml 2008-09-26 10:17:04.000000000 +0200
@@ -1,7 +1,7 @@
@@ -444,7 +444,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/Part7.xsl gdcm-2-0/Source/DataDictionary/Part7.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/Part7.xsl gdcm-2-0/Source/DataDictionary/Part7.xsl
--- ../tags/gdcm-2-0-10/Source/DataDictionary/Part7.xsl 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/Part7.xsl 2008-09-26 10:17:05.000000000 +0200
@@ -4,7 +4,7 @@
@@ -456,7 +456,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/priv2html.xsl gdcm-2-0/Source/DataDictionary/priv2html.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/priv2html.xsl gdcm-2-0/Source/DataDictionary/priv2html.xsl
--- ../tags/gdcm-2-0-10/Source/DataDictionary/priv2html.xsl 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/priv2html.xsl 2008-09-26 10:17:05.000000000 +0200
@@ -14,7 +14,7 @@
@@ -468,7 +468,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/redo2.xsl gdcm-2-0/Source/DataDictionary/redo2.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/redo2.xsl gdcm-2-0/Source/DataDictionary/redo2.xsl
--- ../tags/gdcm-2-0-10/Source/DataDictionary/redo2.xsl 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/redo2.xsl 2008-09-26 10:17:05.000000000 +0200
@@ -4,7 +4,7 @@
@@ -489,7 +489,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/redo.xsl gdcm-2-0/Source/DataDictionary/redo.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/redo.xsl gdcm-2-0/Source/DataDictionary/redo.xsl
--- ../tags/gdcm-2-0-10/Source/DataDictionary/redo.xsl 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/redo.xsl 2008-09-26 10:17:05.000000000 +0200
@@ -4,7 +4,7 @@
@@ -510,7 +510,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/Siemens.xml gdcm-2-0/Source/DataDictionary/Siemens.xml
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/Siemens.xml gdcm-2-0/Source/DataDictionary/Siemens.xml
--- ../tags/gdcm-2-0-10/Source/DataDictionary/Siemens.xml 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/Siemens.xml 2008-09-26 10:17:05.000000000 +0200
@@ -6,7 +6,7 @@
@@ -522,7 +522,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/sort.xsl gdcm-2-0/Source/DataDictionary/sort.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/sort.xsl gdcm-2-0/Source/DataDictionary/sort.xsl
--- ../tags/gdcm-2-0-10/Source/DataDictionary/sort.xsl 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/sort.xsl 2008-09-26 10:17:04.000000000 +0200
@@ -3,7 +3,7 @@
@@ -534,7 +534,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/TagToType.xsl gdcm-2-0/Source/DataDictionary/TagToType.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/TagToType.xsl gdcm-2-0/Source/DataDictionary/TagToType.xsl
--- ../tags/gdcm-2-0-10/Source/DataDictionary/TagToType.xsl 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/TagToType.xsl 2008-09-26 10:17:04.000000000 +0200
@@ -6,7 +6,7 @@
@@ -555,7 +555,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/UIDs.xml gdcm-2-0/Source/DataDictionary/UIDs.xml
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/UIDs.xml gdcm-2-0/Source/DataDictionary/UIDs.xml
--- ../tags/gdcm-2-0-10/Source/DataDictionary/UIDs.xml 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/UIDs.xml 2008-09-26 10:17:05.000000000 +0200
@@ -1,7 +1,7 @@
@@ -567,7 +567,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/vital.xml gdcm-2-0/Source/DataDictionary/vital.xml
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/vital.xml gdcm-2-0/Source/DataDictionary/vital.xml
--- ../tags/gdcm-2-0-10/Source/DataDictionary/vital.xml 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/vital.xml 2008-09-26 10:17:05.000000000 +0200
@@ -2,7 +2,7 @@
@@ -579,7 +579,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataDictionary/VM.xsl gdcm-2-0/Source/DataDictionary/VM.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/DataDictionary/VM.xsl gdcm-2-0/Source/DataDictionary/VM.xsl
--- ../tags/gdcm-2-0-10/Source/DataDictionary/VM.xsl 2008-11-18 09:54:23.000000000 +0100
+++ gdcm-2-0/Source/DataDictionary/VM.xsl 2008-09-26 10:17:04.000000000 +0200
@@ -5,7 +5,7 @@
@@ -591,7 +591,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataStructureAndEncodingDefinition/gdcmAttribute.h gdcm-2-0/Source/DataStructureAndEncodingDefinition/gdcmAttribute.h
+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 @@
@@ -611,7 +611,7 @@
ret.SetByteValue( os.str().c_str(), os.str().size() );
return ret;
}
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataStructureAndEncodingDefinition/gdcmDataElement.h gdcm-2-0/Source/DataStructureAndEncodingDefinition/gdcmDataElement.h
+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 @@
@@ -625,7 +625,7 @@
return bv; // Will return NULL if not ByteValue
}
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataStructureAndEncodingDefinition/gdcmElement.h gdcm-2-0/Source/DataStructureAndEncodingDefinition/gdcmElement.h
+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 @@
@@ -647,7 +647,7 @@
}
}
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfFragments.h gdcm-2-0/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfFragments.h
+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 @@
@@ -668,7 +668,7 @@
void Print(std::ostream &os) const {
os << "SQ L= " << SequenceLengthField << "\n";
os << "Table:" << Table << "\n";
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/getelements.xsl gdcm-2-0/Source/InformationObjectDefinition/getelements.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/getelements.xsl gdcm-2-0/Source/InformationObjectDefinition/getelements.xsl
--- ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/getelements.xsl 2008-11-18 09:54:25.000000000 +0100
+++ gdcm-2-0/Source/InformationObjectDefinition/getelements.xsl 2008-09-26 10:17:19.000000000 +0200
@@ -4,7 +4,7 @@
@@ -680,7 +680,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/ma2html.xsl gdcm-2-0/Source/InformationObjectDefinition/ma2html.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/ma2html.xsl gdcm-2-0/Source/InformationObjectDefinition/ma2html.xsl
--- ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/ma2html.xsl 2008-11-18 09:54:25.000000000 +0100
+++ gdcm-2-0/Source/InformationObjectDefinition/ma2html.xsl 2008-09-26 10:17:19.000000000 +0200
@@ -4,7 +4,7 @@
@@ -692,7 +692,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/ma2pdf.xsl gdcm-2-0/Source/InformationObjectDefinition/ma2pdf.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/ma2pdf.xsl gdcm-2-0/Source/InformationObjectDefinition/ma2pdf.xsl
--- ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/ma2pdf.xsl 2008-11-18 09:54:25.000000000 +0100
+++ gdcm-2-0/Source/InformationObjectDefinition/ma2pdf.xsl 2008-09-26 10:17:19.000000000 +0200
@@ -4,7 +4,7 @@
@@ -704,7 +704,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/ModuleAttributes.xml gdcm-2-0/Source/InformationObjectDefinition/ModuleAttributes.xml
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/ModuleAttributes.xml gdcm-2-0/Source/InformationObjectDefinition/ModuleAttributes.xml
--- ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/ModuleAttributes.xml 2008-11-18 09:54:25.000000000 +0100
+++ gdcm-2-0/Source/InformationObjectDefinition/ModuleAttributes.xml 2008-09-26 10:17:19.000000000 +0200
@@ -6,7 +6,7 @@
@@ -716,7 +716,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/Part3.xml gdcm-2-0/Source/InformationObjectDefinition/Part3.xml
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/Part3.xml gdcm-2-0/Source/InformationObjectDefinition/Part3.xml
--- ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/Part3.xml 2008-11-18 09:54:25.000000000 +0100
+++ gdcm-2-0/Source/InformationObjectDefinition/Part3.xml 2008-09-26 10:17:19.000000000 +0200
@@ -6,7 +6,7 @@
@@ -728,7 +728,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/Part3.xsl gdcm-2-0/Source/InformationObjectDefinition/Part3.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/Part3.xsl gdcm-2-0/Source/InformationObjectDefinition/Part3.xsl
--- ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/Part3.xsl 2008-11-18 09:54:25.000000000 +0100
+++ gdcm-2-0/Source/InformationObjectDefinition/Part3.xsl 2008-09-26 10:17:19.000000000 +0200
@@ -2,7 +2,7 @@
@@ -749,7 +749,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/Part4.xml gdcm-2-0/Source/InformationObjectDefinition/Part4.xml
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/Part4.xml gdcm-2-0/Source/InformationObjectDefinition/Part4.xml
--- ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/Part4.xml 2008-11-18 09:54:25.000000000 +0100
+++ gdcm-2-0/Source/InformationObjectDefinition/Part4.xml 2008-09-26 10:17:19.000000000 +0200
@@ -1,7 +1,7 @@
@@ -761,7 +761,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/Part4.xsl gdcm-2-0/Source/InformationObjectDefinition/Part4.xsl
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/Part4.xsl gdcm-2-0/Source/InformationObjectDefinition/Part4.xsl
--- ../tags/gdcm-2-0-10/Source/InformationObjectDefinition/Part4.xsl 2008-11-18 09:54:25.000000000 +0100
+++ gdcm-2-0/Source/InformationObjectDefinition/Part4.xsl 2008-09-26 10:17:19.000000000 +0200
@@ -3,7 +3,7 @@
@@ -782,7 +782,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/MediaStorageAndFileFormat/gdcmCurve.cxx gdcm-2-0/Source/MediaStorageAndFileFormat/gdcmCurve.cxx
+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 @@
@@ -802,7 +802,7 @@
// Store found tag in overlay:
overlay = de.GetTag();
// Move on to the next possible one:
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Source/MediaStorageAndFileFormat/gdcmOverlay.cxx gdcm-2-0/Source/MediaStorageAndFileFormat/gdcmOverlay.cxx
+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 @@
@@ -845,7 +845,7 @@
}
}
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Testing/CMakeLists.txt gdcm-2-0/Testing/CMakeLists.txt
+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 @@
@@ -875,7 +875,7 @@
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Testing/Source/Common/Cxx/TestString2.cxx gdcm-2-0/Testing/Source/Common/Cxx/TestString2.cxx
+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 @@
@@ -889,7 +889,38 @@
Only in gdcm-2-0/Utilities/C99: inttypes.h
Only in gdcm-2-0/Utilities/C99: stdint.h.1
Only in gdcm-2-0/Utilities/rle: rledump.c.old
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Utilities/VTK/Applications/gdcmviewer.cxx gdcm-2-0/Utilities/VTK/Applications/gdcmviewer.cxx
+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 15:53:29.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)
+@@ -30,9 +25,9 @@
+ SET_TARGET_PROPERTIES(${app} PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES})
+ 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)
+- ENDIF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" GREATER 5.0 )
++ #IF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" GREATER 5.0 )
++ # TARGET_LINK_LIBRARIES(${app} vtkWidgets vtkVolumeRendering)
++ #ENDIF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" GREATER 5.0 )
+ IF(WIN32 AND NOT CYGWIN)
+ TARGET_LINK_LIBRARIES(${app} gdcmgetopt)
+ ENDIF(WIN32 AND NOT CYGWIN)
+diff -r -u -x .svn ../tags/gdcm-2-0-10/Utilities/VTK/Applications/gdcmviewer.cxx gdcm-2-0/Utilities/VTK/Applications/gdcmviewer.cxx
--- ../tags/gdcm-2-0-10/Utilities/VTK/Applications/gdcmviewer.cxx 2008-11-18 09:54:28.000000000 +0100
+++ gdcm-2-0/Utilities/VTK/Applications/gdcmviewer.cxx 2008-11-17 15:33:11.000000000 +0100
@@ -1,7 +1,7 @@
@@ -901,7 +932,7 @@
Copyright (c) 2006-2008 Mathieu Malaterre
All rights reserved.
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Utilities/VTK/CMakeLists.txt gdcm-2-0/Utilities/VTK/CMakeLists.txt
+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 @@
@@ -966,7 +997,7 @@
Only in ../tags/gdcm-2-0-10/Utilities/VTK: CMakeLists.txt.orig
Only in ../tags/gdcm-2-0-10/Utilities/VTK: CMakeLists.txt.rej
Only in gdcm-2-0/Utilities/VTK: JavaDependencies.cmake.in
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Utilities/VTK/vtkGDCMImageReader.cxx gdcm-2-0/Utilities/VTK/vtkGDCMImageReader.cxx
+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 @@
@@ -977,7 +1008,7 @@
}
}
else
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Wrapping/Java/CMakeLists.txt gdcm-2-0/Wrapping/Java/CMakeLists.txt
+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 @@
@@ -1041,7 +1072,7 @@
DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Runtime
)
ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
-diff -x .svn -r -u ../tags/gdcm-2-0-10/Wrapping/Java/gdcm.i gdcm-2-0/Wrapping/Java/gdcm.i
+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 @@
More information about the debian-med-commit
mailing list