generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removing SuppressWarning and CV_OPENCL_RUN

Browse Source
This commit is contained in:
Andrey Pavlenko 2014-04-03 11:26:25 +04:00
parent 3578f0afe9
commit 925178749a
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/include/opencv2/core/utility.hpp
View File

@ -495,11 +495,6 @@ template<> inline std::string CommandLineParser::get<std::string>(const String&
} }
#endif // OPENCV_NOSTL #endif // OPENCV_NOSTL
#if !defined(OPENCV_SKIP_SUPPRESS_WARNING) || !OPENCV_SKIP_SUPPRESS_WARNING
// Use this to bypass "warning C4127: conditional expression is constant"
template <typename T> T SuppressWarning(T v) { return v; }
#endif
} //namespace cv } //namespace cv
#endif //__OPENCV_CORE_UTILITY_H__ #endif //__OPENCV_CORE_UTILITY_H__

21
modules/stitching/src/blenders.cpp
View File

@ -367,11 +367,11 @@ void MultiBandBlender::feed(InputArray _img, InputArray mask, Point tl)
for (int i = 0; i <= num_bands_; ++i) for (int i = 0; i <= num_bands_; ++i)
{ {
Rect rc(x_tl, y_tl, x_br - x_tl, y_br - y_tl); Rect rc(x_tl, y_tl, x_br - x_tl, y_br - y_tl);
CV_OPENCL_RUN(SuppressWarning(true), #ifdef HAVE_OPENCL
ocl_MultiBandBlender_feed(src_pyr_laplace[i], weight_pyr_gauss[i], if ( !cv::ocl::useOpenCL() ||
dst_pyr_laplace_[i](rc), !ocl_MultiBandBlender_feed(src_pyr_laplace[i], weight_pyr_gauss[i],
dst_band_weights_[i](rc)), dst_pyr_laplace_[i](rc), dst_band_weights_[i](rc)) )
goto next_band;) #endif
{ {
Mat _src_pyr_laplace = src_pyr_laplace[i].getMat(ACCESS_READ); Mat _src_pyr_laplace = src_pyr_laplace[i].getMat(ACCESS_READ);
Mat _dst_pyr_laplace = dst_pyr_laplace_[i](rc).getMat(ACCESS_RW); Mat _dst_pyr_laplace = dst_pyr_laplace_[i](rc).getMat(ACCESS_RW);
@ -414,9 +414,7 @@ void MultiBandBlender::feed(InputArray _img, InputArray mask, Point tl)
} }
} }
} }
#ifdef HAVE_OPENCL
next_band:
#endif
x_tl /= 2; y_tl /= 2; x_tl /= 2; y_tl /= 2;
x_br /= 2; y_br /= 2; x_br /= 2; y_br /= 2;
} }
@ -477,9 +475,10 @@ void normalizeUsingWeightMap(InputArray _weight, InputOutputArray _src)
return; return;
#endif #endif
CV_OPENCL_RUN(SuppressWarning(true), #ifdef HAVE_OPENCL
ocl_normalizeUsingWeightMap(_weight, _src), if ( !cv::ocl::useOpenCL() ||
return;) !ocl_normalizeUsingWeightMap(_weight, _src) )
#endif
{ {
Mat weight = _weight.getMat(); Mat weight = _weight.getMat();
Mat src = _src.getMat(); Mat src = _src.getMat();