summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-multi-line-separator.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-support/opencv/opencv/0001-Add-missing-multi-line-separator.patch')
-rw-r--r--meta-oe/recipes-support/opencv/opencv/0001-Add-missing-multi-line-separator.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-multi-line-separator.patch b/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-multi-line-separator.patch
new file mode 100644
index 000000000..513597b8c
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-multi-line-separator.patch
@@ -0,0 +1,36 @@
1From 60857229aab13ccc426572a43ab891409bb76ea4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 9 Sep 2018 22:52:55 -0700
4Subject: [PATCH] Add missing multi-line separator
5
6Otherwise this fails to build ( found on mips )
7
8Fixes
9contrib/modules/surface_matching/src/hash_murmur86.hpp:97:15: error:
10expected constructor, destructor, or type conversion before '(' token
11 && defined(__GNUC__) && (__GNUC__>4 || (__GNUC__==4 &&
12__GNUC_MINOR__>=3))
13 ^
14
15Upstream-Status: Submitted [https://github.com/opencv/opencv_contrib/pull/1764]
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 modules/surface_matching/src/hash_murmur86.hpp | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/modules/surface_matching/src/hash_murmur86.hpp b/modules/surface_matching/src/hash_murmur86.hpp
22index 1edf6bf4..0477d37e 100644
23--- a/modules/surface_matching/src/hash_murmur86.hpp
24+++ b/modules/surface_matching/src/hash_murmur86.hpp
25@@ -93,7 +93,7 @@ void hashMurmurx86 ( const void * key, const int len, const uint seed, void * ou
26 /* Now find best way we can to READ_UINT32 */
27 #ifndef WORDS_BIGENDIAN
28 # define READ_UINT32(ptr) (*((uint32_t*)(ptr)))
29-#elif defined(WORDS_BIGENDIAN)
30+#elif defined(WORDS_BIGENDIAN) \
31 && defined(__GNUC__) && (__GNUC__>4 || (__GNUC__==4 && __GNUC_MINOR__>=3))
32 # define READ_UINT32(ptr) (__builtin_bswap32(*((uint32_t*)(ptr))))
33 #endif
34--
352.18.0
36