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

Revert CV_TRY/CV_CATCH macros

Browse Source 
This reverts commit 7349b8f5ce (partially).
This commit is contained in:
Alexander Alekhin 2018-11-08 19:46:25 +03:00
parent e5d7f446d6
commit b74b05d1b3
18 changed files with 119 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/calib3d/src/calibinit.cpp
View File

@ -2236,13 +2236,13 @@ bool findCirclesGrid2(InputArray _image, Size patternSize,
void* oldCbkData; void* oldCbkData;
ErrorCallback oldCbk = redirectError(quiet_error, 0, &oldCbkData); // FIXIT not thread safe ErrorCallback oldCbk = redirectError(quiet_error, 0, &oldCbkData); // FIXIT not thread safe
#endif #endif
CV_TRY try
{ {
isFound = boxFinder.findHoles(); isFound = boxFinder.findHoles();
} }
CV_CATCH(Exception, e) catch (const cv::Exception &)
{ {
CV_UNUSED(e);
} }
#if BE_QUIET #if BE_QUIET
redirectError(oldCbk, oldCbkData); redirectError(oldCbk, oldCbkData);

24
modules/core/src/command_line_parser.cpp
View File

@ -124,7 +124,7 @@ static void from_str(const String& str, int type, void* dst)
void CommandLineParser::getByName(const String& name, bool space_delete, int type, void* dst) const void CommandLineParser::getByName(const String& name, bool space_delete, int type, void* dst) const
{ {
CV_TRY try
{ {
for (size_t i = 0; i < impl->data.size(); i++) for (size_t i = 0; i < impl->data.size(); i++)
{ {
@ -149,19 +149,20 @@ void CommandLineParser::getByName(const String& name, bool space_delete, int typ
} }
} }
} }
CV_CATCH (Exception, e) catch (Exception& e)
{ {
impl->error = true; impl->error = true;
impl->error_message = impl->error_message + "Parameter '"+ name + "': " + e.err + "\n"; impl->error_message = impl->error_message + "Parameter '"+ name + "': " + e.err + "\n";
return; return;
} }
CV_Error_(Error::StsBadArg, ("undeclared key '%s' requested", name.c_str())); CV_Error_(Error::StsBadArg, ("undeclared key '%s' requested", name.c_str()));
} }
void CommandLineParser::getByIndex(int index, bool space_delete, int type, void* dst) const void CommandLineParser::getByIndex(int index, bool space_delete, int type, void* dst) const
{ {
CV_TRY try
{ {
for (size_t i = 0; i < impl->data.size(); i++) for (size_t i = 0; i < impl->data.size(); i++)
{ {
@ -181,12 +182,13 @@ void CommandLineParser::getByIndex(int index, bool space_delete, int type, void*
} }
} }
} }
CV_CATCH(Exception, e) catch(Exception& e)
{ {
impl->error = true; impl->error = true;
impl->error_message = impl->error_message + format("Parameter #%d: ", index) + e.err + "\n"; impl->error_message = impl->error_message + format("Parameter #%d: ", index) + e.err + "\n";
return; return;
} }
CV_Error_(Error::StsBadArg, ("undeclared position %d requested", index)); CV_Error_(Error::StsBadArg, ("undeclared position %d requested", index));
} }
@ -460,13 +462,14 @@ std::vector<String> CommandLineParser::Impl::split_range_string(const String& _s
std::vector<String> vec; std::vector<String> vec;
String word = ""; String word = "";
bool begin = false; bool begin = false;
while (!str.empty()) while (!str.empty())
{ {
if (str[0] == fs) if (str[0] == fs)
{ {
if (begin == true) if (begin == true)
{ {
CV_THROW (cv::Exception(CV_StsParseError, throw cv::Exception(CV_StsParseError,
String("error in split_range_string(") String("error in split_range_string(")
+ str + str
+ String(", ") + String(", ")
@ -475,7 +478,7 @@ std::vector<String> CommandLineParser::Impl::split_range_string(const String& _s
+ String(1, ss) + String(1, ss)
+ String(")"), + String(")"),
"", __FILE__, __LINE__ "", __FILE__, __LINE__
)); );
} }
begin = true; begin = true;
word = ""; word = "";
@ -486,7 +489,7 @@ std::vector<String> CommandLineParser::Impl::split_range_string(const String& _s
{ {
if (begin == false) if (begin == false)
{ {
CV_THROW (cv::Exception(CV_StsParseError, throw cv::Exception(CV_StsParseError,
String("error in split_range_string(") String("error in split_range_string(")
+ str + str
+ String(", ") + String(", ")
@ -495,7 +498,7 @@ std::vector<String> CommandLineParser::Impl::split_range_string(const String& _s
+ String(1, ss) + String(1, ss)
+ String(")"), + String(")"),
"", __FILE__, __LINE__ "", __FILE__, __LINE__
)); );
} }
begin = false; begin = false;
vec.push_back(word); vec.push_back(word);
@ -510,7 +513,7 @@ std::vector<String> CommandLineParser::Impl::split_range_string(const String& _s
if (begin == true) if (begin == true)
{ {
CV_THROW (cv::Exception(CV_StsParseError, throw cv::Exception(CV_StsParseError,
String("error in split_range_string(") String("error in split_range_string(")
+ str + str
+ String(", ") + String(", ")
@ -519,8 +522,9 @@ std::vector<String> CommandLineParser::Impl::split_range_string(const String& _s
+ String(1, ss) + String(1, ss)
+ String(")"), + String(")"),
"", __FILE__, __LINE__ "", __FILE__, __LINE__
)); );
} }
return vec; return vec;
} }

6
modules/core/src/glob.cpp
View File

@ -231,7 +231,7 @@ static void glob_rec(const cv::String& directory, const cv::String& wildchart, s
if ((dir = opendir (directory.c_str())) != 0) if ((dir = opendir (directory.c_str())) != 0)
{ {
/* find all the files and directories within directory */ /* find all the files and directories within directory */
CV_TRY try
{ {
struct dirent *ent; struct dirent *ent;
while ((ent = readdir (dir)) != 0) while ((ent = readdir (dir)) != 0)
@ -255,10 +255,10 @@ static void glob_rec(const cv::String& directory, const cv::String& wildchart, s
result.push_back(entry); result.push_back(entry);
} }
} }
CV_CATCH_ALL catch (...)
{ {
closedir(dir); closedir(dir);
CV_RETHROW(); throw;
} }
closedir(dir); closedir(dir);
} }

6
modules/core/src/lda.cpp
View File

@ -866,7 +866,7 @@ private:
d = alloc_1d<double> (n); d = alloc_1d<double> (n);
e = alloc_1d<double> (n); e = alloc_1d<double> (n);
ort = alloc_1d<double> (n); ort = alloc_1d<double> (n);
CV_TRY { try {
// Reduce to Hessenberg form. // Reduce to Hessenberg form.
orthes(); orthes();
// Reduce Hessenberg to real Schur form. // Reduce Hessenberg to real Schur form.
@ -884,10 +884,10 @@ private:
// Deallocate the memory by releasing all internal working data. // Deallocate the memory by releasing all internal working data.
release(); release();
} }
CV_CATCH_ALL catch (...)
{ {
release(); release();
CV_RETHROW(); throw;
} }
} }

6
modules/core/src/matrix.cpp
View File

@ -416,7 +416,7 @@ Mat::Mat(const Mat& m, const Range& _rowRange, const Range& _colRange)
} }
*this = m; *this = m;
CV_TRY try
{ {
if( _rowRange != Range::all() && _rowRange != Range(0,rows) ) if( _rowRange != Range::all() && _rowRange != Range(0,rows) )
{ {
@ -436,10 +436,10 @@ Mat::Mat(const Mat& m, const Range& _rowRange, const Range& _colRange)
flags |= SUBMATRIX_FLAG; flags |= SUBMATRIX_FLAG;
} }
} }
CV_CATCH_ALL catch(...)
{ {
release(); release();
CV_RETHROW(); throw;
} }
updateContinuityFlag(); updateContinuityFlag();

4
modules/core/src/ocl.cpp
View File

@ -894,11 +894,11 @@ bool useOpenCL()
CoreTLSData* data = getCoreTlsData().get(); CoreTLSData* data = getCoreTlsData().get();
if( data->useOpenCL < 0 ) if( data->useOpenCL < 0 )
{ {
CV_TRY try
{ {
data->useOpenCL = (int)(haveOpenCL() && Device::getDefault().ptr() && Device::getDefault().available()) ? 1 : 0; data->useOpenCL = (int)(haveOpenCL() && Device::getDefault().ptr() && Device::getDefault().available()) ? 1 : 0;
} }
CV_CATCH_ALL catch (...)
{ {
data->useOpenCL = 0; data->useOpenCL = 0;
} }

2
modules/core/src/system.cpp
View File

@ -1025,7 +1025,7 @@ void error( const Exception& exc )
*p = 0; *p = 0;
} }
CV_THROW(exc); throw exc;
} }
void error(int _code, const String& _err, const char* _func, const char* _file, int _line) void error(int _code, const String& _err, const char* _func, const char* _file, int _line)

8
modules/core/src/umatrix.cpp
View File

@ -367,11 +367,11 @@ UMat Mat::getUMat(int accessFlags, UMatUsageFlags usageFlags) const
new_u->originalUMatData = u; new_u->originalUMatData = u;
} }
bool allocated = false; bool allocated = false;
CV_TRY try
{ {
allocated = UMat::getStdAllocator()->allocate(new_u, accessFlags, usageFlags); allocated = UMat::getStdAllocator()->allocate(new_u, accessFlags, usageFlags);
} }
CV_CATCH(cv::Exception, e) catch (const cv::Exception& e)
{ {
fprintf(stderr, "Exception: %s\n", e.what()); fprintf(stderr, "Exception: %s\n", e.what());
} }
@ -442,12 +442,12 @@ void UMat::create(int d, const int* _sizes, int _type, UMatUsageFlags _usageFlag
a = a0; a = a0;
a0 = Mat::getDefaultAllocator(); a0 = Mat::getDefaultAllocator();
} }
CV_TRY try
{ {
u = a->allocate(dims, size, _type, 0, step.p, 0, usageFlags); u = a->allocate(dims, size, _type, 0, step.p, 0, usageFlags);
CV_Assert(u != 0); CV_Assert(u != 0);
} }
CV_CATCH_ALL catch(...)
{ {
if(a != a0) if(a != a0)
u = a0->allocate(dims, size, _type, 0, step.p, 0, usageFlags); u = a0->allocate(dims, size, _type, 0, step.p, 0, usageFlags);

4
modules/imgcodecs/src/bitstrm.cpp
View File

@ -99,7 +99,7 @@ void RBaseStream::readBlock()
{ {
if( m_block_pos == 0 && m_current < m_end ) if( m_block_pos == 0 && m_current < m_end )
return; return;
CV_THROW (RBS_THROW_EOS); throw RBS_THROW_EOS;
} }
fseek( m_file, m_block_pos, SEEK_SET ); fseek( m_file, m_block_pos, SEEK_SET );
@ -107,7 +107,7 @@ void RBaseStream::readBlock()
m_end = m_start + readed; m_end = m_start + readed;
if( readed == 0 || m_current >= m_end ) if( readed == 0 || m_current >= m_end )
CV_THROW (RBS_THROW_EOS); throw RBS_THROW_EOS;
} }

19
modules/imgcodecs/src/exif.cpp
View File

@ -80,15 +80,14 @@ ExifReader::~ExifReader()
*/ */
bool ExifReader::parse() bool ExifReader::parse()
{ {
CV_TRY { try {
m_exif = getExif(); m_exif = getExif();
if( !m_exif.empty() ) if( !m_exif.empty() )
{ {
return true; return true;
} }
return false; return false;
} CV_CATCH (ExifParsingError, e) { } catch (ExifParsingError&) {
CV_UNUSED(e);
return false; return false;
} }
} }
@ -152,11 +151,11 @@ std::map<int, ExifEntry_t > ExifReader::getExif()
case COM: case COM:
bytesToSkip = getFieldSize(); bytesToSkip = getFieldSize();
if (bytesToSkip < markerSize) { if (bytesToSkip < markerSize) {
CV_THROW (ExifParsingError()); throw ExifParsingError();
} }
m_stream.seekg( static_cast<long>( bytesToSkip - markerSize ), m_stream.cur ); m_stream.seekg( static_cast<long>( bytesToSkip - markerSize ), m_stream.cur );
if ( m_stream.fail() ) { if ( m_stream.fail() ) {
CV_THROW (ExifParsingError()); throw ExifParsingError();
} }
break; break;
@ -167,12 +166,12 @@ std::map<int, ExifEntry_t > ExifReader::getExif()
case APP1: //actual Exif Marker case APP1: //actual Exif Marker
exifSize = getFieldSize(); exifSize = getFieldSize();
if (exifSize <= offsetToTiffHeader) { if (exifSize <= offsetToTiffHeader) {
CV_THROW (ExifParsingError()); throw ExifParsingError();
} }
m_data.resize( exifSize - offsetToTiffHeader ); m_data.resize( exifSize - offsetToTiffHeader );
m_stream.seekg( static_cast<long>( offsetToTiffHeader ), m_stream.cur ); m_stream.seekg( static_cast<long>( offsetToTiffHeader ), m_stream.cur );
if ( m_stream.fail() ) { if ( m_stream.fail() ) {
CV_THROW (ExifParsingError()); throw ExifParsingError();
} }
m_stream.read( reinterpret_cast<char*>(&m_data[0]), exifSize - offsetToTiffHeader ); m_stream.read( reinterpret_cast<char*>(&m_data[0]), exifSize - offsetToTiffHeader );
exifFound = true; exifFound = true;
@ -416,7 +415,7 @@ std::string ExifReader::getString(const size_t offset) const
dataOffset = getU32( offset + 8 ); dataOffset = getU32( offset + 8 );
} }
if (dataOffset > m_data.size() || dataOffset + size > m_data.size()) { if (dataOffset > m_data.size() || dataOffset + size > m_data.size()) {
CV_THROW (ExifParsingError()); throw ExifParsingError();
} }
std::vector<uint8_t>::const_iterator it = m_data.begin() + dataOffset; std::vector<uint8_t>::const_iterator it = m_data.begin() + dataOffset;
std::string result( it, it + size ); //copy vector content into result std::string result( it, it + size ); //copy vector content into result
@ -433,7 +432,7 @@ std::string ExifReader::getString(const size_t offset) const
uint16_t ExifReader::getU16(const size_t offset) const uint16_t ExifReader::getU16(const size_t offset) const
{ {
if (offset + 1 >= m_data.size()) if (offset + 1 >= m_data.size())
CV_THROW (ExifParsingError()); throw ExifParsingError();
if( m_format == INTEL ) if( m_format == INTEL )
{ {
@ -451,7 +450,7 @@ uint16_t ExifReader::getU16(const size_t offset) const
uint32_t ExifReader::getU32(const size_t offset) const uint32_t ExifReader::getU32(const size_t offset) const
{ {
if (offset + 3 >= m_data.size()) if (offset + 3 >= m_data.size())
CV_THROW (ExifParsingError()); throw ExifParsingError();
if( m_format == INTEL ) if( m_format == INTEL )
{ {

12
modules/imgcodecs/src/grfmt_bmp.cpp
View File

@ -89,7 +89,7 @@ bool BmpDecoder::readHeader()
else if( !m_strm.open( m_filename )) else if( !m_strm.open( m_filename ))
return false; return false;
CV_TRY try
{ {
m_strm.skip( 10 ); m_strm.skip( 10 );
m_offset = m_strm.getDWord(); m_offset = m_strm.getDWord();
@ -173,9 +173,9 @@ bool BmpDecoder::readHeader()
} }
} }
} }
CV_CATCH_ALL catch(...)
{ {
CV_RETHROW(); throw;
} }
// in 32 bit case alpha channel is used - so require CV_8UC4 type // in 32 bit case alpha channel is used - so require CV_8UC4 type
m_type = iscolor ? (m_bpp == 32 ? CV_8UC4 : CV_8UC3 ) : CV_8UC1; m_type = iscolor ? (m_bpp == 32 ? CV_8UC4 : CV_8UC3 ) : CV_8UC1;
@ -225,7 +225,7 @@ bool BmpDecoder::readData( Mat& img )
} }
uchar *src = _src.data(), *bgr = _bgr.data(); uchar *src = _src.data(), *bgr = _bgr.data();
CV_TRY try
{ {
m_strm.setPos( m_offset ); m_strm.setPos( m_offset );
@ -490,9 +490,9 @@ decode_rle8_bad: ;
CV_Error(cv::Error::StsError, "Invalid/unsupported mode"); CV_Error(cv::Error::StsError, "Invalid/unsupported mode");
} }
} }
CV_CATCH_ALL catch(...)
{ {
CV_RETHROW(); throw;
} }
return result; return result;

