Skip to content

Commit 75890c8

Browse files
committed
fix build
1 parent 0b40ac6 commit 75890c8

File tree

1 file changed

+23
-4
lines changed

1 file changed

+23
-4
lines changed

opencv-2.4.13.7-no-zlib.patch

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,31 @@
11
diff -Nuarp opencv-2.4.13.7.orig/modules/core/src/persistence.cpp opencv-2.4.13.7/modules/core/src/persistence.cpp
22
--- opencv-2.4.13.7.orig/modules/core/src/persistence.cpp 2018-07-02 05:41:56.000000000 +0800
3-
+++ opencv-2.4.13.7/modules/core/src/persistence.cpp 2021-02-24 23:58:32.154994276 +0800
4-
@@ -47,7 +47,7 @@
3+
+++ opencv-2.4.13.7/modules/core/src/persistence.cpp 2021-02-25 00:07:23.031002590 +0800
4+
@@ -47,17 +47,7 @@
55
#include <iterator>
66
#include <wchar.h>
77

88
-#define USE_ZLIB 1
9+
-
10+
-#ifdef __APPLE__
11+
-# include "TargetConditionals.h"
12+
-# if (defined TARGET_OS_IPHONE && TARGET_OS_IPHONE) || (defined TARGET_IPHONE_SIMULATOR && TARGET_IPHONE_SIMULATOR)
13+
-# undef USE_ZLIB
14+
-# define USE_ZLIB 0
15+
- typedef void* gzFile;
16+
-# endif
17+
-#endif
18+
-
919
+#define USE_ZLIB 0
20+
#if USE_ZLIB
21+
# ifndef _LFS64_LARGEFILE
22+
# define _LFS64_LARGEFILE 0
23+
@@ -66,6 +56,8 @@
24+
# define _FILE_OFFSET_BITS 0
25+
# endif
26+
# include <zlib.h>
27+
+#else
28+
+typedef void* gzFile;
29+
#endif
1030

11-
#ifdef __APPLE__
12-
# include "TargetConditionals.h"
31+
/****************************************************************************************\

0 commit comments

Comments
 (0)