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

Merge pull request #13637 from berak:fix_openvx

Browse Source
This commit is contained in:
Alexander Alekhin 2019-01-18 14:56:31 +00:00
commit 40959fcc61
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/openvx/hal/openvx_hal.cpp vendored
View File

@ -188,8 +188,8 @@ int ovx_hal_mul(const T *a, size_t astep, const T *b, size_t bstep, T *c, size_t
refineStep(w, h, ivx::TypeToEnum<T>::imgType, astep); refineStep(w, h, ivx::TypeToEnum<T>::imgType, astep);
refineStep(w, h, ivx::TypeToEnum<T>::imgType, bstep); refineStep(w, h, ivx::TypeToEnum<T>::imgType, bstep);
refineStep(w, h, ivx::TypeToEnum<T>::imgType, cstep); refineStep(w, h, ivx::TypeToEnum<T>::imgType, cstep);
#ifdef _MSC_VER #ifdef _WIN32
const float MAGIC_SCALE = 0x0.01010102; const float MAGIC_SCALE = 0x0.01010102p0;
#else #else
const float MAGIC_SCALE = 0x1.010102p-8; const float MAGIC_SCALE = 0x1.010102p-8;
#endif #endif

5
3rdparty/openvx/include/ivx.hpp vendored
View File

@ -1718,8 +1718,7 @@ static const vx_enum
} }
#ifdef IVX_USE_OPENCV #ifdef IVX_USE_OPENCV
/// Convert image format (fourcc) to cv::Mat type /// Convert image format (fourcc) to cv::Mat type, throws WrapperError if not possible
/// \return CV_USRTYPE1 for unknown image formats
static int formatToMatType(vx_df_image format, vx_uint32 planeIdx = 0) static int formatToMatType(vx_df_image format, vx_uint32 planeIdx = 0)
{ {
switch (format) switch (format)
@ -1739,7 +1738,7 @@ static const vx_enum
case VX_DF_IMAGE_YUYV: return CV_8UC2; case VX_DF_IMAGE_YUYV: return CV_8UC2;
case VX_DF_IMAGE_NV12: case VX_DF_IMAGE_NV12:
case VX_DF_IMAGE_NV21: return planeIdx == 0 ? CV_8UC1 : CV_8UC2; case VX_DF_IMAGE_NV21: return planeIdx == 0 ? CV_8UC1 : CV_8UC2;
default: return CV_USRTYPE1; default: throw WrapperError(std::string(__func__)+"(): unsupported image format");
} }
} }

2
modules/imgproc/src/median_blur.cpp
View File

@ -990,9 +990,11 @@ static bool ocl_medianFilter(InputArray _src, OutputArray _dst, int m)
#endif #endif
#ifdef HAVE_OPENVX #ifdef HAVE_OPENVX
} // close anonymous namespace #13634
namespace ovx { namespace ovx {
template <> inline bool skipSmallImages<VX_KERNEL_MEDIAN_3x3>(int w, int h) { return w*h < 1280 * 720; } template <> inline bool skipSmallImages<VX_KERNEL_MEDIAN_3x3>(int w, int h) { return w*h < 1280 * 720; }
} }
namespace { // reopen it
static bool openvx_medianFilter(InputArray _src, OutputArray _dst, int ksize) static bool openvx_medianFilter(InputArray _src, OutputArray _dst, int ksize)
{ {
if (_src.type() != CV_8UC1 || _dst.type() != CV_8U if (_src.type() != CV_8UC1 || _dst.type() != CV_8U