[med-svn] [Git][med-team/fw4spl][master] Update patches

[Flavien Bridault]

Flavien Bridault pushed to branch master at Debian Med / fw4spl


Commits:
f53514b6 by Flavien Bridault at 2018-10-30T10:46:20Z
Update patches

- - - - -


2 changed files:

- debian/patches/fix_vtk6_build.patch
- debian/patches/series


Changes:

=====================================
debian/patches/fix_vtk6_build.patch
=====================================
@@ -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
=====================================
@@ -1,5 +1,3 @@
 fix_unit_tests.patch
-remove_vxl_from_fwItkIO.patch
-fix_glm_experimental.patch
 fix_vtk6_build.patch
 revert_qVTK_widget.patch



View it on GitLab: https://salsa.debian.org/med-team/fw4spl/commit/f53514b696f66a9846c83e0e0f472332325b1c5a

-- 
View it on GitLab: https://salsa.debian.org/med-team/fw4spl/commit/f53514b696f66a9846c83e0e0f472332325b1c5a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181030/f883a13e/attachment-0001.html>