diff --git a/3rdparty/openvx/hal/openvx_hal.cpp b/3rdparty/openvx/hal/openvx_hal.cpp index 8327fc55b2..2352809f97 100644 --- a/3rdparty/openvx/hal/openvx_hal.cpp +++ b/3rdparty/openvx/hal/openvx_hal.cpp @@ -82,9 +82,10 @@ inline bool dimTooBig(int size) } //OpenVX calls have essential overhead so it make sense to skip them for small images -template inline bool skipSmallImages(int w, int h) { return w*h < 7680 * 4320; } -template <> inline bool skipSmallImages(int w, int h) { return w*h < 640 * 480; } -template <> inline bool skipSmallImages(int w, int h) { return w*h < 2048 * 1536; } +template inline bool skipSmallImages(int w, int h) { return w*h < 7680 * 4320; } +template <> inline bool skipSmallImages(int w, int h) { return w*h < 640 * 480; } +template <> inline bool skipSmallImages(int w, int h) { return w*h < 2048 * 1536; } +template <> inline bool skipSmallImages(int w, int h) { return w*h < 640 * 480; } inline void setConstantBorder(ivx::border_t &border, vx_uint8 val) { diff --git a/modules/core/include/opencv2/core/openvx/ovx_defs.hpp b/modules/core/include/opencv2/core/openvx/ovx_defs.hpp index 09f3faa9f4..c9212b3cce 100644 --- a/modules/core/include/opencv2/core/openvx/ovx_defs.hpp +++ b/modules/core/include/opencv2/core/openvx/ovx_defs.hpp @@ -28,11 +28,11 @@ CV_EXPORTS_W ivx::Context& getOpenVXContext(); template inline bool skipSmallImages(int w, int h) { return w*h < 3840 * 2160; } template <> inline bool skipSmallImages(int w, int h) { return w*h < 3840 * 2160; } template <> inline bool skipSmallImages(int w, int h) { return w*h < 1280 * 720; } -template <> inline bool skipSmallImages(int w, int h) { return w*h < 1280 * 720; } -template <> inline bool skipSmallImages(int w, int h) { return w*h < 1920 * 1080; } +template <> inline bool skipSmallImages(int w, int h) { return w*h < 320 * 240; } +template <> inline bool skipSmallImages(int w, int h) { return w*h < 640 * 480; } template <> inline bool skipSmallImages(int w, int h) { return w*h < 2048 * 1536; } -template <> inline bool skipSmallImages(int w, int h) { return w*h < 1280 * 720; } -template <> inline bool skipSmallImages(int w, int h) { return w*h < 1280 * 720; } +template <> inline bool skipSmallImages(int w, int h) { return w*h < 320 * 240; } +template <> inline bool skipSmallImages(int w, int h) { return w*h < 640 * 480; } }} diff --git a/modules/imgproc/src/deriv.cpp b/modules/imgproc/src/deriv.cpp index 8d2a987361..6328dfcdfc 100644 --- a/modules/imgproc/src/deriv.cpp +++ b/modules/imgproc/src/deriv.cpp @@ -234,8 +234,8 @@ namespace cv border = VX_BORDER_CONSTANT; break; case BORDER_REPLICATE: - border = VX_BORDER_REPLICATE; - break; +// border = VX_BORDER_REPLICATE; +// break; default: return false; }