diff --git a/3rdparty/openvx/hal/openvx_hal.cpp b/3rdparty/openvx/hal/openvx_hal.cpp index 2352809f97..562c1efbef 100644 --- a/3rdparty/openvx/hal/openvx_hal.cpp +++ b/3rdparty/openvx/hal/openvx_hal.cpp @@ -82,10 +82,13 @@ 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 < 640 * 480; } +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; } +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 < 320 * 240; } inline void setConstantBorder(ivx::border_t &border, vx_uint8 val) { @@ -553,6 +556,7 @@ int ovx_hal_filterInit(cvhalFilter2D **filter_context, uchar *kernel_data, size_ for (int i = 0; i < kernel_width; ++i) data.push_back(row[i]); } + break; default: return CV_HAL_ERROR_NOT_IMPLEMENTED; } diff --git a/modules/core/include/opencv2/core/openvx/ovx_defs.hpp b/modules/core/include/opencv2/core/openvx/ovx_defs.hpp index c0d23a8921..089ccf8767 100644 --- a/modules/core/include/opencv2/core/openvx/ovx_defs.hpp +++ b/modules/core/include/opencv2/core/openvx/ovx_defs.hpp @@ -32,7 +32,9 @@ template <> inline bool skipSmallImages(int w, int h) { 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 < 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 < 120 * 60; } +template <> inline bool skipSmallImages(int w, int h) { return w*h < 800 * 600; } }} #define CV_OVX_RUN(condition, func, ...) \