mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-12-08 23:03:46 +00:00
60 lines
1.7 KiB
Diff
60 lines
1.7 KiB
Diff
|
diff --git a/src/OpenColorIO/OCIOZArchive.cpp b/src/OpenColorIO/OCIOZArchive.cpp
|
||
|
|
index 52e292ef..4430b2d8 100644
|
||
|
|
--- a/src/OpenColorIO/OCIOZArchive.cpp
|
||
|
|
+++ b/src/OpenColorIO/OCIOZArchive.cpp
|
||
|
|
@@ -17,16 +17,16 @@
|
||
|
|
|
||
|
|
#include "OCIOZArchive.h"
|
||
|
|
|
||
|
|
-#include "minizip-ng/mz.h"
|
||
|
|
-#include "minizip-ng/mz_os.h"
|
||
|
|
-#include "minizip-ng/mz_strm.h"
|
||
|
|
-#include "minizip-ng/mz_strm_buf.h"
|
||
|
|
-#include "minizip-ng/mz_strm_mem.h"
|
||
|
|
-#include "minizip-ng/mz_strm_os.h"
|
||
|
|
-#include "minizip-ng/mz_strm_split.h"
|
||
|
|
-#include "minizip-ng/mz_strm_zlib.h"
|
||
|
|
-#include "minizip-ng/mz_zip.h"
|
||
|
|
-#include "minizip-ng/mz_zip_rw.h"
|
||
|
|
+#include "mz.h"
|
||
|
|
+#include "mz_os.h"
|
||
|
|
+#include "mz_strm.h"
|
||
|
|
+#include "mz_strm_buf.h"
|
||
|
|
+#include "mz_strm_mem.h"
|
||
|
|
+#include "mz_strm_os.h"
|
||
|
|
+#include "mz_strm_split.h"
|
||
|
|
+#include "mz_strm_zlib.h"
|
||
|
|
+#include "mz_zip.h"
|
||
|
|
+#include "mz_zip_rw.h"
|
||
|
|
|
||
|
|
namespace OCIO_NAMESPACE
|
||
|
|
{
|
||
|
|
@@ -630,4 +630,4 @@ void CIOPOciozArchive::buildEntries()
|
||
|
|
getEntriesMappingFromArchiveFile(m_archiveAbsPath, m_entries);
|
||
|
|
}
|
||
|
|
|
||
|
|
-} // namespace OCIO_NAMESPACE
|
||
|
|
\ No newline at end of file
|
||
|
|
+} // namespace OCIO_NAMESPACE
|
||
|
|
diff --git a/src/apps/ocioarchive/main.cpp b/src/apps/ocioarchive/main.cpp
|
||
|
|
index bf222fc8..190cadee 100644
|
||
|
|
--- a/src/apps/ocioarchive/main.cpp
|
||
|
|
+++ b/src/apps/ocioarchive/main.cpp
|
||
|
|
@@ -13,11 +13,11 @@ namespace OCIO = OCIO_NAMESPACE;
|
||
|
|
#include "apputils/argparse.h"
|
||
|
|
|
||
|
|
// Config archive functionality.
|
||
|
|
-#include "minizip-ng/mz.h"
|
||
|
|
-#include "minizip-ng/mz_os.h"
|
||
|
|
-#include "minizip-ng/mz_strm.h"
|
||
|
|
-#include "minizip-ng/mz_zip.h"
|
||
|
|
-#include "minizip-ng/mz_zip_rw.h"
|
||
|
|
+#include "mz.h"
|
||
|
|
+#include "mz_os.h"
|
||
|
|
+#include "mz_strm.h"
|
||
|
|
+#include "mz_zip.h"
|
||
|
|
+#include "mz_zip_rw.h"
|
||
|
|
|
||
|
|
// Array of non OpenColorIO arguments.
|
||
|
|
static std::vector<std::string> args;
|