potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2018-11-10 20:10:57 +00:00
parent c7d04c6c5c 56eebb926d
commit 1913482cf5
90 changed files with 6261 additions and 6657 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/src/accum.cpp
+2 -2
View File
@@ -291,11 +291,11 @@ static bool openvx_accumulate(InputArray _src, InputOutputArray _dst, InputArray
srcImage.swapHandle(); dstImage.swapHandle();
#endif
}
catch (ivx::RuntimeError & e)
catch (const ivx::RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (ivx::WrapperError & e)
catch (const ivx::WrapperError & e)
{
VX_DbgThrow(e.what());
}
modules/imgproc/src/box_filter.cpp
+1806
View File
File diff suppressed because it is too large Load Diff
modules/imgproc/src/contours.cpp
+3 -3
View File
@@ -1821,7 +1821,7 @@ cvFindContours_Impl( void* img, CvMemStorage* storage,
}
else
{
CV_TRY
try
{
scanner = cvStartFindContours_Impl( img, storage, cntHeaderSize, mode, method, offset,
needFillBorder);
@@ -1833,11 +1833,11 @@ cvFindContours_Impl( void* img, CvMemStorage* storage,
}
while( contour != 0 );
}
CV_CATCH_ALL
catch(...)
{
if( scanner )
cvEndFindContours(&scanner);
CV_RETHROW();
throw;
}
*firstContour = cvEndFindContours( &scanner );
modules/imgproc/src/deriv.cpp
+2 -2
View File
@@ -246,11 +246,11 @@ namespace cv
ivx::IVX_CHECK_STATUS(vxuSobel3x3(ctx, ia, NULL, ib));
ctx.setImmediateBorder(prevBorder);
}
catch (ivx::RuntimeError & e)
catch (const ivx::RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (ivx::WrapperError & e)
catch (const ivx::WrapperError & e)
{
VX_DbgThrow(e.what());
}
modules/imgproc/src/featureselect.cpp
+2 -2
View File
@@ -338,11 +338,11 @@ static bool openvx_harris(Mat image, OutputArray _corners,
ovxImage.swapHandle();
#endif
}
catch (RuntimeError & e)
catch (const RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (WrapperError & e)
catch (const WrapperError & e)
{
VX_DbgThrow(e.what());
}
modules/imgproc/src/histogram.cpp
+4 -4
View File
@@ -793,11 +793,11 @@ namespace cv
img.swapHandle();
#endif
}
catch (ivx::RuntimeError & e)
catch (const ivx::RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (ivx::WrapperError & e)
catch (const ivx::WrapperError & e)
{
VX_DbgThrow(e.what());
}
@@ -3313,11 +3313,11 @@ static bool openvx_equalize_hist(Mat srcMat, Mat dstMat)
srcImage.swapHandle(); dstImage.swapHandle();
#endif
}
catch (RuntimeError & e)
catch (const RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (WrapperError & e)
catch (const WrapperError & e)
{
VX_DbgThrow(e.what());
}
modules/imgproc/src/imgwarp.cpp
+2 -2
View File
@@ -1598,12 +1598,12 @@ static bool openvx_remap(Mat src, Mat dst, Mat map1, Mat map2, int interpolation
ctx.setImmediateBorder(prevBorder);
}
catch (ivx::RuntimeError & e)
catch (const ivx::RuntimeError & e)
{
CV_Error(CV_StsInternal, e.what());
return false;
}
catch (ivx::WrapperError & e)
catch (const ivx::WrapperError & e)
{
CV_Error(CV_StsInternal, e.what());
return false;
modules/imgproc/src/median_blur.cpp
+2 -2
View File
@@ -1068,11 +1068,11 @@ static bool openvx_medianFilter(InputArray _src, OutputArray _dst, int ksize)
#endif
ctx.setImmediateBorder(prevBorder);
}
catch (ivx::RuntimeError & e)
catch (const ivx::RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (ivx::WrapperError & e)
catch (const ivx::WrapperError & e)
{
VX_DbgThrow(e.what());
}
modules/imgproc/src/pyramids.cpp
+2 -2
View File
@@ -861,11 +861,11 @@ static bool openvx_pyrDown( InputArray _src, OutputArray _dst, const Size& _dsz,
srcImg.swapHandle(); dstImg.swapHandle();
#endif
}
catch (RuntimeError & e)
catch (const RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (WrapperError & e)
catch (const WrapperError & e)
{
VX_DbgThrow(e.what());
}
modules/imgproc/src/smooth.cpp
+2 -1636
View File
File diff suppressed because it is too large Load Diff
modules/imgproc/src/thresh.cpp
+2 -2
View File
@@ -1357,11 +1357,11 @@ static bool openvx_threshold(Mat src, Mat dst, int thresh, int maxval, int type)
}
#endif
}
catch (ivx::RuntimeError & e)
catch (const ivx::RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (ivx::WrapperError & e)
catch (const ivx::WrapperError & e)
{
VX_DbgThrow(e.what());
}