[med-svn] r7655 - trunk/packages/volview/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-04 12:16:25 +0000 (Sun, 04 Sep 2011)
New Revision: 7655

Added:
   trunk/packages/volview/trunk/debian/patches/fixupvtkedge.patch
Modified:
   trunk/packages/volview/trunk/debian/patches/series
Log:
Start working on vtkedge 5.4 -> svn transition

Added: trunk/packages/volview/trunk/debian/patches/fixupvtkedge.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixupvtkedge.patch	                        (rev 0)
+++ trunk/packages/volview/trunk/debian/patches/fixupvtkedge.patch	2011-09-04 12:16:25 UTC (rev 7655)
@@ -0,0 +1,56 @@
+VolView seems to requires files from VTKEdge 5.4
+Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWApplicationPro.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWApplicationPro.cxx	2011-09-04 00:37:52.000000000 +0200
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWApplicationPro.cxx	2011-09-04 00:40:03.000000000 +0200
+@@ -32,9 +32,9 @@
+ #include "vtkKWCommonProConfigure.h" // Needed for KWCommonPro_USE_XML_RW
+ #endif
+ 
+-#include "vtkKWEGPUInfoList.h"
+-#include "vtkKWEGPUInfo.h"
+-#include "vtkKWEGPUVolumeRayCastMapper.h"
++//#include "vtkKWEGPUInfoList.h"
++//#include "vtkKWEGPUInfo.h"
++//#include "vtkKWEGPUVolumeRayCastMapper.h"
+ 
+ #include <vtksys/SystemTools.hxx>
+ #include <vtksys/SystemInformation.hxx>
+@@ -295,6 +295,7 @@
+ 
+   // GPU
+ 
++#if 0
+   vtkKWEGPUInfoList *l = vtkKWEGPUInfoList::New();
+   l->Probe();
+   if (l->GetNumberOfGPUs())
+@@ -309,6 +310,7 @@
+   vtkKWEGPUVolumeRayCastMapper *mapper = vtkKWEGPUVolumeRayCastMapper::New();
+   os << k_("GPU Rendering") << ": " << (mapper->IsRenderSupported(renwin, NULL) ? k_("Supported") : k_("NOT supported")) << endl;
+   mapper->Delete();
++#endif
+ 
+   os << k_("Use GPU Rendering") << ": " 
+      << (this->UseGPURendering ? k_("Yes") : k_("No")) << endl;
+Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx	2011-09-04 13:56:17.000000000 +0200
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx	2011-09-04 14:07:01.000000000 +0200
+@@ -52,7 +52,7 @@
+ #include "vtkKW3DSplineSurfacesWidget.h"
+ #include "vtkKWApplication.h"
+ #include "vtkKWApplicationPro.h"
+-#include "vtkKWEVolumeMapper.h"
++//#include "vtkKWEVolumeMapper.h"
+ #include "vtkKWEvent.h"
+ #include "vtkKWEventMap.h"
+ #include "vtkKWFrame.h"
+@@ -117,7 +117,7 @@
+ 
+   this->Volume = vtkVolume::New();
+   
+-  this->VolumeMapper = vtkKWEVolumeMapper::New();
++  this->VolumeMapper = NULL; //vtkKWEVolumeMapper::New();
+   
+   this->Volume->SetMapper(this->VolumeMapper);
+   this->Volume->SetProperty(this->VolumeProperty);

Modified: trunk/packages/volview/trunk/debian/patches/series
===================================================================
--- trunk/packages/volview/trunk/debian/patches/series	2011-09-04 11:55:56 UTC (rev 7654)
+++ trunk/packages/volview/trunk/debian/patches/series	2011-09-04 12:16:25 UTC (rev 7655)
@@ -1,2 +1,3 @@
 addtoplevelcmake.patch
 updategdcm.patch
+fixupvtkedge.patch