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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-06 10:15:02 +0000 (Tue, 06 Sep 2011)
New Revision: 7682

Modified:
   trunk/packages/volview/trunk/debian/patches/kwevm_smartvm.patch
Log:
cleanup patch

Modified: trunk/packages/volview/trunk/debian/patches/kwevm_smartvm.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/kwevm_smartvm.patch	2011-09-06 10:02:04 UTC (rev 7681)
+++ trunk/packages/volview/trunk/debian/patches/kwevm_smartvm.patch	2011-09-06 10:15:02 UTC (rev 7682)
@@ -2,32 +2,8 @@
 (after VTK 5.4 transition)
 Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx
 ===================================================================
---- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx	2011-09-05 15:43:57.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx	2011-09-05 15:43:58.000000000 +0000
-@@ -3644,7 +3644,7 @@
-   if (this->VolumeMapper)
-     {
-     this->AddVolumeMapperProgress(
--      this->VolumeMapper,
-+      (vtkVolumeMapper*)this->VolumeMapper,
-       ks_("Progress|Generating Image"));
- 
-     this->AddVolumeMapperGradientProgress(
-@@ -3727,8 +3727,8 @@
-       if (this->VolumeMapper)
-         {
-         this->VolumeMapper->SetRequestedRenderMode(
--          *iarg ? vtkKWEVolumeMapper::DefaultRenderMode
--          : vtkKWEVolumeMapper::RayCastAndTextureRenderMode);
-+          *iarg ? vtkSmartVolumeMapper::DefaultRenderMode
-+          : vtkSmartVolumeMapper::RayCastAndTextureRenderMode);
-         }
- 
-     case vtkCommand::VolumeMapperRenderStartEvent:
-Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx	2011-09-05 15:49:50.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx	2011-09-05 15:49:52.000000000 +0000
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx	2011-07-15 20:03:03.000000000 +0200
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx	2011-09-06 12:12:35.000000000 +0200
 @@ -52,7 +52,7 @@
  #include "vtkKW3DSplineSurfacesWidget.h"
  #include "vtkKWApplication.h"
@@ -70,10 +46,30 @@
         !this->IsMapped()) // we are not mapped and use GPU rendering
      )
      {
+@@ -3644,7 +3644,7 @@
+   if (this->VolumeMapper)
+     {
+     this->AddVolumeMapperProgress(
+-      this->VolumeMapper,
++      (vtkVolumeMapper*)this->VolumeMapper,
+       ks_("Progress|Generating Image"));
+ 
+     this->AddVolumeMapperGradientProgress(
+@@ -3727,8 +3727,8 @@
+       if (this->VolumeMapper)
+         {
+         this->VolumeMapper->SetRequestedRenderMode(
+-          *iarg ? vtkKWEVolumeMapper::DefaultRenderMode
+-          : vtkKWEVolumeMapper::RayCastAndTextureRenderMode);
++          *iarg ? vtkSmartVolumeMapper::DefaultRenderMode
++          : vtkSmartVolumeMapper::RayCastAndTextureRenderMode);
+         }
+ 
+     case vtkCommand::VolumeMapperRenderStartEvent:
 Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h
 ===================================================================
---- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h	2011-09-05 15:48:26.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h	2011-09-05 15:49:52.000000000 +0000
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h	2011-07-15 20:03:03.000000000 +0200
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h	2011-09-06 12:12:35.000000000 +0200
 @@ -30,7 +30,7 @@
  class vtkKWInteractorStyleVolumeView;
  class vtkKWScalarBarWidget;