Fix typo

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

.gitignore

@@ -17,3 +17,17 @@ vtk-5.6.0.tar.gz
 /VTKData-8.1.1.tar.gz
 /VTK-8.2.0.tar.gz
 /VTKData-8.2.0.tar.gz
+/VTK-9.0.0.tar.gz
+/VTKData-9.0.0.tar.gz
+/VTK-9.0.1.tar.gz
+/VTKData-9.0.1.tar.gz
+/VTK-9.0.2.tar.gz
+/VTKData-9.0.2.tar.gz
+/VTK-9.0.3.tar.gz
+/VTKData-9.0.3.tar.gz
+/VTK-9.1.0.tar.gz
+/VTKData-9.1.0.tar.gz
+/VTK-9.2.5.tar.gz
+/VTKData-9.2.5.tar.gz
+/VTK-9.2.6.tar.gz
+/VTKData-9.2.6.tar.gz

5883.patch

@@ -1,176 +0,0 @@
-From 257b9d7b18d5f3db3fe099dc18f230e23f7dfbab Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Tue, 20 Aug 2019 17:02:24 -0600
-Subject: [PATCH] Compatibility for Python 3.8
-
-The PyTypeObject struct was modified in Python 3.8, this change is
-required to avoid compile errors.
----
- .../PythonInterpreter/vtkPythonStdStreamCaptureHelper.h   | 6 ++++++
- Wrapping/PythonCore/PyVTKMethodDescriptor.cxx             | 2 +-
- Wrapping/PythonCore/PyVTKNamespace.cxx                    | 2 +-
- Wrapping/PythonCore/PyVTKReference.cxx                    | 8 ++++----
- Wrapping/PythonCore/PyVTKTemplate.cxx                     | 2 +-
- Wrapping/PythonCore/vtkPythonCompatibility.h              | 8 +++++++-
- Wrapping/Tools/vtkWrapPythonClass.c                       | 2 +-
- Wrapping/Tools/vtkWrapPythonEnum.c                        | 2 +-
- Wrapping/Tools/vtkWrapPythonType.c                        | 2 +-
- 9 files changed, 23 insertions(+), 11 deletions(-)
-
-diff --git a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
-index b1c12c83de..14ccfbe928 100644
---- a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
-+++ b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
-@@ -140,6 +140,12 @@ static PyTypeObject vtkPythonStdStreamCaptureHelperType = {
- #if PY_VERSION_HEX >= 0x03040000
-   0, // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+  0, // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+  0, // tp_print
-+#endif
-+#endif
- };
- 
- static PyObject* vtkWrite(PyObject* self, PyObject* args)
-diff --git a/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx b/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
-index 2b0d443537..3840038498 100644
---- a/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
-+++ b/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
-@@ -186,7 +186,7 @@ PyTypeObject PyVTKMethodDescriptor_Type = {
-   sizeof(PyMethodDescrObject),           // tp_basicsize
-   0,                                     // tp_itemsize
-   PyVTKMethodDescriptor_Delete,          // tp_dealloc
--  nullptr,                               // tp_print
-+  0,                                     // tp_vectorcall_offset
-   nullptr,                               // tp_getattr
-   nullptr,                               // tp_setattr
-   nullptr,                               // tp_compare
-diff --git a/Wrapping/PythonCore/PyVTKNamespace.cxx b/Wrapping/PythonCore/PyVTKNamespace.cxx
-index 71ee2a3516..5cf5bfbe6b 100644
---- a/Wrapping/PythonCore/PyVTKNamespace.cxx
-+++ b/Wrapping/PythonCore/PyVTKNamespace.cxx
-@@ -49,7 +49,7 @@ PyTypeObject PyVTKNamespace_Type = {
-   0,                                     // tp_basicsize
-   0,                                     // tp_itemsize
-   PyVTKNamespace_Delete,                 // tp_dealloc
--  nullptr,                               // tp_print
-+  0,                                     // tp_vectorcall_offset
-   nullptr,                               // tp_getattr
-   nullptr,                               // tp_setattr
-   nullptr,                               // tp_compare
-diff --git a/Wrapping/PythonCore/PyVTKReference.cxx b/Wrapping/PythonCore/PyVTKReference.cxx
-index 943ac71080..b7104091c0 100644
---- a/Wrapping/PythonCore/PyVTKReference.cxx
-+++ b/Wrapping/PythonCore/PyVTKReference.cxx
-@@ -1010,7 +1010,7 @@ PyTypeObject PyVTKReference_Type = {
-   sizeof(PyVTKReference),                // tp_basicsize
-   0,                                     // tp_itemsize
-   PyVTKReference_Delete,                 // tp_dealloc
--  nullptr,                               // tp_print
-+  0,                                     // tp_vectorcall_offset
-   nullptr,                               // tp_getattr
-   nullptr,                               // tp_setattr
-   nullptr,                               // tp_compare
-@@ -1067,7 +1067,7 @@ PyTypeObject PyVTKNumberReference_Type = {
-   sizeof(PyVTKReference),                // tp_basicsize
-   0,                                     // tp_itemsize
-   PyVTKReference_Delete,                 // tp_dealloc
--  nullptr,                               // tp_print
-+  0,                                     // tp_vectorcall_offset
-   nullptr,                               // tp_getattr
-   nullptr,                               // tp_setattr
-   nullptr,                               // tp_compare
-@@ -1124,7 +1124,7 @@ PyTypeObject PyVTKStringReference_Type = {
-   sizeof(PyVTKReference),                // tp_basicsize
-   0,                                     // tp_itemsize
-   PyVTKReference_Delete,                 // tp_dealloc
--  nullptr,                               // tp_print
-+  0,                                     // tp_vectorcall_offset
-   nullptr,                               // tp_getattr
-   nullptr,                               // tp_setattr
-   nullptr,                               // tp_compare
-@@ -1181,7 +1181,7 @@ PyTypeObject PyVTKTupleReference_Type = {
-   sizeof(PyVTKReference),                // tp_basicsize
-   0,                                     // tp_itemsize
-   PyVTKReference_Delete,                 // tp_dealloc
--  nullptr,                               // tp_print
-+  0,                                     // tp_vectorcall_offset
-   nullptr,                               // tp_getattr
-   nullptr,                               // tp_setattr
-   nullptr,                               // tp_compare
-diff --git a/Wrapping/PythonCore/PyVTKTemplate.cxx b/Wrapping/PythonCore/PyVTKTemplate.cxx
-index be200985b3..340fe7953b 100644
---- a/Wrapping/PythonCore/PyVTKTemplate.cxx
-+++ b/Wrapping/PythonCore/PyVTKTemplate.cxx
-@@ -268,7 +268,7 @@ PyTypeObject PyVTKTemplate_Type = {
-   0,                                     // tp_basicsize
-   0,                                     // tp_itemsize
-   nullptr,                               // tp_dealloc
--  nullptr,                               // tp_print
-+  0,                                     // tp_vectorcall_offset
-   nullptr,                               // tp_getattr
-   nullptr,                               // tp_setattr
-   nullptr,                               // tp_compare
-diff --git a/Wrapping/PythonCore/vtkPythonCompatibility.h b/Wrapping/PythonCore/vtkPythonCompatibility.h
-index 4a767844a6..be208faeef 100644
---- a/Wrapping/PythonCore/vtkPythonCompatibility.h
-+++ b/Wrapping/PythonCore/vtkPythonCompatibility.h
-@@ -64,7 +64,13 @@
- #endif
- 
- // PyTypeObject compatibility
--#if PY_VERSION_HEX >= 0x03040000
-+#if PY_VERSION_HEX >= 0x03090000
-+#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
-+  0, 0, 0, 0,
-+#elif PY_VERSION_HEX >= 0x03080000
-+#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
-+  0, 0, 0, 0, 0,
-+#elif PY_VERSION_HEX >= 0x03040000
- #define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
-   0, 0, 0,
- #else
-diff --git a/Wrapping/Tools/vtkWrapPythonClass.c b/Wrapping/Tools/vtkWrapPythonClass.c
-index b1e45f8e80..4d558ea081 100644
---- a/Wrapping/Tools/vtkWrapPythonClass.c
-+++ b/Wrapping/Tools/vtkWrapPythonClass.c
-@@ -521,7 +521,7 @@ void vtkWrapPython_GenerateObjectType(
-     "  sizeof(PyVTKObject), // tp_basicsize\n"
-     "  0, // tp_itemsize\n"
-     "  PyVTKObject_Delete, // tp_dealloc\n"
--    "  nullptr, // tp_print\n"
-+    "  0, // tp_vectorcall_offset\n"
-     "  nullptr, // tp_getattr\n"
-     "  nullptr, // tp_setattr\n"
-     "  nullptr, // tp_compare\n"
-diff --git a/Wrapping/Tools/vtkWrapPythonEnum.c b/Wrapping/Tools/vtkWrapPythonEnum.c
-index b933702242..1249362854 100644
---- a/Wrapping/Tools/vtkWrapPythonEnum.c
-+++ b/Wrapping/Tools/vtkWrapPythonEnum.c
-@@ -145,7 +145,7 @@ void vtkWrapPython_GenerateEnumType(
-     "  sizeof(PyIntObject), // tp_basicsize\n"
-     "  0, // tp_itemsize\n"
-     "  nullptr, // tp_dealloc\n"
--    "  nullptr, // tp_print\n"
-+    "  0, // tp_vectorcall_offset\n"
-     "  nullptr, // tp_getattr\n"
-     "  nullptr, // tp_setattr\n"
-     "  nullptr, // tp_compare\n"
-diff --git a/Wrapping/Tools/vtkWrapPythonType.c b/Wrapping/Tools/vtkWrapPythonType.c
-index 744cb1b9d3..0a1375e541 100644
---- a/Wrapping/Tools/vtkWrapPythonType.c
-+++ b/Wrapping/Tools/vtkWrapPythonType.c
-@@ -709,7 +709,7 @@ void vtkWrapPython_GenerateSpecialType(
-     "  sizeof(PyVTKSpecialObject), // tp_basicsize\n"
-     "  0, // tp_itemsize\n"
-     "  Py%s_Delete, // tp_dealloc\n"
--    "  nullptr, // tp_print\n"
-+    "  0, // tp_vectorcall_offset\n"
-     "  nullptr, // tp_getattr\n"
-     "  nullptr, // tp_setattr\n"
-     "  nullptr, // tp_compare\n"
--- 
-2.21.0
-

9616.patch

@@ -0,0 +1,79 @@
+From a2ca9a079ecc8926f6ddf7a72803340a4944e7cf Mon Sep 17 00:00:00 2001
+From: Eric Larson <larson.eric.d@gmail.com>
+Date: Tue, 11 Oct 2022 12:12:38 -0400
+Subject: [PATCH] BUG: Fix bug with vtkPlotBar.GetLookupTable()
+
+Also remove old nullptr assignments as they are unnecessary
+when using vtkSmartPointer.
+---
+ .../Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx   |  2 ++
+ Charts/Core/vtkPlotBar.cxx                             | 10 +++++++---
+ .../release/dev/fix-vtkPlotBar-GetLookupTable.md       |  4 ++++
+ 3 files changed, 13 insertions(+), 3 deletions(-)
+ create mode 100644 Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md
+
+diff --git a/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx b/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx
+index 2d0ed46b128..919319a6b4d 100644
+--- a/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx
++++ b/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx
+@@ -88,6 +88,8 @@ int TestPlotBarRangeHandlesItem(int, char*[])
+ 
+   // Add bar plot and handles
+   vtkPlotBar* barPlot = vtkPlotBar::SafeDownCast(chart->AddPlot(vtkChart::BAR));
++  // smoke test for https://gitlab.kitware.com/vtk/vtk/-/issues/18682#note_1258974
++  barPlot->GetLookupTable();
+   barPlot->SetInputData(table, "Months", "Books");
+   chart->SetBarWidthFraction(1.0);
+ 
+diff --git a/Charts/Core/vtkPlotBar.cxx b/Charts/Core/vtkPlotBar.cxx
+index a68a26c0ecd..220e8199d02 100644
+--- a/Charts/Core/vtkPlotBar.cxx
++++ b/Charts/Core/vtkPlotBar.cxx
+@@ -535,12 +535,11 @@ vtkStandardNewMacro(vtkPlotBar);
+ vtkPlotBar::vtkPlotBar()
+ {
+   this->Private = new vtkPlotBarPrivate(this);
++  // Points is not a vtkSmartPointer, so set it explicitly to nullptr
+   this->Points = nullptr;
+-  this->AutoLabels = nullptr;
+   this->Width = 1.0;
+   this->Pen->SetWidth(1.0);
+   this->Offset = 1.0;
+-  this->ColorSeries = nullptr;
+   this->Orientation = vtkPlotBar::VERTICAL;
+   this->ScalarVisibility = false;
+   this->EnableOpacityMapping = true;
+@@ -612,6 +611,10 @@ void vtkPlotBar::GetBounds(double bounds[4], bool unscaled)
+ 
+   // Get the x and y arrays (index 0 and 1 respectively)
+   vtkTable* table = this->Data->GetInput();
++  if (!table)
++  {
++    return;
++  }
+   vtkDataArray* x =
+     this->UseIndexForXSeries ? nullptr : this->Data->GetInputArrayToProcess(0, table);
+   vtkDataArray* y = this->Data->GetInputArrayToProcess(1, table);
+@@ -945,7 +948,8 @@ void vtkPlotBar::CreateDefaultLookupTable()
+   // rainbow - blue to red
+   lut->SetHueRange(0.6667, 0.0);
+   lut->Build();
+-  double bounds[4];
++  // set reasonable defaults in case no data has been set
++  double bounds[4] = { 0.0, 1.0, 0.0, 1.0 };
+   this->GetBounds(bounds);
+   lut->SetRange(bounds[0], bounds[1]);
+   this->LookupTable = lut;
+diff --git a/Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md b/Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md
+new file mode 100644
+index 00000000000..ba6a96753ac
+--- /dev/null
++++ b/Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md
+@@ -0,0 +1,4 @@
++## Fixes for vtkPlotBar.GetLookupTable
++
++Fixes a bug where calling vtkPlotBar.GetLookupTable caused a segmentation
++fault in the case where no data had been plotted yet.
+-- 
+GitLab
+

sources

@@ -1,2 +1,2 @@
-SHA512 (VTK-8.2.0.tar.gz) = 521bd4dabedbc24b0e80a314a34ecd7554b04af28a7973245e3a9cf99a09b995d1b8ac42305c8e53369f226a0a6da3cdb29105ba2c90b46492736ef717760286
-SHA512 (VTKData-8.2.0.tar.gz) = 517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b
+SHA512 (VTK-9.2.6.tar.gz) = f2328caae959d583299b7fd57205f3dd76f87c8c1ee78653e85d44cab085295bf7bf88b3f6a2b960a57df96ccb32049337ebccb067ecde6d84d25eda636196bc
+SHA512 (VTKData-9.2.6.tar.gz) = 5c5f2b365777733180a63daff224da7055e1c2911eb5e4efda26e38b9ac01cb8e886cf7e71c45ac83347642caf1786e72bb469c22954ffbbb6e2c317fc6b4080

vtk-gcc10.patch

@@ -1,32 +0,0 @@
-diff -up VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c.gcc10 VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c
---- VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c.gcc10	2019-01-30 10:15:13.000000000 -0700
-+++ VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c	2020-05-08 21:38:46.401363001 -0600
-@@ -614,5 +614,5 @@ int ex_create_par_int(const char *path,
-  * Prevent warning in some versions of ranlib(1) because the object
-  * file has no symbols.
-  */
--const char exodus_unused_symbol_dummy_1;
-+const char exodus_unused_symbol_dummy_ex_create_par;
- #endif
-diff -up VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c.gcc10 VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c
---- VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c.gcc10	2019-01-30 10:15:13.000000000 -0700
-+++ VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c	2020-05-08 21:38:46.402363007 -0600
-@@ -474,5 +474,5 @@ int ex_open_par_int(const char *path, in
-  * Prevent warning in some versions of ranlib(1) because the object
-  * file has no symbols.
-  */
--const char exodus_unused_symbol_dummy_1;
-+const char exodus_unused_symbol_dummy_ex_open_par;
- #endif
-diff -up VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake.gcc10 VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake
---- VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake.gcc10	2019-01-30 10:15:13.000000000 -0700
-+++ VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake	2020-05-26 21:07:24.625840251 -0600
-@@ -174,7 +174,7 @@ macro(_vtk_test_compiler_hidden_visibili
-     execute_process(COMMAND ${CMAKE_C_COMPILER} --version
-       OUTPUT_VARIABLE _gcc_version_info
-       ERROR_VARIABLE _gcc_version_info)
--    string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
-+    string(REGEX MATCH "[1-9][0-9]*\\.[0-9]+\\.[0-9]+"
-       _gcc_version "${_gcc_version_info}")
-     # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
-     # patch level, handle this here:

vtk-include.patch

@@ -0,0 +1,11 @@
+diff -up VTK-9.2.5/IO/Image/vtkSEPReader.h.include VTK-9.2.5/IO/Image/vtkSEPReader.h
+--- VTK-9.2.5/IO/Image/vtkSEPReader.h.include	2023-01-05 08:51:35.000000000 -0700
++++ VTK-9.2.5/IO/Image/vtkSEPReader.h	2023-01-17 07:43:41.988095734 -0700
+@@ -26,6 +26,7 @@
+ #include "vtkNew.h" // for ivars
+ 
+ #include <array>  // for std::array
++#include <cstdint> // for std::uint8_t
+ #include <string> // for std::string
+ 
+ namespace details

vtk-libharu.patch

@@ -0,0 +1,13 @@
+diff --git a/ThirdParty/libharu/CMakeLists.txt b/ThirdParty/libharu/CMakeLists.txt
+index b18b7a1..3793f4b 100644
+--- a/ThirdParty/libharu/CMakeLists.txt
++++ b/ThirdParty/libharu/CMakeLists.txt
+@@ -5,7 +5,7 @@ vtk_module_third_party(
+     STANDARD_INCLUDE_DIRS
+   EXTERNAL
+     PACKAGE LibHaru
+-    VERSION 2.4.0
++    VERSION 2.3.0
+     TARGETS LibHaru::LibHaru
+     STANDARD_INCLUDE_DIRS)
+ 

vtk-proj6_compat.patch

@@ -1,264 +0,0 @@
---- a/CMake/FindLibPROJ.cmake
-+++ b/CMake/FindLibPROJ.cmake
-@@ -30,7 +30,7 @@ if ( NOT LibPROJ_INCLUDE_DIR OR NOT LibP
-   )
- 
-   find_path( LibPROJ_INCLUDE_DIR
--    NAMES proj_api.h
-+    NAMES proj_api.h proj.h
-     HINTS
-       ${_LibPROJ_DIR}
-       ${_LibPROJ_DIR}/include
---- a/Geovis/Core/vtkGeoProjection.cxx
-+++ b/Geovis/Core/vtkGeoProjection.cxx
-@@ -72,6 +72,9 @@ public:
-   }
- 
-   std::map< std::string, std::string > OptionalParameters;
-+#if PROJ_VERSION_MAJOR >= 5
-+  PJ_PROJ_INFO ProjInfo;
-+#endif
- };
- 
- //-----------------------------------------------------------------------------
-@@ -80,7 +83,7 @@ int vtkGeoProjection::GetNumberOfProject
-   if ( vtkGeoProjectionNumProj < 0 )
-   {
-     vtkGeoProjectionNumProj = 0;
--    for ( const PJ_LIST* pj = pj_get_list_ref(); pj && pj->id; ++ pj )
-+    for ( const PJ_LIST* pj = proj_list_operations(); pj && pj->id; ++ pj )
-       ++ vtkGeoProjectionNumProj;
-   }
-   return vtkGeoProjectionNumProj;
-@@ -91,7 +94,7 @@ const char* vtkGeoProjection::GetProject
-   if ( projection < 0 || projection >= vtkGeoProjection::GetNumberOfProjections() )
-     return nullptr;
- 
--  return pj_get_list_ref()[projection].id;
-+  return proj_list_operations()[projection].id;
- }
- //-----------------------------------------------------------------------------
- const char* vtkGeoProjection::GetProjectionDescription( int projection )
-@@ -99,7 +102,7 @@ const char* vtkGeoProjection::GetProject
-   if ( projection < 0 || projection >= vtkGeoProjection::GetNumberOfProjections() )
-     return nullptr;
- 
--  return pj_get_list_ref()[projection].descr[0];
-+  return proj_list_operations()[projection].descr[0];
- }
- //-----------------------------------------------------------------------------
- vtkGeoProjection::vtkGeoProjection()
-@@ -144,7 +147,7 @@ void vtkGeoProjection::PrintSelf( ostrea
- int vtkGeoProjection::GetIndex()
- {
-   int i = 0;
--  for ( const PJ_LIST* proj = pj_get_list_ref(); proj && proj->id; ++ proj, ++ i )
-+  for ( const PJ_LIST* proj = proj_list_operations(); proj && proj->id; ++ proj, ++ i )
-   {
-     if ( ! strcmp( proj->id, this->Name ) )
-     {
-@@ -161,7 +164,11 @@ const char* vtkGeoProjection::GetDescrip
-   {
-     return nullptr;
-   }
-+#if PROJ_VERSION_MAJOR >= 5
-+  return this->Internals->ProjInfo.description;
-+#else
-   return this->Projection->descr;
-+#endif
- }
- //-----------------------------------------------------------------------------
- projPJ vtkGeoProjection::GetProjection()
-@@ -232,6 +239,9 @@ int vtkGeoProjection::UpdateProjection()
-   this->ProjectionMTime = this->GetMTime();
-   if ( this->Projection )
-   {
-+#if PROJ_VERSION_MAJOR >= 5
-+    this->Internals->ProjInfo = proj_pj_info(this->Projection);
-+#endif
-     return 0;
-   }
-   return 1;
---- a/Geovis/Core/vtkGeoTransform.cxx
-+++ b/Geovis/Core/vtkGeoTransform.cxx
-@@ -167,9 +167,17 @@ void vtkGeoTransform::InternalTransformP
-     double* coord = x;
-     for ( vtkIdType i = 0; i < numPts; ++ i )
-     {
-+#if PROJ_VERSION_MAJOR >= 5
-+      xy.x = coord[0]; xy.y = coord[1];
-+#else
-       xy.u = coord[0]; xy.v = coord[1];
-+#endif
-       lp = pj_inv( xy, src );
-+#if PROJ_VERSION_MAJOR >= 5
-+      coord[0] = lp.lam; coord[1] = lp.phi;
-+#else
-       coord[0] = lp.u; coord[1] = lp.v;
-+#endif
-       coord += stride;
-     }
-   }
-@@ -191,9 +199,17 @@ void vtkGeoTransform::InternalTransformP
-     double* coord = x;
-     for ( vtkIdType i = 0; i < numPts; ++ i )
-     {
-+#if PROJ_VERSION_MAJOR >= 5
-+      lp.lam = coord[0]; lp.phi = coord[1];
-+#else
-       lp.u = coord[0]; lp.v = coord[1];
-+#endif
-       xy = pj_fwd( lp, dst );
-+#if PROJ_VERSION_MAJOR >= 5
-+      coord[0] = xy.x; coord[1] = xy.y;
-+#else
-       coord[0] = xy.u; coord[1] = xy.v;
-+#endif
-       coord += stride;
-     }
-   }
---- a/ThirdParty/libproj/vtk_libproj.h.in
-+++ b/ThirdParty/libproj/vtk_libproj.h.in
-@@ -15,10 +15,20 @@
- #ifndef vtk_libproj_h
- #define vtk_libproj_h
- 
-+#define VTK_LibPROJ_MAJOR_VERSION @LibPROJ_MAJOR_VERSION@
-+
- /* Use the libproj library configured for VTK.  */
- #cmakedefine VTK_USE_SYSTEM_LIBPROJ
- #ifdef VTK_USE_SYSTEM_LIBPROJ
--# include <projects.h>
-+# if VTK_LibPROJ_MAJOR_VERSION >= 5
-+#  include <proj.h>
-+# endif
-+# if VTK_LibPROJ_MAJOR_VERSION < 6
-+#  include <projects.h>
-+# endif
-+# if VTK_LibPROJ_MAJOR_VERSION >= 6
-+#  define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1
-+# endif
- # include <proj_api.h>
- # include <geodesic.h>
- #else
---- VTK-8.2.0/CMake/FindLibPROJ.cmake	2019-09-11 22:13:29.493741215 -0600
-+++ vtk/CMake/FindLibPROJ.cmake	2019-09-11 19:56:57.465802610 -0600
-@@ -1,55 +1,67 @@
--# Find LibPROJ library and header file
--# Sets
--#   LibPROJ_FOUND       to 0 or 1 depending on the result
--#   LibPROJ_INCLUDE_DIR to directories required for using libproj4
--#   LibPROJ_LIBRARIES   to libproj4 and any dependent libraries
--# If LibPROJ_REQUIRED is defined, then a fatal error message will be generated if libproj4 is not found
--
--if ( NOT LibPROJ_INCLUDE_DIR OR NOT LibPROJ_LIBRARIES OR NOT LibPROJ_FOUND )
-+find_path(LibPROJ_INCLUDE_DIR
-+  NAMES proj_api.h proj.h
-+  DOC "libproj include directories")
-+mark_as_advanced(LibPROJ_INCLUDE_DIR)
- 
--  if ( $ENV{LibPROJ_DIR} )
--    file( TO_CMAKE_PATH "$ENV{LibPROJ_DIR}" _LibPROJ_DIR )
-+find_library(LibPROJ_LIBRARY_RELEASE
-+  NAMES proj
-+  DOC "libproj release library")
-+mark_as_advanced(LibPROJ_LIBRARY_RELEASE)
-+
-+find_library(LibPROJ_LIBRARY_DEBUG
-+  NAMES projd
-+  DOC "libproj debug library")
-+mark_as_advanced(LibPROJ_LIBRARY_DEBUG)
-+
-+include(SelectLibraryConfigurations)
-+select_library_configurations(LibPROJ)
-+
-+if (LibPROJ_INCLUDE_DIR)
-+  if (EXISTS "${LibPROJ_INCLUDE_DIR}/proj.h")
-+    file(STRINGS "${LibPROJ_INCLUDE_DIR}/proj.h" _libproj_version_lines REGEX "#define[ \t]+PROJ_VERSION_(MAJOR|MINOR|PATCH)")
-+    string(REGEX REPLACE ".*PROJ_VERSION_MAJOR *\([0-9]*\).*" "\\1" _libproj_version_major "${_libproj_version_lines}")
-+    string(REGEX REPLACE ".*PROJ_VERSION_MINOR *\([0-9]*\).*" "\\1" _libproj_version_minor "${_libproj_version_lines}")
-+    string(REGEX REPLACE ".*PROJ_VERSION_PATCH *\([0-9]*\).*" "\\1" _libproj_version_patch "${_libproj_version_lines}")
-+  else ()
-+    file(STRINGS "${LibPROJ_INCLUDE_DIR}/proj_api.h" _libproj_version_lines REGEX "#define[ \t]+PJ_VERSION")
-+    string(REGEX REPLACE ".*PJ_VERSION *\([0-9]*\).*" "\\1" _libproj_version "${_libproj_version_lines}")
-+    math(EXPR _libproj_version_major "${_libproj_version} / 100")
-+    math(EXPR _libproj_version_minor "(${_libproj_version} % 100) / 10")
-+    math(EXPR _libproj_version_patch "${_libproj_version} % 10")
-   endif ()
--
--  set(LibPROJ_LIBRARY_SEARCH_PATHS
--    ${_LibPROJ_DIR}
--    ${_LibPROJ_DIR}/lib64
--    ${_LibPROJ_DIR}/lib
--  )
--
--  find_library( LibPROJ_LIBRARY_RELEASE
--    NAMES proj
--    HINTS
--      ${LibPROJ_LIBRARY_SEARCH_PATHS}
--  )
--
--  find_library( LibPROJ_LIBRARY_DEBUG
--    NAMES projd
--    PATHS
--      ${LibPROJ_LIBRARY_SEARCH_PATHS}
--  )
--
--  find_path( LibPROJ_INCLUDE_DIR
--    NAMES proj_api.h proj.h
--    HINTS
--      ${_LibPROJ_DIR}
--      ${_LibPROJ_DIR}/include
--  )
--
--  include(SelectLibraryConfigurations)
--  select_library_configurations(LibPROJ)
--
--  include(FindPackageHandleStandardArgs)
--  find_package_handle_standard_args(LibPROJ
--                                    REQUIRED_VARS LibPROJ_LIBRARY LibPROJ_INCLUDE_DIR)
--
--  if(LibPROJ_FOUND)
--    set(LibPROJ_INCLUDE_DIRS ${LibPROJ_INCLUDE_DIR})
--
--    if(NOT LibPROJ_LIBRARIES)
--      set(LibPROJ_LIBRARIES ${LibPROJ_LIBRARY})
--    endif()
--  endif()
-+  set(LibPROJ_VERSION "${_libproj_version_major}.${_libproj_version_minor}.${_libproj_version_patch}")
-+  set(LibPROJ_MAJOR_VERSION "${_libproj_version_major}")
-+  unset(_libproj_version_major)
-+  unset(_libproj_version_minor)
-+  unset(_libproj_version_patch)
-+  unset(_libproj_version)
-+  unset(_libproj_version_lines)
- endif ()
- 
--mark_as_advanced(LibPROJ_INCLUDE_DIR)
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(LibPROJ
-+  REQUIRED_VARS LibPROJ_LIBRARY LibPROJ_INCLUDE_DIR
-+  VERSION_VAR LibPROJ_VERSION)
-+
-+if (LibPROJ_FOUND)
-+  set(LibPROJ_INCLUDE_DIRS "${LibPROJ_INCLUDE_DIR}")
-+  set(LibPROJ_LIBRARIES "${LibPROJ_LIBRARY}")
-+
-+  if (NOT TARGET LibPROJ::LibPROJ)
-+    add_library(LibPROJ::LibPROJ UNKNOWN IMPORTED)
-+    set_target_properties(LibPROJ::LibPROJ PROPERTIES
-+      INTERFACE_INCLUDE_DIRECTORIES "${LibPROJ_INCLUDE_DIR}")
-+    if (LibPROJ_LIBRARY_RELEASE)
-+      set_property(TARGET LibPROJ::LibPROJ APPEND PROPERTY
-+        IMPORTED_CONFIGURATIONS RELEASE)
-+      set_target_properties(LibPROJ::LibPROJ PROPERTIES
-+        IMPORTED_LOCATION_RELEASE "${LibPROJ_LIBRARY_RELEASE}")
-+    endif ()
-+    if (LibPROJ_LIBRARY_DEBUG)
-+      set_property(TARGET LibPROJ::LibPROJ APPEND PROPERTY
-+        IMPORTED_CONFIGURATIONS DEBUG)
-+      set_target_properties(LibPROJ::LibPROJ PROPERTIES
-+        IMPORTED_LOCATION_DEBUG "${LibPROJ_LIBRARY_DEBUG}")
-+    endif ()
-+  endif ()
-+endif ()