blob: 5270b8c9f5adfde25a771c95f54d200682c33596 [file] [log] [blame]
Brad Bishopd7bf8c12018-02-25 22:55:05 -05001From ace48a628dca34d742615598afeef42ed323a029 Mon Sep 17 00:00:00 2001
2From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
3Date: Fri, 19 May 2017 04:27:50 +0900
4Subject: [PATCH 3/3] To fix errors as following:
5
6"test_main.cpp:45: undefined reference to `parseCustomOptions(int, char**)'"
7"perf_abs.cpp:13: undefined reference to `cvtest::param_seed'"
8"test_superres.cpp:270: undefined reference to `checkIppStatus()'"
9
10Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
11
12Also add the visibility changes for certain OpenCL-related functions in
13ts module.
14
15Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>
16---
17 modules/ts/include/opencv2/ts.hpp | 6 +++---
18 modules/ts/include/opencv2/ts/ocl_test.hpp | 2 +-
19 modules/ts/include/opencv2/ts/ts_ext.hpp | 2 +-
20 3 files changed, 5 insertions(+), 5 deletions(-)
21
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080022Index: git/modules/ts/include/opencv2/ts.hpp
23===================================================================
24--- git.orig/modules/ts/include/opencv2/ts.hpp
25+++ git/modules/ts/include/opencv2/ts.hpp
26@@ -608,7 +608,7 @@ protected:
Brad Bishopd7bf8c12018-02-25 22:55:05 -050027 }
28 };
29
30-extern uint64 param_seed;
31+CV_EXPORTS extern uint64 param_seed;
32
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080033 struct DefaultRngAuto
Brad Bishopd7bf8c12018-02-25 22:55:05 -050034 {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080035@@ -671,7 +671,7 @@ private:
36 #endif
Brad Bishopd7bf8c12018-02-25 22:55:05 -050037 #endif
38
39-void parseCustomOptions(int argc, char **argv);
40+CV_EXPORTS void parseCustomOptions(int argc, char **argv);
41
42 #define CV_TEST_INIT0_NOOP (void)0
43
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080044Index: git/modules/ts/include/opencv2/ts/ocl_test.hpp
45===================================================================
46--- git.orig/modules/ts/include/opencv2/ts/ocl_test.hpp
47+++ git/modules/ts/include/opencv2/ts/ocl_test.hpp
Brad Bishopd7bf8c12018-02-25 22:55:05 -050048@@ -82,7 +82,7 @@ inline UMat ToUMat(InputArray src)
49 return dst;
50 }
51
52-extern int test_loop_times;
53+CV_EXPORTS extern int test_loop_times;
54
55 #define MAX_VALUE 357
56
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080057Index: git/modules/ts/include/opencv2/ts/ts_ext.hpp
58===================================================================
59--- git.orig/modules/ts/include/opencv2/ts/ts_ext.hpp
60+++ git/modules/ts/include/opencv2/ts/ts_ext.hpp
Brad Bishopd7bf8c12018-02-25 22:55:05 -050061@@ -9,7 +9,7 @@
62 #define OPENCV_TS_EXT_HPP
63
64 namespace cvtest {
65-void checkIppStatus();
66+CV_EXPORTS void checkIppStatus();
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080067 extern bool skipUnstableTests;
68 extern bool runBigDataTests;
69 extern int testThreads;