36
modules/imgcodecs/src/grfmt_pam.cpp
View File

@ -379,25 +379,25 @@ bool PAMDecoder::readHeader()
} }
else if( !m_strm.open( m_filename )) else if( !m_strm.open( m_filename ))
return false; return false;
CV_TRY try
{ {
byte = m_strm.getByte(); byte = m_strm.getByte();
if( byte != 'P' ) if( byte != 'P' )
CV_THROW( RBS_BAD_HEADER ); throw RBS_BAD_HEADER;
byte = m_strm.getByte(); byte = m_strm.getByte();
if (byte != '7') if (byte != '7')
CV_THROW( RBS_BAD_HEADER ); throw RBS_BAD_HEADER;
byte = m_strm.getByte(); byte = m_strm.getByte();
if (byte != '\n' && byte != '\r') if (byte != '\n' && byte != '\r')
CV_THROW( RBS_BAD_HEADER ); throw RBS_BAD_HEADER;
uint i; uint i;
memset (&flds, 0x00, sizeof (struct parsed_fields)); memset (&flds, 0x00, sizeof (struct parsed_fields));
do { do {
if (!ReadPAMHeaderLine(m_strm, fieldtype, value)) if (!ReadPAMHeaderLine(m_strm, fieldtype, value))
CV_THROW( RBS_BAD_HEADER ); throw RBS_BAD_HEADER;
switch (fieldtype) { switch (fieldtype) {
case PAM_HEADER_NONE: case PAM_HEADER_NONE:
case PAM_HEADER_COMMENT: case PAM_HEADER_COMMENT:
@ -407,32 +407,32 @@ bool PAMDecoder::readHeader()
break; break;
case PAM_HEADER_HEIGHT: case PAM_HEADER_HEIGHT:
if (flds.height) if (flds.height)
CV_THROW( RBS_BAD_HEADER ); throw RBS_BAD_HEADER;
if (!ParseNumber (value, &m_height)) if (!ParseNumber (value, &m_height))
CV_THROW( RBS_BAD_HEADER ); throw RBS_BAD_HEADER;
flds.height = true; flds.height = true;
break; break;
case PAM_HEADER_WIDTH: case PAM_HEADER_WIDTH:
if (flds.width) if (flds.width)
CV_THROW( RBS_BAD_HEADER ); throw RBS_BAD_HEADER;
if (!ParseNumber (value, &m_width)) if (!ParseNumber (value, &m_width))
CV_THROW( RBS_BAD_HEADER ); throw RBS_BAD_HEADER;
flds.width = true; flds.width = true;
break; break;
case PAM_HEADER_DEPTH: case PAM_HEADER_DEPTH:
if (flds.depth) if (flds.depth)
CV_THROW( RBS_BAD_HEADER ); throw RBS_BAD_HEADER;
if (!ParseNumber (value, &m_channels)) if (!ParseNumber (value, &m_channels))
CV_THROW( RBS_BAD_HEADER ); throw RBS_BAD_HEADER;
flds.depth = true; flds.depth = true;
break; break;
case PAM_HEADER_MAXVAL: case PAM_HEADER_MAXVAL:
if (flds.maxval) if (flds.maxval)
CV_THROW( RBS_BAD_HEADER ); throw RBS_BAD_HEADER;
if (!ParseNumber (value, &m_maxval)) if (!ParseNumber (value, &m_maxval))
CV_THROW( RBS_BAD_HEADER ); throw RBS_BAD_HEADER;
if ( m_maxval > 65535 ) if ( m_maxval > 65535 )
CV_THROW( RBS_BAD_HEADER ); throw RBS_BAD_HEADER;
if ( m_maxval > 255 ) { if ( m_maxval > 255 ) {
m_sampledepth = CV_16U; m_sampledepth = CV_16U;
} }
@ -451,7 +451,7 @@ bool PAMDecoder::readHeader()
} }
break; break;
default: default:
CV_THROW( RBS_BAD_HEADER ); throw RBS_BAD_HEADER;
} }
} while (fieldtype != PAM_HEADER_ENDHDR); } while (fieldtype != PAM_HEADER_ENDHDR);
@ -469,7 +469,7 @@ bool PAMDecoder::readHeader()
return true; return true;
} }
} CV_CATCH_ALL } catch(...)
{ {
} }
@ -512,7 +512,7 @@ bool PAMDecoder::readData( Mat& img )
} }
} }
CV_TRY try
{ {
m_strm.setPos( m_offset ); m_strm.setPos( m_offset );
@ -610,7 +610,7 @@ bool PAMDecoder::readData( Mat& img )
} }
res = true; res = true;
} CV_CATCH_ALL } catch(...)
{ {
} }

