mirror of
https://github.com/opencv/opencv.git
synced 2026-07-31 00:03:03 +04:00
Merge pull request #11353 from eecsninja:3.4
* Fix CV_Asserts with negation of strings
{!"string"} causes some compilers to throw a warning.
The value of the string is not that important -- it's only for printing
the assertion message.
Replace these calls with:
CV_Error(Error::StsError, "string")
to suppress the warning.
* remove unnecessary 'break' after CV_Error()
This commit is contained in:
committed by
Alexander Alekhin
parent
2b4b946689
commit
705464258e
@@ -445,7 +445,7 @@ void cv::Affine3<T>::rotation(const cv::Mat& data)
|
||||
rotation(_rvec);
|
||||
}
|
||||
else
|
||||
CV_Assert(!"Input matrix can only be 3x3, 1x3 or 3x1");
|
||||
CV_Error(Error::StsError, "Input matrix can only be 3x3, 1x3 or 3x1");
|
||||
}
|
||||
|
||||
template<typename T> inline
|
||||
|
||||
Reference in New Issue
Block a user