Commit cc45c10f authored by Alexander Alekhin's avatar Alexander Alekhin

ocl: bailout from unsupported types

parent 13aa23f7
...@@ -59,11 +59,18 @@ static inline bool isOpenCLActivated() { return false; } ...@@ -59,11 +59,18 @@ static inline bool isOpenCLActivated() { return false; }
} }
#else #else
#define CV_OCL_RUN_(condition, func, ...) \ #define CV_OCL_RUN_(condition, func, ...) \
try \
{ \
if (cv::ocl::isOpenCLActivated() && (condition) && func) \ if (cv::ocl::isOpenCLActivated() && (condition) && func) \
{ \ { \
CV_IMPL_ADD(CV_IMPL_OCL); \ CV_IMPL_ADD(CV_IMPL_OCL); \
return __VA_ARGS__; \ return __VA_ARGS__; \
} } \
} \
catch (const cv::Exception& e) \
{ \
CV_UNUSED(e); /* TODO: Add some logging here */ \
}
#endif #endif
#else #else
......
...@@ -6005,6 +6005,7 @@ const char* typeToStr(int type) ...@@ -6005,6 +6005,7 @@ const char* typeToStr(int type)
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?" "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?"
}; };
int cn = CV_MAT_CN(type), depth = CV_MAT_DEPTH(type); int cn = CV_MAT_CN(type), depth = CV_MAT_DEPTH(type);
CV_Assert(depth != CV_16F); // Workaround for: https://github.com/opencv/opencv/issues/12824
return cn > 16 ? "?" : tab[depth*16 + cn-1]; return cn > 16 ? "?" : tab[depth*16 + cn-1];
} }
...@@ -6022,6 +6023,7 @@ const char* memopTypeToStr(int type) ...@@ -6022,6 +6023,7 @@ const char* memopTypeToStr(int type)
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?" "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?"
}; };
int cn = CV_MAT_CN(type), depth = CV_MAT_DEPTH(type); int cn = CV_MAT_CN(type), depth = CV_MAT_DEPTH(type);
CV_Assert(depth != CV_16F); // Workaround for: https://github.com/opencv/opencv/issues/12824
return cn > 16 ? "?" : tab[depth*16 + cn-1]; return cn > 16 ? "?" : tab[depth*16 + cn-1];
} }
...@@ -6039,6 +6041,7 @@ const char* vecopTypeToStr(int type) ...@@ -6039,6 +6041,7 @@ const char* vecopTypeToStr(int type)
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?" "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?"
}; };
int cn = CV_MAT_CN(type), depth = CV_MAT_DEPTH(type); int cn = CV_MAT_CN(type), depth = CV_MAT_DEPTH(type);
CV_Assert(depth != CV_16F); // Workaround for: https://github.com/opencv/opencv/issues/12824
return cn > 16 ? "?" : tab[depth*16 + cn-1]; return cn > 16 ? "?" : tab[depth*16 + cn-1];
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment