[med-svn] r4763 - trunk/packages/insighttoolkit/trunk/debian/patches

[Steven Michael Robbins]

Author: smr
Date: 2010-05-02 02:34:22 +0000 (Sun, 02 May 2010)
New Revision: 4763

Removed:
   trunk/packages/insighttoolkit/trunk/debian/patches/use_system_vxl.patch
Modified:
   trunk/packages/insighttoolkit/trunk/debian/patches/itkTkImageViewer2D.patch
   trunk/packages/insighttoolkit/trunk/debian/patches/series
Log:
Adjust to upstream patch set.

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/itkTkImageViewer2D.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/itkTkImageViewer2D.patch	2010-04-30 10:46:29 UTC (rev 4762)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/itkTkImageViewer2D.patch	2010-05-02 02:34:22 UTC (rev 4763)
@@ -1,20 +1,34 @@
---- insighttoolkit-3.16.0.orig/Wrapping/CSwig/IO/itkTkImageViewer2D.cxx.orig	2010-04-10 21:22:04.000000000 -0500
-+++ insighttoolkit-3.16.0/Wrapping/CSwig/IO/itkTkImageViewer2D.cxx	2010-04-10 23:13:16.000000000 -0500
-@@ -114,7 +114,7 @@
+Reported upstream: http://public.kitware.com/Bug/view.php?id=10532
+
+--- insighttoolkit-3.18.0.orig/Wrapping/CSwig/IO/itkTkImageViewer2D.cxx
++++ insighttoolkit-3.18.0/Wrapping/CSwig/IO/itkTkImageViewer2D.cxx
+@@ -114,8 +114,14 @@
    // Setup the size 
    Tk_PhotoHandle photo =
      Tk_FindPhoto(m_Interpreter, const_cast<char*>(m_ImageName.c_str()));
--  Tk_PhotoSetSize(photo, width, height);
++
++
++#if (TK_MAJOR_VERSION == 8) && (TK_MINOR_VERSION < 5)
+   Tk_PhotoSetSize(photo, width, height);
+-  
++#else  
 +  Tk_PhotoSetSize(m_Interpreter, photo, width, height);
-   
++#endif
++
    OStringStream command;
    command << m_CanvasName.c_str() << " configure -scrollregion \"1 1 "
-@@ -142,7 +142,7 @@
+           << width << " " << height << "\"";
+@@ -142,8 +148,13 @@
  #if (TK_MAJOR_VERSION == 8) && (TK_MINOR_VERSION < 4)
    Tk_PhotoPutBlock(photo, &block, 0, 0, size[0], size[1]);
  #else
--  Tk_PhotoPutBlock(photo, &block, 0, 0, size[0], size[1],
++#if (TK_MAJOR_VERSION == 8) && (TK_MINOR_VERSION < 5)
+   Tk_PhotoPutBlock(photo, &block, 0, 0, size[0], size[1],
+                    TK_PHOTO_COMPOSITE_SET);
++#else
 +  Tk_PhotoPutBlock(m_Interpreter, photo, &block, 0, 0, size[0], size[1],
-                    TK_PHOTO_COMPOSITE_SET);
++                    TK_PHOTO_COMPOSITE_SET);
++#endif
  #endif
  }
+ 

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2010-04-30 10:46:29 UTC (rev 4762)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2010-05-02 02:34:22 UTC (rev 4763)
@@ -1,6 +1,5 @@
 gccxml-workaround.patch
 03_examples.patch
 tcl-install.patch
-use_system_vxl.patch
 itkTkImageViewer2D.patch
 jni-dir.patch

Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/use_system_vxl.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/use_system_vxl.patch	2010-04-30 10:46:29 UTC (rev 4762)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/use_system_vxl.patch	2010-05-02 02:34:22 UTC (rev 4763)
@@ -1,18 +0,0 @@
-http://public.kitware.com/cgi-bin/viewcvs.cgi/Wrapping/CSwig/CMakeLists.txt?root=Insight&r1=1.63&r2=1.64&view=patch
-
---- insighttoolkit-3.4.0.orig/Wrapping/CSwig/CMakeLists.txt	2008/06/05 15:53:53	1.63
-+++ insighttoolkit-3.4.0/Wrapping/CSwig/CMakeLists.txt	2009/09/30 10:01:40	1.64
-@@ -303,6 +303,13 @@
-   ${ITK_TOP}/Wrapping/CSwig/IO
-   ${ITK_TOP}/Wrapping/CSwig/Algorithms
-   )
-+IF(ITK_USE_SYSTEM_VXL)
-+  SET(SWIG_INC
-+    ${SWIG_INC}
-+    ${VXL_VCL_INCLUDE_DIR}
-+    ${VXL_CORE_INCLUDE_DIR}
-+    )
-+ENDIF(ITK_USE_SYSTEM_VXL)
- ADD_DEFINITIONS(-DSWIG_GLOBAL)
- 
- SET(ITK_KITS VXLNumerics CommonA CommonB Numerics