28
modules/imgcodecs/src/grfmt_pxm.cpp
View File

@ -150,11 +150,11 @@ bool PxMDecoder::readHeader()
else if( !m_strm.open( m_filename )) else if( !m_strm.open( m_filename ))
return false; return false;
CV_TRY try
{ {
int code = m_strm.getByte(); int code = m_strm.getByte();
if( code != 'P' ) if( code != 'P' )
CV_THROW (RBS_BAD_HEADER); throw RBS_BAD_HEADER;
code = m_strm.getByte(); code = m_strm.getByte();
switch( code ) switch( code )
@ -162,7 +162,7 @@ bool PxMDecoder::readHeader()
case '1': case '4': m_bpp = 1; break; case '1': case '4': m_bpp = 1; break;
case '2': case '5': m_bpp = 8; break; case '2': case '5': m_bpp = 8; break;
case '3': case '6': m_bpp = 24; break; case '3': case '6': m_bpp = 24; break;
default: CV_THROW (RBS_BAD_HEADER); default: throw RBS_BAD_HEADER;
} }
m_binary = code >= '4'; m_binary = code >= '4';
@ -173,7 +173,7 @@ bool PxMDecoder::readHeader()
m_maxval = m_bpp == 1 ? 1 : ReadNumber(m_strm); m_maxval = m_bpp == 1 ? 1 : ReadNumber(m_strm);
if( m_maxval > 65535 ) if( m_maxval > 65535 )
CV_THROW (RBS_BAD_HEADER); throw RBS_BAD_HEADER;
//if( m_maxval > 255 ) m_binary = false; nonsense //if( m_maxval > 255 ) m_binary = false; nonsense
if( m_maxval > 255 ) if( m_maxval > 255 )
@ -185,15 +185,14 @@ bool PxMDecoder::readHeader()
result = true; result = true;
} }
} }
CV_CATCH (cv::Exception, e) catch (const cv::Exception&)
{ {
CV_UNUSED(e); throw;
CV_RETHROW();
} }
CV_CATCH_ALL catch (...)
{ {
std::cerr << "PXM::readHeader(): unknown C++ exception" << std::endl << std::flush; std::cerr << "PXM::readHeader(): unknown C++ exception" << std::endl << std::flush;
CV_RETHROW(); throw;
} }
if( !result ) if( !result )
@ -233,7 +232,7 @@ bool PxMDecoder::readData( Mat& img )
FillGrayPalette( palette, m_bpp==1 ? 1 : 8 , m_bpp == 1 ); FillGrayPalette( palette, m_bpp==1 ? 1 : 8 , m_bpp == 1 );
} }
CV_TRY try
{ {
m_strm.setPos( m_offset ); m_strm.setPos( m_offset );
@ -359,15 +358,14 @@ bool PxMDecoder::readData( Mat& img )
CV_Error(Error::StsError, "m_bpp is not supported"); CV_Error(Error::StsError, "m_bpp is not supported");
} }
} }
CV_CATCH (cv::Exception, e) catch (const cv::Exception&)
{ {
CV_UNUSED(e); throw;
CV_RETHROW();
} }
CV_CATCH_ALL catch (...)
{ {
std::cerr << "PXM::readData(): unknown exception" << std::endl << std::flush; std::cerr << "PXM::readData(): unknown exception" << std::endl << std::flush;
CV_RETHROW(); throw;
} }
return result; return result;

