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.

Sign up for GitHub

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

Jump to bottom

minizip seems to be changing to a hex number for MZ_VERSION_BUILD #1954

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −6
Open

minizip seems to be changing to a hex number for MZ_VERSION_BUILD #1954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/OpenColorIO/OCIOZArchive.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ void archiveConfig(std::ostream & ostream, const Config & config, const char * c
std::string configStr = ss.str();

// Write zip to memory stream.
#if MZ_VERSION_BUILD >= 040000
#if MZ_VERSION_BUILD >= 0x40000
write_mem_stream = mz_stream_mem_create();
#else
mz_stream_mem_create(&write_mem_stream);
Expand All @@ -242,7 +242,7 @@ void archiveConfig(std::ostream & ostream, const Config & config, const char * c
options.compress_level = ArchiveCompressionLevels::BEST;

// Create the writer handle.
#if MZ_VERSION_BUILD >= 040000
#if MZ_VERSION_BUILD >= 0x40000
archiver = mz_zip_writer_create();
#else
mz_zip_writer_create(&archiver);
Expand Down Expand Up @@ -341,7 +341,7 @@ void ExtractOCIOZArchive(const char * archivePath, const char * destination)
std::string outputDestination = pystring::os::path::normpath(destination);

// Create zip reader.
#if MZ_VERSION_BUILD >= 040000
#if MZ_VERSION_BUILD >= 0x40000
extracter = mz_zip_reader_create();
#else
mz_zip_reader_create(&extracter);
Expand Down Expand Up @@ -463,7 +463,7 @@ std::vector<uint8_t> getFileStringFromArchiveFile(const std::string & filepath,
std::vector<uint8_t> buffer;

// Create the reader object.
#if MZ_VERSION_BUILD >= 040000
#if MZ_VERSION_BUILD >= 0x40000
reader = mz_zip_reader_create();
#else
mz_zip_reader_create(&reader);
Expand Down Expand Up @@ -527,7 +527,7 @@ void getEntriesMappingFromArchiveFile(const std::string & archivePath,
void *reader = NULL;

// Create the reader object.
#if MZ_VERSION_BUILD >= 040000
#if MZ_VERSION_BUILD >= 0x40000
reader = mz_zip_reader_create();
#else
mz_zip_reader_create(&reader);
Expand Down
2 changes: 1 addition & 1 deletion src/apps/ocioarchive/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ int main(int argc, const char **argv)
}

std::string path = args[0];
#if MZ_VERSION_BUILD >= 040000
#if MZ_VERSION_BUILD >= 0x40000
reader = mz_zip_reader_create();
#else
mz_zip_reader_create(&reader);
Expand Down
Loading