Bump bundled zlib to 1.3.2 - #59
Merged
Merged
Conversation
Wholesale-replaces Source/ZLib/* with the official zlib 1.3.2 release (latest as of this commit; supersedes the stalled 1.3.1 bump in #16). No FreeImage-specific patches existed in the bundled 1.2.13 copy (diffed clean against pristine upstream), so this is a straight vendor bump. zlib >= 1.3 needs HAVE_UNISTD_H defined for gzread.c/gzwrite.c to see read()/write()/close() - normally set by zlib's own configure/CMake auto-detection (check_include_file(unistd.h ...)), which building its sources directly via FreeImage's own CMakeLists.txt bypasses. Define it directly for non-Windows builds. Verified: builds clean, FreeImage_ZLibCompress/Uncompress round-trips correctly, and a PNG save/load round-trip (uses zlib internally via libpng) produces correct pixel data.
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Bumps bundled zlib from 1.2.13 to 1.3.2 (latest release), superseding the stalled 1.3.1 bump in #16 which had conflicts.
zlib >= 1.3 needs
HAVE_UNISTD_Hdefined forgzread.c/gzwrite.c(normally set by zlib's own configure/CMake, which building its sources directly bypasses) - added for non-Windows builds.No FreeImage-specific patches existed in the old bundled copy (diffed clean against pristine upstream 1.2.13), so this is a straight vendor bump.
Fixes: #16