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

refactor: don't use CV_ErrorNoReturn() internally

Browse Source
This commit is contained in:
Alexander Alekhin
2018-04-23 19:02:39 +03:00
parent 4ec456f0a0
commit 576d2dbac0
20 changed files with 60 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgcodecs/src/grfmt_bmp.cpp
+1 -1
View File
@@ -490,7 +490,7 @@ decode_rle8_bad: ;
result = true;
break;
default:
CV_ErrorNoReturn(cv::Error::StsError, "Invalid/unsupported mode");
CV_Error(cv::Error::StsError, "Invalid/unsupported mode");
}
}
CV_CATCH_ALL
modules/imgcodecs/src/grfmt_gdal.cpp
+1 -1
View File
@@ -409,7 +409,7 @@ bool GdalDecoder::readData( Mat& img ){
color = 3;
break;
default:
CV_ErrorNoReturn(cv::Error::StsError, "Invalid/unsupported mode");
CV_Error(cv::Error::StsError, "Invalid/unsupported mode");
}
// make sure the image band has the same dimensions as the image
modules/imgcodecs/src/grfmt_pxm.cpp
+2 -2
View File
@@ -77,7 +77,7 @@ static int ReadNumber(RLByteStream& strm, int maxdigits = 0)
else
{
#if 1
CV_ErrorNoReturn_(Error::StsError, ("PXM: Unexpected code in ReadNumber(): 0x%x (%d)", code, code));
CV_Error_(Error::StsError, ("PXM: Unexpected code in ReadNumber(): 0x%x (%d)", code, code));
#else
code = strm.getByte();
#endif
@@ -354,7 +354,7 @@ bool PxMDecoder::readData( Mat& img )
break;
}
default:
CV_ErrorNoReturn(Error::StsError, "m_bpp is not supported");
CV_Error(Error::StsError, "m_bpp is not supported");
}
}
CV_CATCH (cv::Exception, e)
modules/imgcodecs/src/loadsave.cpp
+1 -1
View File
@@ -722,7 +722,7 @@ bool imwrite( const String& filename, InputArray _img,
else if (_img.isMatVector() || _img.isUMatVector())
_img.getMatVector(img_vec);
else
CV_ErrorNoReturn(Error::StsBadArg, "Unknown/unsupported input encountered");
CV_Error(Error::StsBadArg, "Unknown/unsupported input encountered");
CV_Assert(!img_vec.empty());
return imwrite_(filename, img_vec, params, false);