mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-08 01:53:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10589 from patrikhuber:patch-1

Browse Source 
* Make <array> #ifdef true for MSVC

I think MSVC had `std::array` for quite a while (possibly going back as far as VS 2012, but it's definitely there in 2015 and 2017. So I think `_MSC_VER` `1900` is a safe bet. Probably `1800` and maybe even `1700` could work as well but I can't test that locally.

* fix test
This commit is contained in:
Patrik Huber 2018-02-17 11:53:30 +00:00 committed by Alexander Alekhin
parent 0e4eed0ba1
commit 7be0c78533
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/include/opencv2/core/cvdef.h
View File

@ -442,7 +442,7 @@ Cv64suf;
\****************************************************************************************/ \****************************************************************************************/
#ifndef CV_CXX_STD_ARRAY #ifndef CV_CXX_STD_ARRAY
# if __cplusplus >= 201103L # if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900/*MSVS 2015*/)
# define CV_CXX_STD_ARRAY 1 # define CV_CXX_STD_ARRAY 1
# include <array> # include <array>
# endif # endif

13
modules/core/test/test_mat.cpp
View File

@ -1672,9 +1672,9 @@ TEST(Core_Mat_array, copyTo_roi_row)
TEST(Core_Mat_array, SplitMerge) TEST(Core_Mat_array, SplitMerge)
{ {
std::array<cv::Mat, 3> src; std::array<cv::Mat, 3> src;
for(size_t i=0; i<src.size(); ++i) { for (size_t i = 0; i < src.size(); ++i)
src[i].create(10, 10, CV_8U); {
src[i] = 127 * i; src[i] = Mat(10, 10, CV_8U, Scalar((double)(16 * (i + 1))));
} }
Mat merged; Mat merged;
@ -1683,10 +1683,9 @@ TEST(Core_Mat_array, SplitMerge)
std::array<cv::Mat, 3> dst; std::array<cv::Mat, 3> dst;
split(merged, dst); split(merged, dst);
Mat diff; for (size_t i = 0; i < dst.size(); ++i)
for(size_t i=0; i<dst.size(); ++i) { {
absdiff(src[i], dst[i], diff); EXPECT_EQ(0, cvtest::norm(src[i], dst[i], NORM_INF));
EXPECT_EQ(0, countNonZero(diff));
} }
} }
#endif #endif