Commit f53514b6 authored by Flavien Bridault's avatar Flavien Bridault
Browse files

Update patches

parent 125cabe6

debian/patches/fix_vtk6_build.patch

+42 −21
Original line number Diff line number Diff line
@@ -99,27 +99,6 @@ Description: Backport of the code using VTK to be compatible with 6.3 
 

     /// Records the mouse position when selecting.

     int m_initMouseX;

--- fw4spl.orig/SrcLib/visu/fwRenderVTK/src/fwRenderVTK/vtk/fwVtkWheelRepresentation.cpp

+++ fw4spl/SrcLib/visu/fwRenderVTK/src/fwRenderVTK/vtk/fwVtkWheelRepresentation.cpp

@@ -10,15 +10,18 @@

 

 #include <glm/common.hpp>

 #include <glm/gtc/constants.hpp>

+#include <glm/gtc/vec1.hpp>

 

 #include <vtkCellArray.h>

 #include <vtkCellData.h>

 #include <vtkDoubleArray.h>

+#include <vtkObjectFactory.h>

 #include <vtkPolyData.h>

 #include <vtkPolyDataMapper2D.h>

 #include <vtkQuad.h>

 #include <vtkRenderer.h>

 #include <vtkRenderWindow.h>

+#include <vtkSmartPointer.h>

 

 #include <cmath>

 

--- fw4spl.orig/Bundles/visu/visuVTKVRAdaptor/src/visuVTKVRAdaptor/SVolume.cpp

+++ fw4spl/Bundles/visu/visuVTKVRAdaptor/src/visuVTKVRAdaptor/SVolume.cpp

@@ -448,12 +448,13 @@
@@ -150,3 +129,45 @@ Description: Backport of the code using VTK to be compatible with 6.3 
     }

     else if(m_blendMode == "additive")

     {

--- fw4spl.orig/SrcLib/visu/fwRenderVTK/src/fwRenderVTK/vtk/fwVtkWheelRepresentation.cpp

+++ fw4spl/SrcLib/visu/fwRenderVTK/src/fwRenderVTK/vtk/fwVtkWheelRepresentation.cpp

@@ -15,11 +15,13 @@

 #include <vtkCellArray.h>

 #include <vtkCellData.h>

 #include <vtkDoubleArray.h>

+#include <vtkObjectFactory.h>

 #include <vtkPolyData.h>

 #include <vtkPolyDataMapper2D.h>

 #include <vtkQuad.h>

 #include <vtkRenderer.h>

 #include <vtkRenderWindow.h>

+#include <vtkSmartPointer.h>

 

 #include <cmath>

 

--- fw4spl.orig/Bundles/visu/visuVTKAdaptor/src/visuVTKAdaptor/SMaterial.cpp

+++ fw4spl/Bundles/visu/visuVTKAdaptor/src/visuVTKAdaptor/SMaterial.cpp

@@ -148,7 +148,8 @@

             vtkRenderWindow* win = this->getRenderer()->GetRenderWindow();

 

             vtkSmartPointer<vtkTexture> vtkTex;

-            if(win->IsA("vtkOpenGLRenderWindow"))

+#if VTK_MAJOR_VERSION >= 7

+	    if(win->IsA("vtkOpenGLRenderWindow"))

             {

                 int dims[3];

                 vtkImage->GetDimensions(dims);

@@ -166,11 +167,12 @@

                 vtkTex = vtkGLTex;

             }

             else

+#else

             {

                 vtkTex = vtkSmartPointer< vtkTexture >::New();

                 vtkTex->SetInputData(vtkImage);

             }

-

+#endif

             ::fwData::Material::FilteringType filtering = material->getDiffuseTextureFiltering();

             ::fwData::Material::WrappingType wrapping   = material->getDiffuseTextureWrapping();

             vtkTex->SetRepeat( wrapping == ::fwData::Material::REPEAT );

debian/patches/series

+0 −2
Original line number Diff line number Diff line 
fix_unit_tests.patch

remove_vxl_from_fwItkIO.patch

fix_glm_experimental.patch

fix_vtk6_build.patch

revert_qVTK_widget.patch