Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 1 | From 867caccc358266f7021f076fc8c8e41bf048782c Mon Sep 17 00:00:00 2001 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 2 | From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> |
| 3 | Date: Fri, 19 May 2017 04:27:50 +0900 |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 4 | Subject: [PATCH] To fix errors as following: |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 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 | |
| 10 | Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> |
| 11 | |
| 12 | Also add the visibility changes for certain OpenCL-related functions in |
| 13 | ts module. |
| 14 | |
| 15 | Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 16 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 17 | --- |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 18 | modules/ts/include/opencv2/ts.hpp | 4 ++-- |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 19 | modules/ts/include/opencv2/ts/ocl_test.hpp | 2 +- |
| 20 | modules/ts/include/opencv2/ts/ts_ext.hpp | 2 +- |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 21 | 3 files changed, 4 insertions(+), 4 deletions(-) |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 22 | |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 23 | diff --git a/modules/ts/include/opencv2/ts.hpp b/modules/ts/include/opencv2/ts.hpp |
| 24 | index b9d6b74..f1ee7ee 100644 |
| 25 | --- a/modules/ts/include/opencv2/ts.hpp |
| 26 | +++ b/modules/ts/include/opencv2/ts.hpp |
| 27 | @@ -622,7 +622,7 @@ protected: |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 28 | } |
| 29 | }; |
| 30 | |
| 31 | -extern uint64 param_seed; |
| 32 | +CV_EXPORTS extern uint64 param_seed; |
| 33 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 34 | struct DefaultRngAuto |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 35 | { |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 36 | @@ -685,7 +685,7 @@ private: |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 37 | #endif |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 38 | #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 Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 45 | diff --git a/modules/ts/include/opencv2/ts/ocl_test.hpp b/modules/ts/include/opencv2/ts/ocl_test.hpp |
| 46 | index 11572e9..438112e 100644 |
| 47 | --- a/modules/ts/include/opencv2/ts/ocl_test.hpp |
| 48 | +++ b/modules/ts/include/opencv2/ts/ocl_test.hpp |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 49 | @@ -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 Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 58 | diff --git a/modules/ts/include/opencv2/ts/ts_ext.hpp b/modules/ts/include/opencv2/ts/ts_ext.hpp |
| 59 | index b5cea3e..e5b0b4b 100644 |
| 60 | --- a/modules/ts/include/opencv2/ts/ts_ext.hpp |
| 61 | +++ b/modules/ts/include/opencv2/ts/ts_ext.hpp |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 62 | @@ -9,7 +9,7 @@ |
| 63 | #define OPENCV_TS_EXT_HPP |
| 64 | |
| 65 | namespace cvtest { |
| 66 | -void checkIppStatus(); |
| 67 | +CV_EXPORTS void checkIppStatus(); |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 68 | extern bool skipUnstableTests; |
| 69 | extern bool runBigDataTests; |
| 70 | extern int testThreads; |