blob: bb47ef2babe3048620c4f52cd05f32bf2f32c805 [file] [log] [blame]
Andrew Geissler7f40b712020-05-15 14:09:53 -05001From f42c9b8c7bafcadc7e95fb25a391707f970eb426 Mon Sep 17 00:00:00 2001
Brad Bishopd7bf8c12018-02-25 22:55:05 -05002From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
3Date: Fri, 19 May 2017 04:27:50 +0900
Brad Bishop26bdd442019-08-16 17:08:17 -04004Subject: [PATCH] To fix errors as following:
Brad Bishopd7bf8c12018-02-25 22:55:05 -05005
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>
Brad Bishop26bdd442019-08-16 17:08:17 -040016
Brad Bishopd7bf8c12018-02-25 22:55:05 -050017---
Brad Bishop26bdd442019-08-16 17:08:17 -040018 modules/ts/include/opencv2/ts.hpp | 4 ++--
Brad Bishopd7bf8c12018-02-25 22:55:05 -050019 modules/ts/include/opencv2/ts/ocl_test.hpp | 2 +-
20 modules/ts/include/opencv2/ts/ts_ext.hpp | 2 +-
Brad Bishop26bdd442019-08-16 17:08:17 -040021 3 files changed, 4 insertions(+), 4 deletions(-)
Brad Bishopd7bf8c12018-02-25 22:55:05 -050022
Brad Bishop26bdd442019-08-16 17:08:17 -040023diff --git a/modules/ts/include/opencv2/ts.hpp b/modules/ts/include/opencv2/ts.hpp
Andrew Geissler7f40b712020-05-15 14:09:53 -050024index ed7491a89a..80919d13ee 100644
Brad Bishop26bdd442019-08-16 17:08:17 -040025--- a/modules/ts/include/opencv2/ts.hpp
26+++ b/modules/ts/include/opencv2/ts.hpp
Andrew Geissler7f40b712020-05-15 14:09:53 -050027@@ -728,7 +728,7 @@ protected:
Brad Bishopd7bf8c12018-02-25 22:55:05 -050028 }
29 };
30
31-extern uint64 param_seed;
32+CV_EXPORTS extern uint64 param_seed;
33
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080034 struct DefaultRngAuto
Brad Bishopd7bf8c12018-02-25 22:55:05 -050035 {
Andrew Geissler7f40b712020-05-15 14:09:53 -050036@@ -791,7 +791,7 @@ private:
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080037 #endif
Brad Bishopd7bf8c12018-02-25 22:55:05 -050038 #endif
39
40-void parseCustomOptions(int argc, char **argv);
41+CV_EXPORTS void parseCustomOptions(int argc, char **argv);
42
43 #define CV_TEST_INIT0_NOOP (void)0
44
Brad Bishop26bdd442019-08-16 17:08:17 -040045diff --git a/modules/ts/include/opencv2/ts/ocl_test.hpp b/modules/ts/include/opencv2/ts/ocl_test.hpp
Andrew Geissler7f40b712020-05-15 14:09:53 -050046index 11572e9f48..438112e2aa 100644
Brad Bishop26bdd442019-08-16 17:08:17 -040047--- a/modules/ts/include/opencv2/ts/ocl_test.hpp
48+++ b/modules/ts/include/opencv2/ts/ocl_test.hpp
Brad Bishopd7bf8c12018-02-25 22:55:05 -050049@@ -82,7 +82,7 @@ inline UMat ToUMat(InputArray src)
50 return dst;
51 }
52
53-extern int test_loop_times;
54+CV_EXPORTS extern int test_loop_times;
55
56 #define MAX_VALUE 357
57
Brad Bishop26bdd442019-08-16 17:08:17 -040058diff --git a/modules/ts/include/opencv2/ts/ts_ext.hpp b/modules/ts/include/opencv2/ts/ts_ext.hpp
Andrew Geissler7f40b712020-05-15 14:09:53 -050059index b2a4cac241..b94c681c0c 100644
Brad Bishop26bdd442019-08-16 17:08:17 -040060--- a/modules/ts/include/opencv2/ts/ts_ext.hpp
61+++ b/modules/ts/include/opencv2/ts/ts_ext.hpp
Brad Bishopd7bf8c12018-02-25 22:55:05 -050062@@ -9,7 +9,7 @@
63 #define OPENCV_TS_EXT_HPP
64
65 namespace cvtest {
66-void checkIppStatus();
67+CV_EXPORTS void checkIppStatus();
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080068 extern bool skipUnstableTests;
69 extern bool runBigDataTests;
70 extern int testThreads;