Merge pull request #726 from jet47:fix-pvs-studio-warnings

This commit is contained in:
Andrey Kamaev
2013-04-01 15:11:02 +04:00
committed by OpenCV Buildbot
12 changed files with 17 additions and 15 deletions

View File

@@ -319,7 +319,7 @@ void MatOp::augAssignXor(const MatExpr& expr, Mat& m) const
{
Mat temp;
expr.op->assign(expr, temp);
m /= temp;
m ^= temp;
}

View File

@@ -184,7 +184,7 @@ static void finalizeHdr(Mat& m)
void Mat::create(int d, const int* _sizes, int _type)
{
int i;
CV_Assert(0 <= d && _sizes && d <= CV_MAX_DIM && _sizes);
CV_Assert(0 <= d && d <= CV_MAX_DIM && _sizes);
_type = CV_MAT_TYPE(_type);
if( data && (d == dims || (d == 1 && dims <= 2)) && _type == type() )