Moved size restrictions for OpenVX processed images to corresponding cpp files

terfendail · terfendail · commit 1d62a025b3c3 · 2017-05-25T19:25:17.000+03:00
diff --git a/modules/core/include/opencv2/core/openvx/ovx_defs.hpp b/modules/core/include/opencv2/core/openvx/ovx_defs.hpp
@@ -26,15 +26,6 @@ namespace ovx{
 CV_EXPORTS_W ivx::Context& getOpenVXContext();
 
 template <int kernel_id> inline bool skipSmallImages(int w, int h)     { return w*h < 3840 * 2160; }
-template <> inline bool skipSmallImages<VX_KERNEL_MINMAXLOC>(int w, int h) { return w*h < 3840 * 2160; }
-template <> inline bool skipSmallImages<VX_KERNEL_MEDIAN_3x3>(int w, int h) { return w*h < 1280 * 720; }
-template <> inline bool skipSmallImages<VX_KERNEL_GAUSSIAN_3x3>(int w, int h) { return w*h < 320 * 240; }
-template <> inline bool skipSmallImages<VX_KERNEL_BOX_3x3>(int w, int h) { return w*h < 640 * 480; }
-template <> inline bool skipSmallImages<VX_KERNEL_HISTOGRAM>(int w, int h) { return w*h < 2048 * 1536; }
-template <> inline bool skipSmallImages<VX_KERNEL_SOBEL_3x3>(int w, int h) { return w*h < 320 * 240; }
-template <> inline bool skipSmallImages<VX_KERNEL_CANNY_EDGE_DETECTOR>(int w, int h) { return w*h < 640 * 480; }
-template <> inline bool skipSmallImages<VX_KERNEL_ACCUMULATE>(int w, int h) { return w*h < 120 * 60; }
-template <> inline bool skipSmallImages<VX_KERNEL_FAST_CORNERS>(int w, int h) { return w*h < 800 * 600; }
 }}
 
 #define CV_OVX_RUN(condition, func, ...)          \
