[med-svn] [Git][med-team/camitk][master] 2 commits: Fix compilation against VTK_9.3. (Closes: #1073793)

[Anton Gladky (@gladk)]

Anton Gladky pushed to branch master at Debian Med / camitk


Commits:
dd49d2bf by Gianfranco Costamagna at 2024-06-21T17:27:57+02:00
Fix compilation against VTK_9.3. (Closes: #1073793)

- - - - -
5eb9afe4 by Anton Gladky at 2024-06-21T17:28:19+02:00
Update changelog.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/0210-vtk-9.3.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+camitk (5.2.0-2) unstable; urgency=medium
+
+  [ Gianfranco Costamagna ]
+  * Team upload.
+  * [dd49d2b] Fix compilation against VTK_9.3. (Closes: #1073793)
+
+ -- Anton Gladky <gladk at debian.org>  Fri, 21 Jun 2024 17:28:07 +0200
+
 camitk (5.2.0-1) unstable; urgency=medium
 
   * New upstream version 5.2.0


=====================================
debian/patches/0210-vtk-9.3.patch
=====================================
@@ -0,0 +1,63 @@
+Description: Followup with deprecated vtkConfigure.h header, renaming of SetQuadQualityMeasureToMaxEdgeRatios into SetQuadQualityMeasureToMaxEdgeRatio and removal of SetTetQualityMeasureToAspectBeta
+Author: Gianfranco Costamagna <locutusofborg at debian.org>
+Last-Update: 2024-06-20
+
+Index: camitk/sdk/components/vtkimage/RawDataDialog.cpp
+===================================================================
+--- camitk.orig/sdk/components/vtkimage/RawDataDialog.cpp
++++ camitk/sdk/components/vtkimage/RawDataDialog.cpp
+@@ -33,8 +33,10 @@
+ #include <QMetaEnum>
+ 
+ // -- VTK includes
++#include <vtkVersion.h>
++#ifndef VTK_MAJOR_VERSION
+ #include <vtkConfigure.h>
+-
++#endif
+ 
+ //--------------- Constructor ---------------------------------
+ RawDataDialog::RawDataDialog(QString filename)
+Index: camitk/sdk/actions/mesh/basicmesh/MeshQuality.cpp
+===================================================================
+--- camitk.orig/sdk/actions/mesh/basicmesh/MeshQuality.cpp
++++ camitk/sdk/actions/mesh/basicmesh/MeshQuality.cpp
+@@ -549,7 +549,7 @@ vtkSmartPointer< vtkDoubleArray > MeshQu
+             maxNR = VTK_DOUBLE_MAX;
+             break;
+         case 6:
+-            qualityFilter->SetHexQualityMeasureToMaxEdgeRatios();
++            qualityFilter->SetHexQualityMeasureToMaxEdgeRatio();
+             minAR = 1;
+             maxAR = 1.3;
+             minNR = 1;
+@@ -709,7 +709,7 @@ vtkSmartPointer< vtkDoubleArray > MeshQu
+             maxNR = VTK_DOUBLE_MAX;
+             break;
+         case 8:
+-            qualityFilter->SetQuadQualityMeasureToMaxEdgeRatios();
++            qualityFilter->SetQuadQualityMeasureToMaxEdgeRatio();
+             minAR = 1;
+             maxAR = 1.3;
+             minNR = 1;
+@@ -827,13 +827,13 @@ vtkSmartPointer< vtkDoubleArray > MeshQu
+     qualityFilter->SetInputConnection(meshComponent->getDataPort());
+     qualityFilter->SetHexQualityMeasureToDistortion();
+     switch (qualityTest) {
+-        case 0:
+-            qualityFilter->SetTetQualityMeasureToAspectBeta();
+-            minAR = 0.1;
+-            maxAR = VTK_DOUBLE_MAX;
+-            minNR = 0;
+-            maxNR = VTK_DOUBLE_MAX;
+-            break;
++        //case 0:
++        //    qualityFilter->SetTetQualityMeasureToAspectBeta();
++        //    minAR = 0.1;
++        //    maxAR = VTK_DOUBLE_MAX;
++        //    minNR = 0;
++        //    maxNR = VTK_DOUBLE_MAX;
++        //    break;
+         case 1:
+             qualityFilter->SetTetQualityMeasureToAspectFrobenius();
+             minAR = 1;


=====================================
debian/patches/series
=====================================
@@ -11,3 +11,4 @@
 #0200-vtk9-compatibility.patch
 #1111-camitk-version-do-not-commit-nor-push
 #1112-cmake-version-do-no-commit-nor-push
+0210-vtk-9.3.patch



View it on GitLab: https://salsa.debian.org/med-team/camitk/-/compare/e65005828e680877ef073540f6e187fa50fe1b4b...5eb9afe4bb03642a0ae42f6ff5f46b41e6f01ba8

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/med-team/camitk/-/compare/e65005828e680877ef073540f6e187fa50fe1b4b...5eb9afe4bb03642a0ae42f6ff5f46b41e6f01ba8
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/20240621/20d45908/attachment-0001.htm>