mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-30 00:50:00 +00:00
Code Issues Projects Releases Wiki Activity

opencv: fix compilation error when OpenCL is enabled.

Browse Source 
The patch which changes test module function visilibility was missing
some OpenCL symbols. Export also those.

Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Ismo Puustinen
2017-06-07 14:08:54 +03:00
committed by Martin Jansa
parent 7110ebcffe
commit 3b37c18838
1 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/opencv/opencv/0001-To-fix-errors-as-following.patch
+34 -7
View File
@@ -1,4 +1,4 @@
From db1d9cc82b68f6593360d66ef40cb6b0fc377e6e Mon Sep 17 00:00:00 2001 From a4abe478bf4514ec95aa10b2d6f258647ce325f5 Mon Sep 17 00:00:00 2001
From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Date: Fri, 19 May 2017 04:27:50 +0900 Date: Fri, 19 May 2017 04:27:50 +0900
Subject: [PATCH] To fix errors as following: Subject: [PATCH] To fix errors as following:
@@ -8,13 +8,19 @@ Subject: [PATCH] To fix errors as following:
"test_superres.cpp:270: undefined reference to `checkIppStatus()'" "test_superres.cpp:270: undefined reference to `checkIppStatus()'"
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Also add the visibility changes for certain OpenCL-related functions in
ts module.
Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>
--- ---
modules/ts/include/opencv2/ts.hpp | 4 ++-- modules/ts/include/opencv2/ts.hpp | 6 +++---
modules/ts/include/opencv2/ts/ts_ext.hpp | 2 +- modules/ts/include/opencv2/ts/ocl_test.hpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-) modules/ts/include/opencv2/ts/ts_ext.hpp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/modules/ts/include/opencv2/ts.hpp b/modules/ts/include/opencv2/ts.hpp diff --git a/modules/ts/include/opencv2/ts.hpp b/modules/ts/include/opencv2/ts.hpp
index c573905..7ff6cc1 100644 index c573905..230f598 100644
--- a/modules/ts/include/opencv2/ts.hpp --- a/modules/ts/include/opencv2/ts.hpp
+++ b/modules/ts/include/opencv2/ts.hpp +++ b/modules/ts/include/opencv2/ts.hpp
@@ -539,7 +539,7 @@ protected: @@ -539,7 +539,7 @@ protected:
@@ -26,7 +32,15 @@ index c573905..7ff6cc1 100644
struct CV_EXPORTS DefaultRngAuto struct CV_EXPORTS DefaultRngAuto
{ {
@@ -602,7 +602,7 @@ void dumpOpenCLDevice(); @@ -595,14 +595,14 @@ CV_EXPORTS std::string findDataFile(const std::string& relative_path, bool requi
#ifdef HAVE_OPENCL
namespace ocl {
-void dumpOpenCLDevice();
+CV_EXPORTS void dumpOpenCLDevice();
}
#define TEST_DUMP_OCL_INFO cvtest::ocl::dumpOpenCLDevice();
#else
#define TEST_DUMP_OCL_INFO #define TEST_DUMP_OCL_INFO
#endif #endif
@@ -35,6 +49,19 @@ index c573905..7ff6cc1 100644
#define CV_TEST_MAIN(resourcesubdir, ...) \ #define CV_TEST_MAIN(resourcesubdir, ...) \
int main(int argc, char **argv) \ int main(int argc, char **argv) \
diff --git a/modules/ts/include/opencv2/ts/ocl_test.hpp b/modules/ts/include/opencv2/ts/ocl_test.hpp
index c967cd7..ff35b40 100644
--- a/modules/ts/include/opencv2/ts/ocl_test.hpp
+++ b/modules/ts/include/opencv2/ts/ocl_test.hpp
@@ -84,7 +84,7 @@ inline UMat ToUMat(InputArray src)
return dst;
}
-extern int test_loop_times;
+CV_EXPORTS extern int test_loop_times;
#define MAX_VALUE 357
diff --git a/modules/ts/include/opencv2/ts/ts_ext.hpp b/modules/ts/include/opencv2/ts/ts_ext.hpp diff --git a/modules/ts/include/opencv2/ts/ts_ext.hpp b/modules/ts/include/opencv2/ts/ts_ext.hpp
index 05ccc63..8075065 100644 index 05ccc63..8075065 100644
--- a/modules/ts/include/opencv2/ts/ts_ext.hpp --- a/modules/ts/include/opencv2/ts/ts_ext.hpp
@@ -49,5 +76,5 @@ index 05ccc63..8075065 100644
#define CV_TEST_INIT \ #define CV_TEST_INIT \
-- --
2.7.4 2.9.4