diff --git a/modules/core/src/stat.cpp b/modules/core/src/stat.cpp
@@ -2300,6 +2300,9 @@ static bool ocl_minMaxIdx( InputArray _src, double* minVal, double* maxVal, int*
 #endif
 
 #ifdef HAVE_OPENVX
+namespace ovx {
+    template <> inline bool skipSmallImages<VX_KERNEL_MINMAXLOC>(int w, int h) { return w*h < 3840 * 2160; }
+}
 static bool openvx_minMaxIdx(Mat &src, double* minVal, double* maxVal, int* minIdx, int* maxIdx, Mat &mask)
 {
     int stype = src.type();
diff --git a/modules/features2d/src/fast.cpp b/modules/features2d/src/fast.cpp
@@ -338,6 +338,9 @@ static bool ocl_FAST( InputArray _img, std::vector<KeyPoint>& keypoints,
 
 
 #ifdef HAVE_OPENVX
+namespace ovx {
+    template <> inline bool skipSmallImages<VX_KERNEL_FAST_CORNERS>(int w, int h) { return w*h < 800 * 600; }
+}
 static bool openvx_FAST(InputArray _img, std::vector<KeyPoint>& keypoints,
                         int _threshold, bool nonmaxSuppression, int type)
 {
diff --git a/modules/imgproc/src/accum.cpp b/modules/imgproc/src/accum.cpp
@@ -1942,6 +1942,9 @@ enum
     VX_ACCUMULATE_WEIGHTED_OP = 2
 };
 
+namespace ovx {
+    template <> inline bool skipSmallImages<VX_KERNEL_ACCUMULATE>(int w, int h) { return w*h < 120 * 60; }
+}
 static bool openvx_accumulate(InputArray _src, InputOutputArray _dst, InputArray _mask, double _weight, int opType)
 {
     Mat srcMat = _src.getMat(), dstMat = _dst.getMat();
diff --git a/modules/imgproc/src/canny.cpp b/modules/imgproc/src/canny.cpp
@@ -778,6 +778,9 @@ class finalPass : public ParallelLoopBody
 };
 
 #ifdef HAVE_OPENVX
+namespace ovx {
+    template <> inline bool skipSmallImages<VX_KERNEL_CANNY_EDGE_DETECTOR>(int w, int h) { return w*h < 640 * 480; }
+}
 static bool openvx_canny(const Mat& src, Mat& dst, int loVal, int hiVal, int kSize, bool useL2)
 {
     using namespace ivx;
diff --git a/modules/imgproc/src/deriv.cpp b/modules/imgproc/src/deriv.cpp
@@ -184,6 +184,9 @@ cv::Ptr<cv::FilterEngine> cv::createDerivFilter(int srcType, int dstType,
 #ifdef HAVE_OPENVX
 namespace cv
 {
+    namespace ovx {
+        template <> inline bool skipSmallImages<VX_KERNEL_SOBEL_3x3>(int w, int h) { return w*h < 320 * 240; }
+    }
     static bool openvx_sobel(InputArray _src, OutputArray _dst,
                              int dx, int dy, int ksize,
                              double scale, double delta, int borderType)
diff --git a/modules/imgproc/src/histogram.cpp b/modules/imgproc/src/histogram.cpp
@@ -1267,6 +1267,9 @@ class IPPCalcHistInvoker :
 #ifdef HAVE_OPENVX
 namespace cv
 {
+    namespace ovx {
+        template <> inline bool skipSmallImages<VX_KERNEL_HISTOGRAM>(int w, int h) { return w*h < 2048 * 1536; }
+    }
     static bool openvx_calchist(const Mat& image, OutputArray _hist, const int histSize,
         const float* _range)
     {
diff --git a/modules/imgproc/src/smooth.cpp b/modules/imgproc/src/smooth.cpp
@@ -1639,6 +1639,9 @@ cv::Ptr<cv::FilterEngine> cv::createBoxFilter( int srcType, int dstType, Size ks
 #ifdef HAVE_OPENVX
 namespace cv
 {
+    namespace ovx {
+        template <> inline bool skipSmallImages<VX_KERNEL_BOX_3x3>(int w, int h) { return w*h < 640 * 480; }
+    }
     static bool openvx_boxfilter(InputArray _src, OutputArray _dst, int ddepth,
                                  Size ksize, Point anchor,
                                  bool normalize, int borderType)
@@ -2172,6 +2175,9 @@ static bool ocl_GaussianBlur_8UC1(InputArray _src, OutputArray _dst, Size ksize,
 
 #ifdef HAVE_OPENVX
 
+namespace ovx {
+    template <> inline bool skipSmallImages<VX_KERNEL_GAUSSIAN_3x3>(int w, int h) { return w*h < 320 * 240; }
+}
 static bool openvx_gaussianBlur(InputArray _src, OutputArray _dst, Size ksize,
                                 double sigma1, double sigma2, int borderType)
 {
@@ -3302,6 +3308,9 @@ static bool ocl_medianFilter(InputArray _src, OutputArray _dst, int m)
 #ifdef HAVE_OPENVX
 namespace cv
 {
+    namespace ovx {
+        template <> inline bool skipSmallImages<VX_KERNEL_MEDIAN_3x3>(int w, int h) { return w*h < 1280 * 720; }
+    }
     static bool openvx_medianFilter(InputArray _src, OutputArray _dst, int ksize)
     {
         if (_src.type() != CV_8UC1 || _dst.type() != CV_8U

Original file line number	Diff line number	Diff line change
`@@ -2300,6 +2300,9 @@ static bool ocl_minMaxIdx( InputArray _src, double* minVal, double* maxVal, int*`
`2300`	`2300`	`#endif`
`2301`	`2301`
`2302`	`2302`	`#ifdef HAVE_OPENVX`
	`2303`	`+namespace ovx {`
	`2304`	`+ template <> inline bool skipSmallImages<VX_KERNEL_MINMAXLOC>(int w, int h) { return wh < 3840 2160; }`
	`2305`	`+}`
`2303`	`2306`	`static bool openvx_minMaxIdx(Mat &src, double* minVal, double* maxVal, int* minIdx, int* maxIdx, Mat &mask)`
`2304`	`2307`	`{`
`2305`	`2308`	`int stype = src.type();`
Original file line number	Diff line number	Diff line change
`@@ -338,6 +338,9 @@ static bool ocl_FAST( InputArray _img, std::vector<KeyPoint>& keypoints,`
`338`	`338`
`339`	`339`
`340`	`340`	`#ifdef HAVE_OPENVX`
	`341`	`+namespace ovx {`
	`342`	`+ template <> inline bool skipSmallImages<VX_KERNEL_FAST_CORNERS>(int w, int h) { return wh < 800 600; }`
	`343`	`+}`
`341`	`344`	`static bool openvx_FAST(InputArray _img, std::vector<KeyPoint>& keypoints,`
`342`	`345`	`int _threshold, bool nonmaxSuppression, int type)`
`343`	`346`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1942,6 +1942,9 @@ enum`
`1942`	`1942`	`VX_ACCUMULATE_WEIGHTED_OP = 2`
`1943`	`1943`	`};`
`1944`	`1944`
	`1945`	`+namespace ovx {`
	`1946`	`+ template <> inline bool skipSmallImages<VX_KERNEL_ACCUMULATE>(int w, int h) { return wh < 120 60; }`
	`1947`	`+}`
`1945`	`1948`	`static bool openvx_accumulate(InputArray _src, InputOutputArray _dst, InputArray _mask, double _weight, int opType)`
`1946`	`1949`	`{`
`1947`	`1950`	`Mat srcMat = _src.getMat(), dstMat = _dst.getMat();`
Original file line number	Diff line number	Diff line change
`@@ -778,6 +778,9 @@ class finalPass : public ParallelLoopBody`
`778`	`778`	`};`
`779`	`779`
`780`	`780`	`#ifdef HAVE_OPENVX`
	`781`	`+namespace ovx {`
	`782`	`+ template <> inline bool skipSmallImages<VX_KERNEL_CANNY_EDGE_DETECTOR>(int w, int h) { return wh < 640 480; }`
	`783`	`+}`
`781`	`784`	`static bool openvx_canny(const Mat& src, Mat& dst, int loVal, int hiVal, int kSize, bool useL2)`
`782`	`785`	`{`
`783`	`786`	`using namespace ivx;`
Original file line number	Diff line number	Diff line change
`@@ -1267,6 +1267,9 @@ class IPPCalcHistInvoker :`
`1267`	`1267`	`#ifdef HAVE_OPENVX`
`1268`	`1268`	`namespace cv`
`1269`	`1269`	`{`
	`1270`	`+ namespace ovx {`
	`1271`	`+ template <> inline bool skipSmallImages<VX_KERNEL_HISTOGRAM>(int w, int h) { return wh < 2048 1536; }`
	`1272`	`+ }`
`1270`	`1273`	`static bool openvx_calchist(const Mat& image, OutputArray _hist, const int histSize,`
`1271`	`1274`	`const float* _range)`
`1272`	`1275`	`{`