Merge remote-tracking branches 'gl/dgobbi/15934-meta-writer-update' and...

Merge remote-tracking branches 'gl/dgobbi/15934-meta-writer-update' and 'gl/dgobbi/zlib-mangle-z_errmsg' into release

* gl/dgobbi/15934-meta-writer-update:
  Bug 15934: vtkMetaImageWriter incorrect voxel spacing and origin

* gl/dgobbi/zlib-mangle-z_errmsg:
  zlib 2016-01-20 (bfc811e0)
  Merge branch 'upstream-zlib' into update-zlib

IO/Image/vtkMetaImageWriter.cxx

@@ -111,6 +111,12 @@ void vtkMetaImageWriter::Write( )
       }
     }
 
+  vtkStreamingDemandDrivenPipeline::SetUpdateExtent(
+    this->GetInputInformation(0, 0), ext);
+  vtkDemandDrivenPipeline::SafeDownCast(
+    this->GetInputExecutive(0, 0))->UpdateData(
+      this->GetInputConnection(0, 0)->GetIndex());
+
   double origin[3];
   double spacingDouble[3];
   this->GetInput()->GetOrigin(origin);
@@ -153,11 +159,6 @@ void vtkMetaImageWriter::Write( )
 
   int numberOfElements = this->GetInput()->GetNumberOfScalarComponents();
 
-  vtkStreamingDemandDrivenPipeline::SetUpdateExtent(
-    this->GetInputInformation(0, 0), ext);
-  vtkDemandDrivenPipeline::SafeDownCast(
-    this->GetInputExecutive(0, 0))->UpdateData(
-      this->GetInputConnection(0, 0)->GetIndex());
   this->MetaImagePtr->InitializeEssential( nDims,
                                            dimSize,
                                            spacing,

ThirdParty/zlib/vtkzlib/CMakeLists.txt

@@ -16,6 +16,9 @@ set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation d
 set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
 set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
 
+# XXX(kitware): mark the above variables as advanced.
+mark_as_advanced(INSTALL_BIN_DIR INSTALL_LIB_DIR INSTALL_INC_DIR INSTALL_MAN_DIR INSTALL_PKGCONFIG_DIR)
+
 # XXX(kitware): override the installation directory.
 set(INSTALL_INC_DIR "${VTK_INSTALL_INCLUDE_DIR}/vtkzlib")
 

ThirdParty/zlib/vtkzlib/zconf.h.cmakein

@@ -152,6 +152,9 @@
 #  define gz_header_s           vtk_zlib_gz_header_s
 #  define internal_state        vtk_zlib_internal_state
 
+/* XXX(kitware) this symbol wasn't Z_PREFIX mangled */
+#  define z_errmsg              vtk_zlib_errmsg
+
 #endif
 
 #if defined(__MSDOS__) && !defined(MSDOS)