.gitlab/ci/configure_fedora39_java.cmake

@@ -12,4 +12,3 @@ set(VTK_MODULE_ENABLE_VTK_IOFides NO CACHE STRING "")
 
 set(JOGL_GLUE "$ENV{HOME}/.m2/repository/org/jogamp/gluegen/gluegen-rt/2.3.2/gluegen-rt-2.3.2.jar" CACHE FILEPATH "")
 set(JOGL_LIB  "$ENV{HOME}/.m2/repository/org/jogamp/jogl/jogl-all/2.3.2/jogl-all-2.3.2.jar" CACHE FILEPATH "")
-set(CMAKE_INSTALL_JNILIBDIR "lib64" CACHE STRING "" FORCE)

.gitlab/ci/configure_options.cmake

@@ -48,7 +48,6 @@ configuration_flag(VTK_JAVA_INSTALL "java")
 
 if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "java")
   set(BUILD_TESTING OFF CACHE BOOL "" FORCE)
-  set(CMAKE_INSTALL_JNILIBDIR "" CACHE STRING "")
   set(JOGL_VERSION "2.3.2" CACHE STRING "")
   # Naming is <arch-platform> since some maven versions fail to properly parse
   # the artifact name when numbers are trailing in the classifer name.

.gitlab/ci/ctest_exclusions.cmake

@@ -356,6 +356,15 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "macos_arm64")
     "^VTK::RenderingAnnotationCxx-TestCubeAxesWithYLines$")
 endif ()
 