8
modules/imgcodecs/src/grfmt_sunras.cpp
View File

@ -84,7 +84,7 @@ bool SunRasterDecoder::readHeader()
if( !m_strm.open( m_filename )) return false; if( !m_strm.open( m_filename )) return false;
CV_TRY try
{ {
m_strm.skip( 4 ); m_strm.skip( 4 );
m_width = m_strm.getDWord(); m_width = m_strm.getDWord();
@ -144,7 +144,7 @@ bool SunRasterDecoder::readHeader()
} }
} }
} }
CV_CATCH_ALL catch(...)
{ {
} }
@ -179,7 +179,7 @@ bool SunRasterDecoder::readData( Mat& img )
if( !color && m_maptype == RMT_EQUAL_RGB ) if( !color && m_maptype == RMT_EQUAL_RGB )
CvtPaletteToGray( m_palette, gray_palette, 1 << m_bpp ); CvtPaletteToGray( m_palette, gray_palette, 1 << m_bpp );
CV_TRY try
{ {
m_strm.setPos( m_offset ); m_strm.setPos( m_offset );
@ -376,7 +376,7 @@ bad_decoding_end:
CV_Error(Error::StsInternal, ""); CV_Error(Error::StsInternal, "");
} }
} }
CV_CATCH_ALL catch( ... )
{ {
} }

