(0008348)
Sean McBride (developer)
2007-08-07 10:41

I am attaching the first step of my fix, which is to update VTK's zlib to 1.2.3. I chose VTK because I am more familiar with it and it builds/tests faster. Attached is a zip archive of the entire vtkzlib folder, simply replace yours with this to test.

Some files were added, some removed, and many changed. I also added a new 'README.KITWARE.txt'.

On Mac OS X this seems to work great, all tests continue to pass. I suspect on linux everything will be fine too.

David, can you please look at zlib.rc and zlib.def? I only updated the versions in those files, they may need other changes.

There are a couple of minor changes between the real 1.1.4 and what's in VTK's CVS currently. They all seem related to fixing warnings. I have only brought some of those changes over, as they may not be needed anymore. I propose we wait and see what kinds of warnings dashboards give before diverging from 1.2.3.

(0008361)
David Cole (developer)
2007-08-07 16:01

Assigned back to Sean after verifying that it works with minor changes... Minor changes emailed back to Sean so he can incorporate them into his changes before he commits.

(0008372)
Sean McBride (developer)
2007-08-08 10:15

Committed to VTK. ITK and CMake remain at 1.1.4. Next, I will work on a patch for ITK and attach it here so others can test it on other OSes.

(0008400)
Sean McBride (developer)
2007-08-09 16:59

I have attached a test patch for itk. Simply replace the 'itkzlib' folder in Utilities with this one. I have high confidence in this as it is identical to the VTK code, and works fine there. On Mac OS X it works fine.

Can others please test on Windows and Linux? Thanks.

(0008450)
Sean McBride (developer)
2007-08-14 10:09

Committed in ITK CVS. The VTK and ITK zlibs are now both at 1.2.3 and also additional files (ex: CMake related) are deliberately matched up as closely as possible.

Assigning to David so that he can assign it to someone (possibly himself) to update CMake next.

(0008586)
Utkarsh Ayachit (reporter)
2007-08-22 16:58
edited on: 2007-08-22 16:58

The patch committed to VTK had missing symbols, which lead to segfaults in certain builds for ParaView. The following patch (thanks Brad) has been committed to VTK. It nees to be fixed on ITK as well.

VTK/Utilities/vtkzlib/vtk_zlib_mangle.h,v <-- vtk_zlib_mangle.h
new revision: 1.6; previous revision: 1.5

Index: VTK/Utilities/vtkzlib/vtk_zlib_mangle.h
===================================================================
RCS file: /cvsroot/ParaView3/ParaView3/VTK/Utilities/vtkzlib/vtk_zlib_mangle.h,vretrieving revision 1.5
diff -r1.5 vtk_zlib_mangle.h
13c13
< nm libvtkzlib.so |grep " [TRD] " | grep -v " [TRD] _"
---
> nm libvtkzlib.so |grep " [TRD] "
17c17,19
< nm libvtkzlib.so |grep " [TRD] " | grep -v " [TRD] _" | awk '{ print "#define "$3" vtk_zlib_"$3 }'
---
> nm libvtkzlib.so |grep " [TRD] " | awk '{ print "#define "$3" vtk_zlib_"$3 }'
>
> REMOVE the "_init" and "_fini" entries.
19a22
>
26a30
> #define get_crc_table vtk_zlib_get_crc_table
40d43
< #define get_crc_table vtk_zlib_get_crc_table
60a64
> #define inflate_fast vtk_zlib_inflate_fast
73d76
< #define inflate_fast vtk_zlib_inflate_fast
74a78,84
> #define _dist_code vtk_zlib__dist_code
> #define _length_code vtk_zlib__length_code
> #define _tr_align vtk_zlib__tr_align
> #define _tr_flush_block vtk_zlib__tr_flush_block
> #define _tr_init vtk_zlib__tr_init
> #define _tr_stored_block vtk_zlib__tr_stored_block
> #define _tr_tally vtk_zlib__tr_tally
81a92
>

(0008587)
Sean McBride (developer)
2007-08-22 18:08

I synced up itk:

/cvsroot/Insight/Insight/Utilities/itkzlib/itk_zlib_mangle.h,v <-- itk_zlib_mangle.h
new revision: 1.7; previous revision: 1.6

(0008793)
Sean McBride (developer)
2007-08-31 13:27

The ITK and VTK upgrades seem to have been successful, if somewhat bumpy; it has been several weeks now and no failing dashboard or bugs found.

Just CMake remains to be fixed...

(0008918)
David Cole (developer)
2007-09-11 11:25

Utilities/cmzlib updated to 1.2.3

(0010666)
Sean McBride (developer)
2008-02-28 12:55

Fixed and working well for several months, closing.

