From: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Fri, 24 Jan 2014 21:58:55 +0000 (+0400)
Subject: fixed condition
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~3526^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f767077a419c6ff7cf3b931cccb98b451378e004;p=platform%2Fupstream%2Fopencv.git

fixed condition
---

diff --git a/modules/core/src/matrix.cpp b/modules/core/src/matrix.cpp
index 2a8a066..c74e854 100644
--- a/modules/core/src/matrix.cpp
+++ b/modules/core/src/matrix.cpp
@@ -1193,7 +1193,6 @@ Mat _InputArray::getMat(int i) const
     return Mat();
 }
 
-
 UMat _InputArray::getUMat(int i) const
 {
     int k = kind();
@@ -1226,7 +1225,6 @@ UMat _InputArray::getUMat(int i) const
     return getMat(i).getUMat(accessFlags);
 }
 
-
 void _InputArray::getMatVector(std::vector<Mat>& mv) const
 {
     int k = kind();
@@ -1504,7 +1502,6 @@ Size _InputArray::size(int i) const
     }
 }
 
-
 int _InputArray::sizend(int* arrsz, int i) const
 {
     int j, d=0, k = kind();
@@ -1563,7 +1560,6 @@ int _InputArray::sizend(int* arrsz, int i) const
     return d;
 }
 
-
 bool _InputArray::sameSize(const _InputArray& arr) const
 {
     int k1 = kind(), k2 = arr.kind();
@@ -2305,7 +2301,7 @@ void _OutputArray::create(int d, const int* sizes, int mtype, int i,
             if(CV_MAT_CN(mtype) == m.channels() && ((1 << CV_MAT_TYPE(flags)) & fixedDepthMask) != 0 )
                 mtype = m.type();
             else
-                CV_Assert(!fixedType() || (CV_MAT_CN(mtype) == m.channels() && ((1 << CV_MAT_TYPE(flags)) & fixedDepthMask) != 0));
+                CV_Assert(CV_MAT_TYPE(mtype) == m.type());
         }
         if(fixedSize())
         {
@@ -2364,7 +2360,7 @@ void _OutputArray::create(int d, const int* sizes, int mtype, int i,
             if(CV_MAT_CN(mtype) == m.channels() && ((1 << CV_MAT_TYPE(flags)) & fixedDepthMask) != 0 )
                 mtype = m.type();
             else
-                CV_Assert(!fixedType() || (CV_MAT_CN(mtype) == m.channels() && ((1 << CV_MAT_TYPE(flags)) & fixedDepthMask) != 0));
+                CV_Assert(CV_MAT_TYPE(mtype) == m.type());
         }
         if(fixedSize())
         {