36
modules/imgcodecs/src/loadsave.cpp
View File

@ -437,18 +437,18 @@ imread_( const String& filename, int flags, int hdrtype, Mat* mat=0 )
/// set the filename in the driver /// set the filename in the driver
decoder->setSource( filename ); decoder->setSource( filename );
CV_TRY try
{ {
// read the header to make sure it succeeds // read the header to make sure it succeeds
if( !decoder->readHeader() ) if( !decoder->readHeader() )
return 0; return 0;
} }
CV_CATCH (cv::Exception, e) catch (const cv::Exception& e)
{ {
std::cerr << "imread_('" << filename << "'): can't read header: " << e.what() << std::endl << std::flush; std::cerr << "imread_('" << filename << "'): can't read header: " << e.what() << std::endl << std::flush;
return 0; return 0;
} }
CV_CATCH_ALL catch (...)
{ {
std::cerr << "imread_('" << filename << "'): can't read header: unknown exception" << std::endl << std::flush; std::cerr << "imread_('" << filename << "'): can't read header: unknown exception" << std::endl << std::flush;
return 0; return 0;
@ -493,16 +493,16 @@ imread_( const String& filename, int flags, int hdrtype, Mat* mat=0 )
// read the image data // read the image data
bool success = false; bool success = false;
CV_TRY try
{ {
if (decoder->readData(*data)) if (decoder->readData(*data))
success = true; success = true;
} }
CV_CATCH (cv::Exception, e) catch (const cv::Exception& e)
{ {
std::cerr << "imread_('" << filename << "'): can't read data: " << e.what() << std::endl << std::flush; std::cerr << "imread_('" << filename << "'): can't read data: " << e.what() << std::endl << std::flush;
} }
CV_CATCH_ALL catch (...)
{ {
std::cerr << "imread_('" << filename << "'): can't read data: unknown exception" << std::endl << std::flush; std::cerr << "imread_('" << filename << "'): can't read data: unknown exception" << std::endl << std::flush;
} }
@ -559,18 +559,18 @@ imreadmulti_(const String& filename, int flags, std::vector<Mat>& mats)
decoder->setSource(filename); decoder->setSource(filename);
// read the header to make sure it succeeds // read the header to make sure it succeeds
CV_TRY try
{ {
// read the header to make sure it succeeds // read the header to make sure it succeeds
if( !decoder->readHeader() ) if( !decoder->readHeader() )
return 0; return 0;
} }
CV_CATCH (cv::Exception, e) catch (const cv::Exception& e)
{ {
std::cerr << "imreadmulti_('" << filename << "'): can't read header: " << e.what() << std::endl << std::flush; std::cerr << "imreadmulti_('" << filename << "'): can't read header: " << e.what() << std::endl << std::flush;
return 0; return 0;
} }
CV_CATCH_ALL catch (...)
{ {
std::cerr << "imreadmulti_('" << filename << "'): can't read header: unknown exception" << std::endl << std::flush; std::cerr << "imreadmulti_('" << filename << "'): can't read header: unknown exception" << std::endl << std::flush;
return 0; return 0;
@ -598,16 +598,16 @@ imreadmulti_(const String& filename, int flags, std::vector<Mat>& mats)
// read the image data // read the image data
Mat mat(size.height, size.width, type); Mat mat(size.height, size.width, type);
bool success = false; bool success = false;
CV_TRY try
{ {
if (decoder->readData(mat)) if (decoder->readData(mat))
success = true; success = true;
} }
CV_CATCH (cv::Exception, e) catch (const cv::Exception& e)
{ {
std::cerr << "imreadmulti_('" << filename << "'): can't read data: " << e.what() << std::endl << std::flush; std::cerr << "imreadmulti_('" << filename << "'): can't read data: " << e.what() << std::endl << std::flush;
} }
CV_CATCH_ALL catch (...)
{ {
std::cerr << "imreadmulti_('" << filename << "'): can't read data: unknown exception" << std::endl << std::flush; std::cerr << "imreadmulti_('" << filename << "'): can't read data: unknown exception" << std::endl << std::flush;
} }
@ -777,16 +777,16 @@ imdecode_( const Mat& buf, int flags, int hdrtype, Mat* mat=0 )
} }
bool success = false; bool success = false;
CV_TRY try
{ {
if (decoder->readHeader()) if (decoder->readHeader())
success = true; success = true;
} }
CV_CATCH (cv::Exception, e) catch (const cv::Exception& e)
{ {
std::cerr << "imdecode_('" << filename << "'): can't read header: " << e.what() << std::endl << std::flush; std::cerr << "imdecode_('" << filename << "'): can't read header: " << e.what() << std::endl << std::flush;
} }
CV_CATCH_ALL catch (...)
{ {
std::cerr << "imdecode_('" << filename << "'): can't read header: unknown exception" << std::endl << std::flush; std::cerr << "imdecode_('" << filename << "'): can't read header: unknown exception" << std::endl << std::flush;
} }
@ -839,16 +839,16 @@ imdecode_( const Mat& buf, int flags, int hdrtype, Mat* mat=0 )
} }
success = false; success = false;
CV_TRY try
{ {
if (decoder->readData(*data)) if (decoder->readData(*data))
success = true; success = true;
} }
CV_CATCH (cv::Exception, e) catch (const cv::Exception& e)
{ {
std::cerr << "imdecode_('" << filename << "'): can't read data: " << e.what() << std::endl << std::flush; std::cerr << "imdecode_('" << filename << "'): can't read data: " << e.what() << std::endl << std::flush;
} }
CV_CATCH_ALL catch (...)
{ {
std::cerr << "imdecode_('" << filename << "'): can't read data: unknown exception" << std::endl << std::flush; std::cerr << "imdecode_('" << filename << "'): can't read data: unknown exception" << std::endl << std::flush;
} }

