Attached are 2 patches that will allow ITKVTKGLUE to be turned back on.
They make the ITKVTKGLUE module compatible with vtk 5.8. The first
patch, insighttoolkit.patch, actually needs to be applied to the
insighttoolkit source. The second patch, wrapitk.patch, is for the
wrapitk-python source.


diff --git a/debian/patches/itkvtkglue-vtk58.patch b/debian/patches/itkvtkglue-vtk58.patch
new file mode 100644
index 0000000..85b3750
--- /dev/null
+++ b/debian/patches/itkvtkglue-vtk58.patch
@@ -0,0 +1,29 @@
+--- 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; }
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e895b96..1952557 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ wrapitk.patch
 wrapitk-externalprojects.patch
 add-registration-optimizers.patch
 wrap-iifilter-split.patch
+itkvtkglue-vtk58.patch
diff --git a/debian/rules b/debian/rules
index ec07f75..8ec30d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,8 +37,7 @@ CMAKE_FLAGS = \
 	-DWRAP_unsigned_short:BOOL=ON \
 	-DWRAP_vector_float:BOOL=ON \
 	-DWRAP_FFT:BOOL=OFF \
-	-DWRAP_FFTW:BOOL=OFF \
-	-DBUILD_ITKVTKGLUE:BOOL=OFF
+	-DWRAP_FFTW:BOOL=OFF
 
 VER_FULL = $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
 SOVERSION = $(VER_MAJOR).$(VER_MINOR)

Reply via email to