Skip to content

Commit

Permalink
math/vtk9: fix build after d1e8146 (netcdf 4.9.0)
Browse files Browse the repository at this point in the history
NC_SZIP_NN is not #define'd in netcdf.h, so it cannot be the target
of an assignment anymore. Fortunately NC_SZIP_NN is now defined to
the same value (32) as it was set to by vtk9 before (and it was
declared const int before), so just hide the old const int if NC_SZIP_NN
is already defined.
No functional change, no bumps.
  • Loading branch information
moench-tegeder committed Jun 22, 2022
1 parent 3f82c85 commit 4eed113
Showing 1 changed file with 12 additions and 0 deletions.
@@ -0,0 +1,12 @@
--- ThirdParty/exodusII/vtkexodusII/src/ex_utils.c.orig 2022-06-22 15:58:58.543731000 +0200
+++ ThirdParty/exodusII/vtkexodusII/src/ex_utils.c 2022-06-22 16:00:28.263448000 +0200
@@ -1770,7 +1770,9 @@
*/

/* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */
+#if !defined(NC_SZIP_NN)
const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */
+#endif
/* Even and between 4 and 32; typical values are 8, 10, 16, 32 */
const int SZIP_PIXELS_PER_BLOCK =
file->compression_level == 0 ? 32 : file->compression_level;

0 comments on commit 4eed113

Please sign in to comment.