Merge remote-tracking branch 'origin/master'

modules/gpu/src/denoising.cpp

@@ -51,6 +51,10 @@ void cv::gpu::bilateralFilter(const GpuMat&, GpuMat&, int, float, float, int, St
 void cv::gpu::nonLocalMeans(const GpuMat&, GpuMat&, float, int, int, int, Stream&) { throw_nogpu(); }
 void cv::gpu::fastNlMeansDenoising( const GpuMat&, GpuMat&, float, int, int, Stream&) { throw_nogpu(); }
 
+void cv::gpu::FastNonLocalMeansDenoising::simpleMethod(const GpuMat&, GpuMat&, float, int, int, Stream&) { throw_nogpu(); }
+void cv::gpu::FastNonLocalMeansDenoising::labMethod( const GpuMat&, GpuMat, float, float, int, int, Stream&) { throw_nogpu(); }
+
+
 #else
 
 //////////////////////////////////////////////////////////////////////////////////

modules/imgproc/perf/perf_goodFeaturesToTrack.cpp

@@ -34,5 +34,8 @@ PERF_TEST_P(Image_MaxCorners_QualityLevel_MinDistance_BlockSize_UseHarris, goodF
     double minDistance = 1;
     TEST_CYCLE() goodFeaturesToTrack(image, corners, maxCorners, qualityLevel, minDistance, noArray(), blockSize, useHarrisDetector);
 
-    //SANITY_CHECK(corners);
+    if (corners.size() > 50)
+        corners.erase(corners.begin() + 50, corners.end());
+
+    SANITY_CHECK(corners);
 }

modules/imgproc/perf/perf_remap.cpp

@@ -7,17 +7,15 @@ using namespace testing;
 using std::tr1::make_tuple;
 using std::tr1::get;
 
-CV_ENUM(MatrixType, CV_16UC1, CV_16SC1, CV_32FC1)
-CV_ENUM(MapType, CV_16SC2, CV_32FC1, CV_32FC2)
 CV_ENUM(InterType, INTER_NEAREST, INTER_LINEAR, INTER_CUBIC, INTER_LANCZOS4)
 
-typedef TestBaseWithParam< tr1::tuple<Size, MatrixType, MapType, InterType> > TestRemap;
+typedef TestBaseWithParam< tr1::tuple<Size, MatType, MatType, InterType> > TestRemap;
 
 PERF_TEST_P( TestRemap, Remap,
              Combine(
                 Values( szVGA, sz1080p ),
-                ValuesIn( MatrixType::all() ), 
+                Values( CV_16UC1, CV_16SC1, CV_32FC1 ),
-                ValuesIn( MapType::all() ), 
+                Values( CV_16SC2, CV_32FC1, CV_32FC2 ),
                 ValuesIn( InterType::all() )
              )
 )

modules/imgproc/perf/perf_warp.cpp

@@ -9,9 +9,9 @@ using std::tr1::get;
 
 enum{HALF_SIZE=0, UPSIDE_DOWN, REFLECTION_X, REFLECTION_BOTH};
 
-CV_ENUM(BorderMode, BORDER_CONSTANT, BORDER_REPLICATE);
+CV_ENUM(BorderMode, BORDER_CONSTANT, BORDER_REPLICATE)
-CV_ENUM(InterType, INTER_NEAREST, INTER_LINEAR);
+CV_ENUM(InterType, INTER_NEAREST, INTER_LINEAR)
-CV_ENUM(RemapMode, HALF_SIZE, UPSIDE_DOWN, REFLECTION_X, REFLECTION_BOTH);
+CV_ENUM(RemapMode, HALF_SIZE, UPSIDE_DOWN, REFLECTION_X, REFLECTION_BOTH)
 
 typedef TestBaseWithParam< tr1::tuple<Size, InterType, BorderMode> > TestWarpAffine;
 typedef TestBaseWithParam< tr1::tuple<Size, InterType, BorderMode> > TestWarpPerspective;
@@ -164,5 +164,7 @@ PERF_TEST(Transform, getPerspectiveTransform)
     {
         transformCoefficient = getPerspectiveTransform(source, destination);
     }
+
+    SANITY_CHECK(transformCoefficient, 1e-5);
 }
 

modules/ts/include/opencv2/ts/ts_perf.hpp

@@ -90,7 +90,7 @@ private:
 \*****************************************************************************************/
 
 #define CV_ENUM(class_name, ...) \
-class CV_EXPORTS class_name {\
+namespace { class CV_EXPORTS class_name {\
 public:\
   class_name(int val = 0) : _val(val) {}\
   operator int() const {return _val;}\
@@ -116,12 +116,12 @@ public:\
     private: class_name *_begin, *_end;\
   };\
   static Container all(){\
-    static class_name vals[] = {__VA_ARGS__};\
+    static int vals[] = {__VA_ARGS__};\
-    return Container(vals, sizeof(vals)/sizeof(vals[0]));\
+    return Container((class_name*)vals, sizeof(vals)/sizeof(vals[0]));\
   }\
 private: int _val;\
 };\
-inline void PrintTo(const class_name& t, std::ostream* os) { t.PrintTo(os); }
+inline void PrintTo(const class_name& t, std::ostream* os) { t.PrintTo(os); } }
 
 #define CV_FLAGS(class_name, ...) \
 class CV_EXPORTS class_name {\