[med-svn] r9495 - in trunk/packages/insighttoolkit/branches/3.20.1/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2012-01-31 04:03:19 +0000 (Tue, 31 Jan 2012)
New Revision: 9495

Added:
   trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/itkvtkglue-vtk58.patch
Modified:
   trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog
   trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series
Log:
Patch to reenable ITKVTK module for wrapping.

Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog	2012-01-31 02:41:22 UTC (rev 9494)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog	2012-01-31 04:03:19 UTC (rev 9495)
@@ -4,7 +4,10 @@
     system VXL needs to be coordinated since it means libraries such as
     libitkvnl_algo are no longer present, breaking dependent packages.
 
- -- Steve M. Robbins <smr at debian.org>  Sun, 29 Jan 2012 22:13:32 -0600
+  * patches/itkvtkglue-vtk58.patch: New.  Patch ITKVTK module to be
+    compatible with VTK 5.8.  Thanks, Paul Novotny.
+  
+ -- Steve M. Robbins <smr at debian.org>  Mon, 30 Jan 2012 20:52:30 -0600
 
 insighttoolkit (3.20.1-3) unstable; urgency=low
 

Added: trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/itkvtkglue-vtk58.patch
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/itkvtkglue-vtk58.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/itkvtkglue-vtk58.patch	2012-01-31 04:03:19 UTC (rev 9495)
@@ -0,0 +1,34 @@
+Description: Make ITKVTK wrapping compatible with vtk 5.8
+Author: Paul Novotny <paul.novotny at gmail.com>
+Bug: 651433
+Forwarded: no
+
+--- a/Wrapping/WrapITK/ExternalProjects/ItkVtkGlue/Wrapping/itkvtk.swg
++++ b/Wrapping/WrapITK/ExternalProjects/ItkVtkGlue/Wrapping/itkvtk.swg
+@@ -42,22 +42,22 @@
+ 
+ %typemap(out) vtkImageExport* {
+   PyImport_ImportModule("vtk");
+-  $result = vtkPythonGetObjectFromPointer ( (vtkImageExport*)$1 );
++  $result = vtkPythonUtil::GetObjectFromPointer ( (vtkImageExport*)$1 );
+ }
+ 
+ %typemap(out) vtkImageImport* {
+   PyImport_ImportModule("vtk");
+-  $result = vtkPythonGetObjectFromPointer ( (vtkImageImport*)$1 );
++  $result = vtkPythonUtil::GetObjectFromPointer ( (vtkImageImport*)$1 );
+ }
+ 
+ %typemap(out) vtkImageData* {
+   PyImport_ImportModule("vtk");
+-  $result = vtkPythonGetObjectFromPointer ( (vtkImageData*)$1 );
++  $result = vtkPythonUtil::GetObjectFromPointer ( (vtkImageData*)$1 );
+ }
+ 
+ %typemap(in) vtkImageData* {
+   $1 = NULL;
+-  $1 = (vtkImageData*) vtkPythonGetPointerFromObject ( $input, "vtkImageData" );
++  $1 = (vtkImageData*) vtkPythonUtil::GetPointerFromObject ( $input, "vtkImageData" );
+   if ( $1 == NULL ) { SWIG_fail; }
+ }
+ 

Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series	2012-01-31 02:41:22 UTC (rev 9494)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series	2012-01-31 04:03:19 UTC (rev 9495)
@@ -7,3 +7,4 @@
 wrapitk-externalprojects.patch
 add-registration-optimizers.patch
 wrap-iifilter-split.patch
+itkvtkglue-vtk58.patch