Merged
Conversation
The opencv zlib patch is still not merged. So I applied it to zlib-1.3. Since zlib-1.3 didn't modify CMakeLists.txt, opencv's zlib CMakeLists.txt doesn't need to be modified.
asmorkalov
requested changes
Dec 19, 2023
Contributor
asmorkalov
left a comment
There was a problem hiding this comment.
I compared your branch with official zlib 1.3 sources and see some difference in inflate.c.
Contributor
Author
|
@asmorkalov Hi, thanks for your review. I checked it again. The only difference between my branch and the official zlib-1.3 is @@ -207,7 +207,6 @@
state->strm = strm;
state->window = Z_NULL;
state->mode = HEAD; /* to pass state test in inflateReset2() */
- state->check = 1L; /* 1L is the result of adler32() zero length data */
ret = inflateReset2(strm, windowBits);
if (ret != Z_OK) {
ZFREE(strm, state);As I mentioned above, "The opencv zlib patch is still not merged. So, I applied it to zlib-1.3.". you can check at https://github.com/opencv/opencv/blob/4.x/3rdparty/zlib/patches/20190330-ununitialized-use-state-check.diff |
Contributor
|
Ok, I got your point about the patch. It's not obvious from the PR description. |
Contributor
|
For reference: issue and patch information: |
Contributor
Merged
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
2 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.
The opencv zlib patch is still not merged. So I applied it to zlib-1.3. Since zlib-1.3 didn't modify CMakeLists.txt, opencv's zlib CMakeLists.txt doesn't need to be modified.
Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request