[med-svn] [itksnap] 07/11: Update vtk 6.3 patch

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gert-guest pushed a commit to branch master
in repository itksnap.

commit 4796ea1f59b074a663be62f668dab0f5375a63c2
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Sun Apr 17 09:40:27 2016 +0000

    Update vtk 6.3 patch
---
 debian/patches/02_vtk_6.3.patch | 56 ++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/debian/patches/02_vtk_6.3.patch b/debian/patches/02_vtk_6.3.patch
index 009b7d0..169eb6e 100644
--- a/debian/patches/02_vtk_6.3.patch
+++ b/debian/patches/02_vtk_6.3.patch
@@ -1,8 +1,6 @@
-Index: itksnap-3.4.0/GUI/Qt/View/GenericView3D.cxx
-===================================================================
---- itksnap-3.4.0.orig/GUI/Qt/View/GenericView3D.cxx
-+++ itksnap-3.4.0/GUI/Qt/View/GenericView3D.cxx
-@@ -23,7 +23,7 @@ class CursorPlacementInteractorStyle : p
+--- a/GUI/Qt/View/GenericView3D.cxx
++++ b/GUI/Qt/View/GenericView3D.cxx
+@@ -23,7 +23,7 @@
  {
  public:
    static CursorPlacementInteractorStyle* New();
@@ -11,7 +9,7 @@ Index: itksnap-3.4.0/GUI/Qt/View/GenericView3D.cxx
  
    irisGetSetMacro(Model, Generic3DModel *)
  
-@@ -46,7 +46,7 @@ class SpraycanInteractorStyle : public v
+@@ -46,7 +46,7 @@
  {
  public:
    static SpraycanInteractorStyle* New();
@@ -20,7 +18,7 @@ Index: itksnap-3.4.0/GUI/Qt/View/GenericView3D.cxx
  
    irisGetSetMacro(Model, Generic3DModel *)
  
-@@ -99,7 +99,7 @@ class ScalpelInteractorStyle : public vt
+@@ -99,7 +99,7 @@
  {
  public:
    static ScalpelInteractorStyle* New();
@@ -29,7 +27,7 @@ Index: itksnap-3.4.0/GUI/Qt/View/GenericView3D.cxx
  
    irisGetSetMacro(Model, Generic3DModel *)
  
-@@ -189,13 +189,10 @@ protected:
+@@ -189,13 +189,10 @@
  
  
  
@@ -43,11 +41,9 @@ Index: itksnap-3.4.0/GUI/Qt/View/GenericView3D.cxx
  vtkStandardNewMacro(ScalpelInteractorStyle)
  
  
-Index: itksnap-3.4.0/GUI/Renderer/IntensityCurveVTKRenderer.cxx
-===================================================================
---- itksnap-3.4.0.orig/GUI/Renderer/IntensityCurveVTKRenderer.cxx
-+++ itksnap-3.4.0/GUI/Renderer/IntensityCurveVTKRenderer.cxx
-@@ -326,12 +326,11 @@ public:
+--- a/GUI/Renderer/IntensityCurveVTKRenderer.cxx
++++ b/GUI/Renderer/IntensityCurveVTKRenderer.cxx
+@@ -326,12 +326,11 @@
    {
      this->MouseMoved = false;
  
@@ -64,22 +60,18 @@ Index: itksnap-3.4.0/GUI/Renderer/IntensityCurveVTKRenderer.cxx
        this->SetCurrentPoint(pointUnderMouse);
        return true;
        }
-Index: itksnap-3.4.0/GUI/Renderer/Window3DPicker.cxx
-===================================================================
---- itksnap-3.4.0.orig/GUI/Renderer/Window3DPicker.cxx
-+++ itksnap-3.4.0/GUI/Renderer/Window3DPicker.cxx
-@@ -114,6 +114,5 @@ Window3DPicker::Window3DPicker()
+--- a/GUI/Renderer/Window3DPicker.cxx
++++ b/GUI/Renderer/Window3DPicker.cxx
+@@ -114,6 +114,5 @@
    m_Model = NULL;
  }
  
 -vtkCxxRevisionMacro(Window3DPicker, "$Revision: 1.1 $")
  vtkStandardNewMacro(Window3DPicker)
  
-Index: itksnap-3.4.0/GUI/Renderer/Window3DPicker.h
-===================================================================
---- itksnap-3.4.0.orig/GUI/Renderer/Window3DPicker.h
-+++ itksnap-3.4.0/GUI/Renderer/Window3DPicker.h
-@@ -11,7 +11,7 @@ class Window3DPicker : public vtkPicker
+--- a/GUI/Renderer/Window3DPicker.h
++++ b/GUI/Renderer/Window3DPicker.h
+@@ -11,7 +11,7 @@
  public:
    static Window3DPicker *New();
  
@@ -88,11 +80,9 @@ Index: itksnap-3.4.0/GUI/Renderer/Window3DPicker.h
  
    irisGetSetMacro(Model, Generic3DModel *)
  
-Index: itksnap-3.4.0/Logic/LevelSet/SnakeParametersPreviewPipeline.cxx
-===================================================================
---- itksnap-3.4.0.orig/Logic/LevelSet/SnakeParametersPreviewPipeline.cxx
-+++ itksnap-3.4.0/Logic/LevelSet/SnakeParametersPreviewPipeline.cxx
-@@ -221,9 +221,9 @@ public:
+--- a/Logic/LevelSet/SnakeParametersPreviewPipeline.cxx
++++ b/Logic/LevelSet/SnakeParametersPreviewPipeline.cxx
+@@ -221,9 +221,9 @@
        m_CurrentCurve.reserve(pd->GetNumberOfCells() * 2);
        for(int i=0;i<pd->GetNumberOfCells();i++)
          {
@@ -104,3 +94,13 @@ Index: itksnap-3.4.0/Logic/LevelSet/SnakeParametersPreviewPipeline.cxx
          m_CurrentCurve.push_back(Vector2d(pt2[0] + 0.5,pt2[1] + 0.5));
          }
        }
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -886,7 +886,6 @@
+   vtkRenderingCore
+   vtkRenderingFreeType
+   vtkRenderingFreeTypeFontConfig
+-  vtkRenderingFreeTypeOpenGL
+   vtkRenderingOpenGL
+   vtkRenderingMatplotlib
+   vtkRenderingVolume

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/itksnap.git