+if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "macos")
+  list(APPEND test_exclusions
+    # geometry shader issues (observed on M4 hardware)
+    # https://gitlab.kitware.com/vtk/vtk/-/issues/19555
+    "^VTK::IOIOSSCxx-TestIOSSApplyDisplacementsCGNS$"
+    "^VTK::IOADIOS2Cxx-TestADIOS2BPReaderSingleTimeStep$"
+    "^VTK::CommonDataModelPython-TestClipPolyhedra$")
+endif ()
+
 if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "wheel_macos" AND
     "$ENV{CMAKE_CONFIGURATION}" MATCHES "arm64")
   list(APPEND test_exclusions
@@ -575,7 +584,7 @@ endif ()
 
 if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "^wasm64")
   list (APPEND test_exclusions
-    # WebGPU tests on wasm64 fail 
+    # WebGPU tests on wasm64 fail
     "^VTK::RenderingWebGPUCxx-TestActorFaceCullingProperty"
     "^VTK::RenderingWebGPUCxx-TestCellScalarMappedColors"
     "^VTK::RenderingWebGPUCxx-TestComputeDoublePipelineRenderBuffer"

.gitlab/os-macos.yml

@@ -7,7 +7,7 @@
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/vtk-ci-ext/$CI_CONCURRENT_ID"
         # TODO: Factor this out so that each job selects the Xcode version to
         # use so that different versions can be tested in a single pipeline.
-        DEVELOPER_DIR: "/Applications/Xcode-15.4.app/Contents/Developer"
+        DEVELOPER_DIR: "/Applications/Xcode-16.1.app/Contents/Developer"
 
 .wheel_macos_arm64:
     extends: .macos
@@ -166,7 +166,7 @@
         - vtk
         - macos-x86_64
         - shell
-        - xcode-15.4
+        - xcode-16.1
         - nonconcurrent
 
 .macos_x86_64_wheel_builder_tags:
@@ -174,7 +174,7 @@
         - vtk
         - macos-x86_64
         - shell
-        - xcode-15.4
+        - xcode-16.1
         - concurrent
 
 .macos_x86_64_ext_builder_tags:
@@ -182,7 +182,7 @@
         - vtk
         - macos-x86_64
         - shell
-        - xcode-15.4
+        - xcode-16.1
         - concurrent
 
 .macos_arm64_builder_tags:
@@ -190,7 +190,7 @@
         - vtk
         - macos-arm64
         - shell
-        - xcode-15.4
+        - xcode-16.1
         - nonconcurrent
 
 .macos_arm64_wheel_builder_tags:
@@ -198,7 +198,7 @@
         - vtk
         - macos-arm64
         - shell
-        - xcode-15.4
+        - xcode-16.1
         - concurrent
 
 ## macOS-specific scripts

Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h

@@ -143,62 +143,6 @@ vtkm::cont::UnknownArrayHandle vtkDataArrayToUnknownArrayHandle(DataArrayType* i
   return vtkDataArrayToArrayHandle(input);
 }
 
-template <typename DataArrayType, vtkm::IdComponent NumComponents>
-struct DataArrayToArrayHandle;
-
-template <typename T, vtkm::IdComponent NumComponents>
-struct DataArrayToArrayHandle<vtkAOSDataArrayTemplate<T>, NumComponents>
-{
-  using ValueType =
-    typename std::conditional<NumComponents == 1, T, vtkm::Vec<T, NumComponents>>::type;
-  using StorageType = vtkm::cont::internal::Storage<ValueType, vtkm::cont::StorageTagBasic>;
-  using ArrayHandleType = vtkm::cont::ArrayHandle<ValueType, vtkm::cont::StorageTagBasic>;
-
-  VTK_DEPRECATED_IN_9_3_0("Use vtkDataArrayToArrayHandle or vtkAOSDataArrayToFlatArrayHandle.")
-  static ArrayHandleType Wrap(vtkAOSDataArrayTemplate<T>* input)
-  {
-    return vtkm::cont::make_ArrayHandle(reinterpret_cast<ValueType*>(input->GetPointer(0)),
-      input->GetNumberOfTuples(), vtkm::CopyFlag::Off);
-  }
-};
-
-template <typename T, vtkm::IdComponent NumComponents>
-struct DataArrayToArrayHandle<vtkSOADataArrayTemplate<T>, NumComponents>
-{
-  using ValueType = vtkm::Vec<T, NumComponents>;
-  using StorageType = vtkm::cont::internal::Storage<ValueType, vtkm::cont::StorageTagSOA>;
-  using ArrayHandleType = vtkm::cont::ArrayHandle<ValueType, vtkm::cont::StorageTagSOA>;
-
-  VTK_DEPRECATED_IN_9_3_0("Use vtkDataArrayToArrayHandle or vtkSOADataArrayToComponentArrayHandle.")
-  static ArrayHandleType Wrap(vtkSOADataArrayTemplate<T>* input)
-  {
-    vtkm::Id numValues = input->GetNumberOfTuples();
-    vtkm::cont::ArrayHandleSOA<ValueType> handle;
-    for (vtkm::IdComponent i = 0; i < NumComponents; ++i)
-    {
-      handle.SetArray(i,
-        vtkm::cont::make_ArrayHandle<T>(reinterpret_cast<T*>(input->GetComponentArrayPointer(i)),
-          numValues, vtkm::CopyFlag::Off));
-    }
-
-    return std::move(handle);
-  }
-};
-
-template <typename T>
-struct DataArrayToArrayHandle<vtkSOADataArrayTemplate<T>, 1>
-{
-  using StorageType = vtkm::cont::internal::Storage<T, vtkm::cont::StorageTagBasic>;
-  using ArrayHandleType = vtkm::cont::ArrayHandle<T, vtkm::cont::StorageTagBasic>;
-
-  VTK_DEPRECATED_IN_9_3_0("Use vtkDataArrayToArrayHandle or vtkSOADataArrayToComponentArrayHandle.")
-  static ArrayHandleType Wrap(vtkSOADataArrayTemplate<T>* input)
-  {
-    return vtkm::cont::make_ArrayHandle(
-      input->GetComponentArrayPointer(0), input->GetNumberOfTuples(), vtkm::CopyFlag::Off);
-  }
-};
-
 enum class FieldsFlag
 {
   None = 0x0,

Accelerators/Vtkm/Filters/vtkmClip.h

@@ -15,7 +15,6 @@
 #define vtkmClip_h
 
 #include "vtkAcceleratorsVTKmFiltersModule.h" // For export macro
-#include "vtkDeprecation.h"                   // For VTK_DEPRECATED_IN_9_3_0
 #include "vtkTableBasedClipDataSet.h"
 
 #include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m
@@ -32,16 +31,6 @@ public:
   vtkTypeMacro(vtkmClip, vtkTableBasedClipDataSet);
   void PrintSelf(ostream& os, vtkIndent indent) override;
 
-  /**
-   * The scalar value to use when clipping the dataset. Values greater than
-   * ClipValue are preserved in the output dataset. Default is 0.
-   */
-  VTK_DEPRECATED_IN_9_3_0("Please use GetValue instead.")
-  double GetClipValue() { return this->GetValue(); }
-
-  VTK_DEPRECATED_IN_9_3_0("Please use SetValue instead.")
-  void SetClipValue(double v) { this->SetValue(v); }
-
   /**
    * If true, all input point data arrays will be mapped onto the output
    * dataset. Default is true.

CMake/vtkVersion.cmake

@@ -6,7 +6,7 @@ set(VTK_MINOR_VERSION 4)
 # the date component is updated while it is in progress, the bump of the minor
 # version ends up conflicting with the patch version update.
 
-set(VTK_BUILD_VERSION 20241209)
+set(VTK_BUILD_VERSION 20241216)
 
 if (NOT VTK_MINOR_VERSION LESS 100)
   message(FATAL_ERROR

Charts/Core/vtkPlot.cxx

@@ -229,6 +229,12 @@ void vtkPlot::SetColor(unsigned char r, unsigned char g, unsigned char b, unsign
   this->Pen->SetColor(r, g, b, a);
 }
 
+//------------------------------------------------------------------------------
+void vtkPlot::SetColor(unsigned char r, unsigned char g, unsigned char b)
+{
+  this->Pen->SetColor(r, g, b);
+}
+
 //------------------------------------------------------------------------------
 void vtkPlot::SetColorF(double r, double g, double b, double a)
 {

Charts/Core/vtkPlot.h

@@ -18,7 +18,6 @@
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkContextItem.h"
 #include "vtkContextPolygon.h" // For vtkContextPolygon
-#include "vtkDeprecation.h"    // For VTK_DEPRECATED_IN_9_3_0
 #include "vtkRect.h"           // For vtkRectd ivar
 #include "vtkSmartPointer.h"   // Needed to hold SP ivars
 #include "vtkStdString.h"      // Needed to hold TooltipLabelFormat ivar
@@ -126,11 +125,14 @@ public:
    */
   virtual bool SelectPointsInPolygon(const vtkContextPolygon& polygon);
 
+  ///@{
   /**
    * Set the plot color with integer values (comprised between 0 and 255)
    */
   VTK_MARSHALSETTER(ColorRGBA)
   virtual void SetColor(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
+  virtual void SetColor(unsigned char r, unsigned char g, unsigned char b);
+  ///@}
 
   ///@{
   /**
@@ -140,20 +142,13 @@ public:
   virtual void SetColorF(double r, double g, double b, double a);
   VTK_MARSHALEXCLUDE(VTK_MARSHAL_EXCLUDE_REASON_IS_REDUNDANT)
   virtual void SetColorF(double r, double g, double b);
-
-  // If removed, please remplace it with the following function:
-  // SetColor(unsigned char r, unsigned char g, unsigned char b)
-  // here and in the inheriting classes overriding it
-  VTK_MARSHALEXCLUDE(VTK_MARSHAL_EXCLUDE_REASON_IS_REDUNDANT)
-  VTK_DEPRECATED_IN_9_3_0("Please use unambiguous SetColorF method instead.")
-  virtual void SetColor(double r, double g, double b) { this->SetColorF(r, g, b); }
   ///@}
 
   ///@{
   /**
    * Get the plot color as integer rgb values (comprised between 0 and 255)
    */
-  void GetColor(unsigned char rgb[3]);
+  virtual void GetColor(unsigned char rgb[3]);
   VTK_MARSHALGETTER(ColorRGBA)
   void GetColorRGBA(unsigned char rgba[4]);
   ///@}
@@ -164,11 +159,6 @@ public:
    */
   VTK_MARSHALEXCLUDE(VTK_MARSHAL_EXCLUDE_REASON_IS_REDUNDANT)
   virtual void GetColorF(double rgb[3]);
-
-  // If removed, please make GetColor(unsigned char rgb[3]) virtual
-  VTK_MARSHALEXCLUDE(VTK_MARSHAL_EXCLUDE_REASON_IS_REDUNDANT)
-  VTK_DEPRECATED_IN_9_3_0("Please use unambiguous GetColorF method instead.")
-  virtual void GetColor(double rgb[3]) { this->GetColorF(rgb); }
   ///@
 
   /**

Charts/Core/vtkPlotArea.cxx

@@ -637,6 +637,13 @@ void vtkPlotArea::SetColor(unsigned char r, unsigned char g, unsigned char b, un
   this->Superclass::SetColor(r, g, b, a);
 }
 
+//------------------------------------------------------------------------------
+void vtkPlotArea::SetColor(unsigned char r, unsigned char g, unsigned char b)
+{
+  this->Brush->SetColor(r, g, b);
+  this->Superclass::SetColor(r, g, b);
+}
+
 //------------------------------------------------------------------------------
 void vtkPlotArea::SetColorF(double r, double g, double b, double a)
 {

Charts/Core/vtkPlotArea.h

@@ -40,6 +40,7 @@ public:
    * Set the plot color with integer values (comprised between 0 and 255)
    */
   void SetColor(unsigned char r, unsigned char g, unsigned char b, unsigned char a) override;
+  void SetColor(unsigned char r, unsigned char g, unsigned char b) override;
 
   ///@{
   /**
@@ -47,9 +48,6 @@ public:
    */
   void SetColorF(double r, double g, double b, double a) override;
   void SetColorF(double r, double g, double b) override;
-
-  VTK_DEPRECATED_IN_9_3_0("Please use unambiguous SetColorF method instead.")
-  void SetColor(double r, double g, double b) override { this->SetColorF(r, g, b); }
   ///@}
 
   ///@{

Charts/Core/vtkPlotBar.cxx

@@ -700,6 +700,12 @@ void vtkPlotBar::SetColor(unsigned char r, unsigned char g, unsigned char b, uns
   this->Brush->SetColor(r, g, b, a);
 }
 
+//------------------------------------------------------------------------------
+void vtkPlotBar::SetColor(unsigned char r, unsigned char g, unsigned char b)
+{
+  this->Brush->SetColor(r, g, b);
+}
+
 //------------------------------------------------------------------------------
 void vtkPlotBar::SetColorF(double r, double g, double b, double a)
 {

Charts/Core/vtkPlotBar.h

@@ -66,6 +66,7 @@ public:
    * Set the plot color with integer values (comprised between 0 and 255)
    */
   void SetColor(unsigned char r, unsigned char g, unsigned char b, unsigned char a) override;
+  void SetColor(unsigned char r, unsigned char g, unsigned char b) override;
 
   ///@{
   /**
@@ -73,9 +74,6 @@ public:
    */
   void SetColorF(double r, double g, double b, double a) override;
   void SetColorF(double r, double g, double b) override;
-
-  VTK_DEPRECATED_IN_9_3_0("Please use unambiguous SetColorF method instead.")
-  void SetColor(double r, double g, double b) override { this->SetColorF(r, g, b); }
   ///@}
 
   ///@{
@@ -83,9 +81,6 @@ public:
    * Get the plot color as floating rgb values (comprised between 0.0 and 1.0)
    */
   void GetColorF(double rgb[3]) override;
-
-  VTK_DEPRECATED_IN_9_3_0("Please use unambiguous GetColorF method instead.")
-  void GetColor(double rgb[3]) override { this->GetColorF(rgb); }
   ///@}
 
   ///@{

Charts/Core/vtkPlotStacked.cxx

@@ -561,6 +561,12 @@ void vtkPlotStacked::SetColor(unsigned char r, unsigned char g, unsigned char b,
   this->Brush->SetColor(r, g, b, a);
 }
 
+//------------------------------------------------------------------------------
+void vtkPlotStacked::SetColor(unsigned char r, unsigned char g, unsigned char b)
+{
+  this->Brush->SetColor(r, g, b);
+}
+
 //------------------------------------------------------------------------------
 void vtkPlotStacked::SetColorF(double r, double g, double b, double a)
 {

Charts/Core/vtkPlotStacked.h

@@ -43,6 +43,7 @@ public:
    * Set the plot color with integer values (comprised between 0 and 255)
    */
   void SetColor(unsigned char r, unsigned char g, unsigned char b, unsigned char a) override;
+  void SetColor(unsigned char r, unsigned char g, unsigned char b) override;
 
   ///@{
   /**
@@ -50,9 +51,6 @@ public:
    */
   void SetColorF(double r, double g, double b, double a) override;
   void SetColorF(double r, double g, double b) override;
-
-  VTK_DEPRECATED_IN_9_3_0("Please use unambiguous SetColorF method instead.")
-  void SetColor(double r, double g, double b) override { this->SetColorF(r, g, b); }
   ///@}
 
   ///@{
@@ -60,9 +58,6 @@ public:
    * Get the plot color as floating rgb values (comprised between 0.0 and 1.0)
    */
   void GetColorF(double rgb[3]) override;
-
-  VTK_DEPRECATED_IN_9_3_0("Please use unambiguous GetColorF method instead.")
-  void GetColor(double rgb[3]) override { this->GetColorF(rgb); }
   ///@}
 
   /**

Common/Core/vtkAbstractArray.cxx

@@ -945,7 +945,7 @@ nlohmann::json vtkAbstractArray::SerializeValues()
   {
     for (vtkIdType ii = 0; ii < this->GetNumberOfValues(); ++ii)
     {
-      result.push_back(this->GetVariantValue(ii).ToString());
+      result.push_back(static_cast<std::string>(this->GetVariantValue(ii).ToString()));
     }
   }
   return result;

Common/Core/vtkDeprecation.h

@@ -102,6 +102,15 @@
 
 // APIs deprecated in the next release.
 #if defined(__VTK_WRAP__)
+#define VTK_DEPRECATED_IN_9_5_0(reason) [[vtk::deprecated(reason, "9.5.0")]]
+#elif VTK_DEPRECATION_LEVEL >= VTK_VERSION_CHECK(9, 4, 20241008)
+#define VTK_DEPRECATED_IN_9_5_0(reason) VTK_DEPRECATION(reason)
+#else
+#define VTK_DEPRECATED_IN_9_5_0(reason)
+#endif
+
+// APIs deprecated in 9.4.0.
+#if defined(__VTK_WRAP__)
 #define VTK_DEPRECATED_IN_9_4_0(reason) [[vtk::deprecated(reason, "9.4.0")]]
 #elif VTK_DEPRECATION_LEVEL >= VTK_VERSION_CHECK(9, 3, 20230807)
 #define VTK_DEPRECATED_IN_9_4_0(reason) VTK_DEPRECATION(reason)
@@ -109,16 +118,13 @@
 #define VTK_DEPRECATED_IN_9_4_0(reason)
 #endif
 
-// APIs deprecated in 9.3.0.
+// APIs deprecated in the older release always warn.
 #if defined(__VTK_WRAP__)
 #define VTK_DEPRECATED_IN_9_3_0(reason) [[vtk::deprecated(reason, "9.3.0")]]
-#elif VTK_DEPRECATION_LEVEL >= VTK_VERSION_CHECK(9, 2, 20220617)
-#define VTK_DEPRECATED_IN_9_3_0(reason) VTK_DEPRECATION(reason)
 #else
-#define VTK_DEPRECATED_IN_9_3_0(reason)
+#define VTK_DEPRECATED_IN_9_3_0(reason) VTK_DEPRECATION(reason)
 #endif
 
-// APIs deprecated in the older release always warn.
 #if defined(__VTK_WRAP__)
 #define VTK_DEPRECATED_IN_9_2_0(reason) [[vtk::deprecated(reason, "9.2.0")]]
 #else

Common/Core/vtkNumberToString.h

@@ -47,7 +47,6 @@
 #define vtkNumberToString_h
 
 #include "vtkCommonCoreModule.h" // For export macro
-#include "vtkDeprecation.h"      // For VTK_DEPRECATED_IN_9_3_0
 #include "vtkTypeTraits.h"
 
 #include <ostream>
@@ -157,10 +156,6 @@ public:
   {
     return val;
   }
-  VTK_DEPRECATED_IN_9_3_0("Use vtkNumberToString::Convert instead.")
-  TagDouble operator()(const double& val) const { return TagDouble(val); }
-  VTK_DEPRECATED_IN_9_3_0("Use vtkNumberToString::Convert instead.")
-  TagFloat operator()(const float& val) const { return TagFloat(val); }
 
 private:
   int LowExponent = -6;

Common/Core/vtkOutputWindow.h

@@ -15,22 +15,9 @@
 
 #include "vtkCommonCoreModule.h"  // For export macro
 #include "vtkDebugLeaksManager.h" // Must be included before singletons
-#include "vtkDeprecation.h"       // For `VTK_DEPRECATED_IN_9_3_0`
 #include "vtkObject.h"
 
 VTK_ABI_NAMESPACE_BEGIN
-class VTK_DEPRECATED_IN_9_3_0(
-  "`vtkOutputWindowCleanup` is no longer necessary") VTKCOMMONCORE_EXPORT vtkOutputWindowCleanup
-{
-public:
-  vtkOutputWindowCleanup() = default;
-  ~vtkOutputWindowCleanup() = default;
-
-private:
-  vtkOutputWindowCleanup(const vtkOutputWindowCleanup& other) = delete;
-  vtkOutputWindowCleanup& operator=(const vtkOutputWindowCleanup& rhs) = delete;
-};
-
 class vtkOutputWindowPrivateAccessor;
 class VTKCOMMONCORE_EXPORT vtkOutputWindow : public vtkObject
 {

Common/Core/vtkStdString.h

@@ -13,7 +13,6 @@
 #define vtkStdString_h
 
 #include "vtkCommonCoreModule.h" // For export macro
-#include "vtkDeprecation.h"      // For VTK_DEPRECATED_IN_9_3_0
 #include "vtkSystemIncludes.h"   // For VTKCOMMONCORE_EXPORT.
 #include <string>                // For the superclass.
 #include <utility>               // For std::move
@@ -58,9 +57,6 @@ public:
     : std::string(s, pos, n)
   {
   }
-
-  VTK_DEPRECATED_IN_9_3_0("Call `.c_str()` explicitly")
-  operator const char*() { return this->c_str(); }
 };
 
 VTK_ABI_NAMESPACE_END