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

3.4: backported changes from 'master' branch

Browse Source
This commit is contained in:
Alexander Alekhin 2019-07-18 19:40:23 +00:00 committed by Alexander Alekhin
parent 7c96857c02
commit 32772a5436
4 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/calib3d/perf/perf_undistort.cpp Normal file
View File

@ -0,0 +1,21 @@
// This file is part of OpenCV project.
// It is subject to the license terms in the LICENSE file found in the top-level directory
// of this distribution and at http://opencv.org/license.html
#include "perf_precomp.hpp"
namespace opencv_test
{
using namespace perf;
PERF_TEST(Undistort, InitUndistortMap)
{
Size size_w_h(512 + 3, 512);
Mat k(3, 3, CV_32FC1);
Mat d(1, 14, CV_64FC1);
Mat dst(size_w_h, CV_32FC2);
declare.in(k, d, WARMUP_RNG).out(dst);
TEST_CYCLE() initUndistortRectifyMap(k, d, noArray(), k, size_w_h, CV_32FC2, dst, noArray());
SANITY_CHECK_NOTHING();
}
} // namespace

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

@ -627,7 +627,7 @@ Cv64suf;
\****************************************************************************************/ \****************************************************************************************/
#ifndef CV_NOEXCEPT #ifndef CV_NOEXCEPT
# if defined(CV_CXX11) && (!defined(_MSC_VER) || _MSC_VER > 1800) /* MSVC 2015 and above */ # if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900/*MSVS 2015*/)
# define CV_NOEXCEPT noexcept # define CV_NOEXCEPT noexcept
# endif # endif
#endif #endif

6
modules/core/test/test_ptr.cpp
View File

@ -43,10 +43,6 @@
namespace opencv_test { namespace { namespace opencv_test { namespace {
#if defined __clang__ && defined __APPLE__
#pragma clang diagnostic ignored "-Wself-assign-overloaded" // explicitly assigning value of variable of type '...' to itself (p1 = p1)
#endif
#ifdef GTEST_CAN_COMPARE_NULL #ifdef GTEST_CAN_COMPARE_NULL
# define EXPECT_NULL(ptr) EXPECT_EQ(NULL, ptr) # define EXPECT_NULL(ptr) EXPECT_EQ(NULL, ptr)
#else #else
@ -161,7 +157,7 @@ TEST(Core_Ptr, assignment)
{ {
Ptr<Reporter> p1(new Reporter(&deleted1)); Ptr<Reporter> p1(new Reporter(&deleted1));
p1 = p1; p1 = *&p1;
EXPECT_FALSE(deleted1); EXPECT_FALSE(deleted1);
} }

11
modules/imgproc/perf/perf_warp.cpp
View File

@ -290,15 +290,4 @@ PERF_TEST(Transform, getPerspectiveTransform_1000)
SANITY_CHECK_NOTHING(); SANITY_CHECK_NOTHING();
} }
PERF_TEST(Undistort, InitUndistortMap)
{
Size size_w_h(512 + 3, 512);
Mat k(3, 3, CV_32FC1);
Mat d(1, 14, CV_64FC1);
Mat dst(size_w_h, CV_32FC2);
declare.in(k, d, WARMUP_RNG).out(dst);
TEST_CYCLE() initUndistortRectifyMap(k, d, noArray(), k, size_w_h, CV_32FC2, dst, noArray());
SANITY_CHECK_NOTHING();
}
} // namespace } // namespace