Rebase on zlib develop v1.3.1.2 #29
Open
Conversation
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
This also simplifies seek processing in general.
Also elaborate on the inflatePrime() error return in zlib.h, and assure that data_type is correct after initialization and a Z_NEED_DICT return.
If the input is not a gzip stream with this option, an error will be returned.
This proceeds to try to decode whatever follows the last gzip member, and concludes that it is acceptable trailing garbage only if it results in a data error without decompressing any data. This commit also reduces the probability of a false-positive gzip header detection.
Before this, a gzflush() with Z_FINISH and no data to write would do nothing. Now it will write an empty gzip member.
Also clean out the point list contents when freed, even though the structure itself is freed, in case someone tries to free it again.
The error is recorded, and will be detected by the application after all of the uncompressed data has been consumed and then one more call is made to read data. The error is available immediately from gzerror() if the application would like to know earlier.
Interim version for an audit.
Since Visual Studio 2010, default changed from IA32 to SSE2. We keep same behavior everywhere (IA32 for all versions of Visual Studio)
Since Visual Studio 2010, default changed from IA32 to SSE2. We keep same behavior everywhere (IA32 for all versions of Visual Studio)
Co-Authored-By: cjee21 <[email protected]>
Signed-off-by: Maxime Gervais <[email protected]>
Signed-off-by: Maxime Gervais <[email protected]>
Author
|
Maybe hold this PR until the compiler warning is resolved and v1.3.2 (madler#1128) is released. |
Member
Fine, but also because "This branch has conflicts that must be resolved" ;-). |
Author
That's because the current develop branch is not reset to the current upstream one which this PR is based on 😉 |
Member
OK, I'll reset when you say OK. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
zlib upstream develop branch has been updated to v1.3.1.2. This PR rebases MediaArea's patches on it to be more in-sync with upstream.
All patches are just copied as is during rebase except the following:
A compiler warning was re-introduced upstream and has been reported madler#1132