Issue History
Date Modified	Username	Field	Change
2007-08-06 13:26	Sean McBride	New Issue
2007-08-06 16:58	Sean McBride	Status	new => assigned
2007-08-06 16:58	Sean McBride	Assigned To	=> Sean McBride
2007-08-07 10:41	Sean McBride	Note Added: 0008348
2007-08-07 10:44	Sean McBride	File Added: vtkzlib Patch 1.zip
2007-08-07 11:24	Sean McBride	Assigned To	Sean McBride => David Cole
2007-08-07 16:00	David Cole	Assigned To	David Cole => Sean McBride
2007-08-07 16:01	David Cole	Note Added: 0008361
2007-08-08 10:15	Sean McBride	Note Added: 0008372
2007-08-09 16:58	Sean McBride	File Added: itkzlib Patch 1.zip
2007-08-09 16:59	Sean McBride	Note Added: 0008400
2007-08-09 16:59	Sean McBride	Assigned To	Sean McBride => David Cole
2007-08-10 14:46	David Cole	Assigned To	David Cole => Sean McBride
2007-08-14 10:09	Sean McBride	Note Added: 0008450
2007-08-14 10:09	Sean McBride	Assigned To	Sean McBride => David Cole
2007-08-22 16:58	Utkarsh Ayachit	Note Added: 0008586
2007-08-22 16:58	Utkarsh Ayachit	Note Edited: 0008586
2007-08-22 18:08	Sean McBride	Note Added: 0008587
2007-08-31 13:28	Sean McBride	Note Added: 0008793
2007-08-31 13:28	Sean McBride	Relationship added	has duplicate 0003473
2007-09-11 11:25	David Cole	Status	assigned => resolved
2007-09-11 11:25	David Cole	Resolution	open => fixed
2007-09-11 11:25	David Cole	Note Added: 0008918
2008-02-28 12:55	Sean McBride	Status	resolved => closed
2008-02-28 12:55	Sean McBride	Note Added: 0010666
2010-11-18 11:28	Matthew Bowman	Category	CMake => (No Category)

Notes
(0008348) Sean McBride (developer) 2007-08-07 10:41	I am attaching the first step of my fix, which is to update VTK's zlib to 1.2.3. I chose VTK because I am more familiar with it and it builds/tests faster. Attached is a zip archive of the entire vtkzlib folder, simply replace yours with this to test. Some files were added, some removed, and many changed. I also added a new 'README.KITWARE.txt'. On Mac OS X this seems to work great, all tests continue to pass. I suspect on linux everything will be fine too. David, can you please look at zlib.rc and zlib.def? I only updated the versions in those files, they may need other changes. There are a couple of minor changes between the real 1.1.4 and what's in VTK's CVS currently. They all seem related to fixing warnings. I have only brought some of those changes over, as they may not be needed anymore. I propose we wait and see what kinds of warnings dashboards give before diverging from 1.2.3.

(0008361) David Cole (developer) 2007-08-07 16:01	Assigned back to Sean after verifying that it works with minor changes... Minor changes emailed back to Sean so he can incorporate them into his changes before he commits.

(0008372) Sean McBride (developer) 2007-08-08 10:15	Committed to VTK. ITK and CMake remain at 1.1.4. Next, I will work on a patch for ITK and attach it here so others can test it on other OSes.

(0008400) Sean McBride (developer) 2007-08-09 16:59	I have attached a test patch for itk. Simply replace the 'itkzlib' folder in Utilities with this one. I have high confidence in this as it is identical to the VTK code, and works fine there. On Mac OS X it works fine. Can others please test on Windows and Linux? Thanks.

(0008450) Sean McBride (developer) 2007-08-14 10:09	Committed in ITK CVS. The VTK and ITK zlibs are now both at 1.2.3 and also additional files (ex: CMake related) are deliberately matched up as closely as possible. Assigning to David so that he can assign it to someone (possibly himself) to update CMake next.

(0008586) Utkarsh Ayachit (reporter) 2007-08-22 16:58 edited on: 2007-08-22 16:58	The patch committed to VTK had missing symbols, which lead to segfaults in certain builds for ParaView. The following patch (thanks Brad) has been committed to VTK. It nees to be fixed on ITK as well. VTK/Utilities/vtkzlib/vtk_zlib_mangle.h,v <-- vtk_zlib_mangle.h new revision: 1.6; previous revision: 1.5 Index: VTK/Utilities/vtkzlib/vtk_zlib_mangle.h =================================================================== RCS file: /cvsroot/ParaView3/ParaView3/VTK/Utilities/vtkzlib/vtk_zlib_mangle.h,vretrieving revision 1.5 diff -r1.5 vtk_zlib_mangle.h 13c13 < nm libvtkzlib.so \|grep " [TRD] " \| grep -v " [TRD] _" --- > nm libvtkzlib.so \|grep " [TRD] " 17c17,19 < nm libvtkzlib.so \|grep " [TRD] " \| grep -v " [TRD] _" \| awk '{ print "#define "$3" vtk_zlib_"$3 }' --- > nm libvtkzlib.so \|grep " [TRD] " \| awk '{ print "#define "$3" vtk_zlib_"$3 }' > > REMOVE the "_init" and "_fini" entries. 19a22 > 26a30 > #define get_crc_table vtk_zlib_get_crc_table 40d43 < #define get_crc_table vtk_zlib_get_crc_table 60a64 > #define inflate_fast vtk_zlib_inflate_fast 73d76 < #define inflate_fast vtk_zlib_inflate_fast 74a78,84 > #define _dist_code vtk_zlib__dist_code > #define _length_code vtk_zlib__length_code > #define _tr_align vtk_zlib__tr_align > #define _tr_flush_block vtk_zlib__tr_flush_block > #define _tr_init vtk_zlib__tr_init > #define _tr_stored_block vtk_zlib__tr_stored_block > #define _tr_tally vtk_zlib__tr_tally 81a92 >

(0008587) Sean McBride (developer) 2007-08-22 18:08	I synced up itk: /cvsroot/Insight/Insight/Utilities/itkzlib/itk_zlib_mangle.h,v <-- itk_zlib_mangle.h new revision: 1.7; previous revision: 1.6

(0008793) Sean McBride (developer) 2007-08-31 13:27	The ITK and VTK upgrades seem to have been successful, if somewhat bumpy; it has been several weeks now and no failing dashboard or bugs found. Just CMake remains to be fixed...

(0008918) David Cole (developer) 2007-09-11 11:25	Utilities/cmzlib updated to 1.2.3

(0010666) Sean McBride (developer) 2008-02-28 12:55	Fixed and working well for several months, closing.