diff options
Diffstat (limited to 'meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch')
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch | 49 |
1 files changed, 19 insertions, 30 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch b/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch index a22b04a90..5270b8c9f 100644 --- a/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch +++ b/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch | |||
@@ -19,29 +19,21 @@ Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> | |||
19 | modules/ts/include/opencv2/ts/ts_ext.hpp | 2 +- | 19 | modules/ts/include/opencv2/ts/ts_ext.hpp | 2 +- |
20 | 3 files changed, 5 insertions(+), 5 deletions(-) | 20 | 3 files changed, 5 insertions(+), 5 deletions(-) |
21 | 21 | ||
22 | diff --git a/modules/ts/include/opencv2/ts.hpp b/modules/ts/include/opencv2/ts.hpp | 22 | Index: git/modules/ts/include/opencv2/ts.hpp |
23 | index 41a76b13e..205646140 100644 | 23 | =================================================================== |
24 | --- a/modules/ts/include/opencv2/ts.hpp | 24 | --- git.orig/modules/ts/include/opencv2/ts.hpp |
25 | +++ b/modules/ts/include/opencv2/ts.hpp | 25 | +++ git/modules/ts/include/opencv2/ts.hpp |
26 | @@ -555,7 +555,7 @@ protected: | 26 | @@ -608,7 +608,7 @@ protected: |
27 | } | 27 | } |
28 | }; | 28 | }; |
29 | 29 | ||
30 | -extern uint64 param_seed; | 30 | -extern uint64 param_seed; |
31 | +CV_EXPORTS extern uint64 param_seed; | 31 | +CV_EXPORTS extern uint64 param_seed; |
32 | 32 | ||
33 | struct CV_EXPORTS DefaultRngAuto | 33 | struct DefaultRngAuto |
34 | { | 34 | { |
35 | @@ -611,14 +611,14 @@ CV_EXPORTS std::string findDataFile(const std::string& relative_path, bool requi | 35 | @@ -671,7 +671,7 @@ private: |
36 | 36 | #endif | |
37 | #ifdef HAVE_OPENCL | ||
38 | namespace ocl { | ||
39 | -void dumpOpenCLDevice(); | ||
40 | +CV_EXPORTS void dumpOpenCLDevice(); | ||
41 | } | ||
42 | #define TEST_DUMP_OCL_INFO cvtest::ocl::dumpOpenCLDevice(); | ||
43 | #else | ||
44 | #define TEST_DUMP_OCL_INFO | ||
45 | #endif | 37 | #endif |
46 | 38 | ||
47 | -void parseCustomOptions(int argc, char **argv); | 39 | -void parseCustomOptions(int argc, char **argv); |
@@ -49,10 +41,10 @@ index 41a76b13e..205646140 100644 | |||
49 | 41 | ||
50 | #define CV_TEST_INIT0_NOOP (void)0 | 42 | #define CV_TEST_INIT0_NOOP (void)0 |
51 | 43 | ||
52 | diff --git a/modules/ts/include/opencv2/ts/ocl_test.hpp b/modules/ts/include/opencv2/ts/ocl_test.hpp | 44 | Index: git/modules/ts/include/opencv2/ts/ocl_test.hpp |
53 | index 54b33ece8..ef56bf9ef 100644 | 45 | =================================================================== |
54 | --- a/modules/ts/include/opencv2/ts/ocl_test.hpp | 46 | --- git.orig/modules/ts/include/opencv2/ts/ocl_test.hpp |
55 | +++ b/modules/ts/include/opencv2/ts/ocl_test.hpp | 47 | +++ git/modules/ts/include/opencv2/ts/ocl_test.hpp |
56 | @@ -82,7 +82,7 @@ inline UMat ToUMat(InputArray src) | 48 | @@ -82,7 +82,7 @@ inline UMat ToUMat(InputArray src) |
57 | return dst; | 49 | return dst; |
58 | } | 50 | } |
@@ -62,19 +54,16 @@ index 54b33ece8..ef56bf9ef 100644 | |||
62 | 54 | ||
63 | #define MAX_VALUE 357 | 55 | #define MAX_VALUE 357 |
64 | 56 | ||
65 | diff --git a/modules/ts/include/opencv2/ts/ts_ext.hpp b/modules/ts/include/opencv2/ts/ts_ext.hpp | 57 | Index: git/modules/ts/include/opencv2/ts/ts_ext.hpp |
66 | index 0bdd346dd..2cd34dfce 100644 | 58 | =================================================================== |
67 | --- a/modules/ts/include/opencv2/ts/ts_ext.hpp | 59 | --- git.orig/modules/ts/include/opencv2/ts/ts_ext.hpp |
68 | +++ b/modules/ts/include/opencv2/ts/ts_ext.hpp | 60 | +++ git/modules/ts/include/opencv2/ts/ts_ext.hpp |
69 | @@ -9,7 +9,7 @@ | 61 | @@ -9,7 +9,7 @@ |
70 | #define OPENCV_TS_EXT_HPP | 62 | #define OPENCV_TS_EXT_HPP |
71 | 63 | ||
72 | namespace cvtest { | 64 | namespace cvtest { |
73 | -void checkIppStatus(); | 65 | -void checkIppStatus(); |
74 | +CV_EXPORTS void checkIppStatus(); | 66 | +CV_EXPORTS void checkIppStatus(); |
75 | } | 67 | extern bool skipUnstableTests; |
76 | 68 | extern bool runBigDataTests; | |
77 | #define CV_TEST_INIT \ | 69 | extern int testThreads; |
78 | -- | ||
79 | 2.13.4 | ||
80 | |||