6
modules/imgproc/src/contours.cpp
View File

@ -1820,7 +1820,7 @@ cvFindContours_Impl( void* img, CvMemStorage* storage,
} }
else else
{ {
CV_TRY try
{ {
scanner = cvStartFindContours_Impl( img, storage, cntHeaderSize, mode, method, offset, scanner = cvStartFindContours_Impl( img, storage, cntHeaderSize, mode, method, offset,
needFillBorder); needFillBorder);
@ -1832,11 +1832,11 @@ cvFindContours_Impl( void* img, CvMemStorage* storage,
} }
while( contour != 0 ); while( contour != 0 );
} }
CV_CATCH_ALL catch(...)
{ {
if( scanner ) if( scanner )
cvEndFindContours(&scanner); cvEndFindContours(&scanner);
CV_RETHROW(); throw;
} }
*firstContour = cvEndFindContours( &scanner ); *firstContour = cvEndFindContours( &scanner );

12
modules/objdetect/src/detection_based_tracker.cpp
View File

@ -284,23 +284,23 @@ bool cv::DetectionBasedTracker::SeparateDetectionWork::run()
} }
#define CATCH_ALL_AND_LOG(_block) \ #define CATCH_ALL_AND_LOG(_block) \
CV_TRY { \ try { \
_block; \ _block; \
} \ } \
CV_CATCH(cv::Exception, e) { \ catch(cv::Exception& e) { \
LOGE0("\n %s: ERROR: OpenCV Exception caught: \n'%s'\n\n", CV_Func, e.what()); \ LOGE0("\n %s: ERROR: OpenCV Exception caught: \n'%s'\n\n", CV_Func, e.what()); \
} CV_CATCH(std::exception, e) { \ } catch(std::exception& e) { \
LOGE0("\n %s: ERROR: Exception caught: \n'%s'\n\n", CV_Func, e.what()); \ LOGE0("\n %s: ERROR: Exception caught: \n'%s'\n\n", CV_Func, e.what()); \
} CV_CATCH_ALL { \ } catch(...) { \
LOGE0("\n %s: ERROR: UNKNOWN Exception caught\n\n", CV_Func); \ LOGE0("\n %s: ERROR: UNKNOWN Exception caught\n\n", CV_Func); \
} }
void* cv::workcycleObjectDetectorFunction(void* p) void* cv::workcycleObjectDetectorFunction(void* p)
{ {
CATCH_ALL_AND_LOG({ ((cv::DetectionBasedTracker::SeparateDetectionWork*)p)->workcycleObjectDetector(); }); CATCH_ALL_AND_LOG({ ((cv::DetectionBasedTracker::SeparateDetectionWork*)p)->workcycleObjectDetector(); });
CV_TRY{ try{
((cv::DetectionBasedTracker::SeparateDetectionWork*)p)->init(); ((cv::DetectionBasedTracker::SeparateDetectionWork*)p)->init();
} CV_CATCH_ALL { } catch(...) {
LOGE0("DetectionBasedTracker: workcycleObjectDetectorFunction: ERROR concerning pointer, received as the function parameter"); LOGE0("DetectionBasedTracker: workcycleObjectDetectorFunction: ERROR concerning pointer, received as the function parameter");
} }
return NULL; return NULL;

14
modules/objdetect/src/hog.cpp
View File

@ -3685,7 +3685,7 @@ void HOGDescriptor::readALTModel(String modelfile)
String eerr("file not exist"); String eerr("file not exist");
String efile(__FILE__); String efile(__FILE__);
String efunc(__FUNCTION__); String efunc(__FUNCTION__);
CV_THROW (Exception(Error::StsError, eerr, efile, efunc, __LINE__)); throw Exception(Error::StsError, eerr, efile, efunc, __LINE__);
} }
char version_buffer[10]; char version_buffer[10];
if (!fread (&version_buffer,sizeof(char),10,modelfl)) if (!fread (&version_buffer,sizeof(char),10,modelfl))
@ -3695,7 +3695,7 @@ void HOGDescriptor::readALTModel(String modelfile)
String efunc(__FUNCTION__); String efunc(__FUNCTION__);
fclose(modelfl); fclose(modelfl);
CV_THROW (Exception(Error::StsError, eerr, efile, efunc, __LINE__)); throw Exception(Error::StsError, eerr, efile, efunc, __LINE__);
} }
if(strcmp(version_buffer,"V6.01")) { if(strcmp(version_buffer,"V6.01")) {
String eerr("version does not match"); String eerr("version does not match");
@ -3703,14 +3703,14 @@ void HOGDescriptor::readALTModel(String modelfile)
String efunc(__FUNCTION__); String efunc(__FUNCTION__);
fclose(modelfl); fclose(modelfl);
CV_THROW (Exception(Error::StsError, eerr, efile, efunc, __LINE__)); throw Exception(Error::StsError, eerr, efile, efunc, __LINE__);
} }
/* read version number */ /* read version number */
int version = 0; int version = 0;
if (!fread (&version,sizeof(int),1,modelfl)) if (!fread (&version,sizeof(int),1,modelfl))
{ {
fclose(modelfl); fclose(modelfl);
CV_THROW (Exception()); throw Exception();
} }
if (version < 200) if (version < 200)
{ {
@ -3718,7 +3718,7 @@ void HOGDescriptor::readALTModel(String modelfile)
String efile(__FILE__); String efile(__FILE__);
String efunc(__FUNCTION__); String efunc(__FUNCTION__);
fclose(modelfl); fclose(modelfl);
CV_THROW (Exception()); throw Exception();
} }
int kernel_type; int kernel_type;
size_t nread; size_t nread;
@ -3764,7 +3764,7 @@ void HOGDescriptor::readALTModel(String modelfile)
if(nread != static_cast<size_t>(length) + 1) { if(nread != static_cast<size_t>(length) + 1) {
delete [] linearwt; delete [] linearwt;
fclose(modelfl); fclose(modelfl);
CV_THROW (Exception()); throw Exception();
} }
for(int i = 0; i < length; i++) for(int i = 0; i < length; i++)
@ -3775,7 +3775,7 @@ void HOGDescriptor::readALTModel(String modelfile)
delete [] linearwt; delete [] linearwt;
} else { } else {
fclose(modelfl); fclose(modelfl);
CV_THROW (Exception()); throw Exception();
} }
fclose(modelfl); fclose(modelfl);
} }