Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for minizip-ng 4 API #1806

Merged
merged 3 commits into from
Jul 28, 2023

Conversation

brad0
Copy link
Contributor

@brad0 brad0 commented Jun 17, 2023

No description provided.

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Jun 17, 2023

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: brad0 / name: Brad Smith (d15ccdd)
  • ✅ login: remia / name: Rémi Achard (b167a4b)
  • ✅ login: doug-walker / name: Doug Walker (e133145)

@negril
Copy link

negril commented Jun 27, 2023

Seeing how this breaks at the same position as #1808 it would appear the code is broken elsewhere.

Since PyColorSpaceSet.cpp was changed recently this seems like the likely culprit.

@num3ric
Copy link
Contributor

num3ric commented Jun 27, 2023

#1762 suffers from the same CIS issue now.

@negril
Copy link

negril commented Jun 29, 2023

@brad0 you missed one call, could you add that?

diff -Naurw a/src/apps/ocioarchive/main.cpp b/src/apps/ocioarchive/main.cpp
--- a/src/apps/ocioarchive/main.cpp
+++ b/src/apps/ocioarchive/main.cpp
@@ -235,7 +235,11 @@
         }   
 
         std::string path = args[0];
+#if MZ_VERSION_BUILD >= 040000
+        reader = mz_zip_reader_create();
+#else
         mz_zip_reader_create(&reader);
+#endif
         struct tm tmu_date;
    
         err = mz_zip_reader_open_file(reader, path.c_str());

@brad0
Copy link
Contributor Author

brad0 commented Jun 29, 2023

@brad0 you missed one call, could you add that?

Thanks. I was wondering why I did not notice this at first but we do not build the apps with the OpenBSD port.

@brad0
Copy link
Contributor Author

brad0 commented Jul 13, 2023

ping.

Copy link
Collaborator

@remia remia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, thank you for the contribution @brad0 and sorry for the latency.

@brad0
Copy link
Contributor Author

brad0 commented Jul 13, 2023

Looks good to me, thank you for the contribution @brad0 and sorry for the latency.

Thank you.

@brad0
Copy link
Contributor Author

brad0 commented Jul 19, 2023

ping.

@doug-walker doug-walker merged commit bdc4cd1 into AcademySoftwareFoundation:main Jul 28, 2023
21 checks passed
@brad0
Copy link
Contributor Author

brad0 commented Jul 28, 2023

Thank you.

doug-walker added a commit to autodesk-forks/OpenColorIO that referenced this pull request Dec 6, 2023
Signed-off-by: Brad Smith <[email protected]>
Co-authored-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
Signed-off-by: Doug Walker <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants