Revert "fixed bug #3319"
See 092f916 for explanation. This reverts commit 4f9c081dc313f8fdfee3f0a4572779ae13e27e40.
This commit is contained in:
parent
8dbc96fed8
commit
f02204847a
@ -129,14 +129,12 @@ template<typename T> struct OpMax
|
|||||||
|
|
||||||
inline Size getContinuousSize( const Mat& m1, int widthScale=1 )
|
inline Size getContinuousSize( const Mat& m1, int widthScale=1 )
|
||||||
{
|
{
|
||||||
CV_Assert(m1.dims <= 2);
|
|
||||||
return m1.isContinuous() ? Size(m1.cols*m1.rows*widthScale, 1) :
|
return m1.isContinuous() ? Size(m1.cols*m1.rows*widthScale, 1) :
|
||||||
Size(m1.cols*widthScale, m1.rows);
|
Size(m1.cols*widthScale, m1.rows);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline Size getContinuousSize( const Mat& m1, const Mat& m2, int widthScale=1 )
|
inline Size getContinuousSize( const Mat& m1, const Mat& m2, int widthScale=1 )
|
||||||
{
|
{
|
||||||
CV_Assert(m1.dims <= 2 && m1.size() == m2.size());
|
|
||||||
return (m1.flags & m2.flags & Mat::CONTINUOUS_FLAG) != 0 ?
|
return (m1.flags & m2.flags & Mat::CONTINUOUS_FLAG) != 0 ?
|
||||||
Size(m1.cols*m1.rows*widthScale, 1) : Size(m1.cols*widthScale, m1.rows);
|
Size(m1.cols*m1.rows*widthScale, 1) : Size(m1.cols*widthScale, m1.rows);
|
||||||
}
|
}
|
||||||
@ -144,7 +142,6 @@ inline Size getContinuousSize( const Mat& m1, const Mat& m2, int widthScale=1 )
|
|||||||
inline Size getContinuousSize( const Mat& m1, const Mat& m2,
|
inline Size getContinuousSize( const Mat& m1, const Mat& m2,
|
||||||
const Mat& m3, int widthScale=1 )
|
const Mat& m3, int widthScale=1 )
|
||||||
{
|
{
|
||||||
CV_Assert(m1.dims <= 2 && m1.size() == m2.size() && m1.size() == m3.size());
|
|
||||||
return (m1.flags & m2.flags & m3.flags & Mat::CONTINUOUS_FLAG) != 0 ?
|
return (m1.flags & m2.flags & m3.flags & Mat::CONTINUOUS_FLAG) != 0 ?
|
||||||
Size(m1.cols*m1.rows*widthScale, 1) : Size(m1.cols*widthScale, m1.rows);
|
Size(m1.cols*m1.rows*widthScale, 1) : Size(m1.cols*widthScale, m1.rows);
|
||||||
}
|
}
|
||||||
@ -153,7 +150,6 @@ inline Size getContinuousSize( const Mat& m1, const Mat& m2,
|
|||||||
const Mat& m3, const Mat& m4,
|
const Mat& m3, const Mat& m4,
|
||||||
int widthScale=1 )
|
int widthScale=1 )
|
||||||
{
|
{
|
||||||
CV_Assert(m1.dims <= 2 && m1.size() == m2.size() && m1.size() == m3.size() && m1.size() == m4.size());
|
|
||||||
return (m1.flags & m2.flags & m3.flags & m4.flags & Mat::CONTINUOUS_FLAG) != 0 ?
|
return (m1.flags & m2.flags & m3.flags & m4.flags & Mat::CONTINUOUS_FLAG) != 0 ?
|
||||||
Size(m1.cols*m1.rows*widthScale, 1) : Size(m1.cols*widthScale, m1.rows);
|
Size(m1.cols*m1.rows*widthScale, 1) : Size(m1.cols*widthScale, m1.rows);
|
||||||
}
|
}
|
||||||
@ -162,7 +158,6 @@ inline Size getContinuousSize( const Mat& m1, const Mat& m2,
|
|||||||
const Mat& m3, const Mat& m4,
|
const Mat& m3, const Mat& m4,
|
||||||
const Mat& m5, int widthScale=1 )
|
const Mat& m5, int widthScale=1 )
|
||||||
{
|
{
|
||||||
CV_Assert(m1.dims <= 2 && m1.size() == m2.size() && m1.size() == m3.size() && m1.size() == m4.size() && m1.size() == m5.size());
|
|
||||||
return (m1.flags & m2.flags & m3.flags & m4.flags & m5.flags & Mat::CONTINUOUS_FLAG) != 0 ?
|
return (m1.flags & m2.flags & m3.flags & m4.flags & m5.flags & Mat::CONTINUOUS_FLAG) != 0 ?
|
||||||
Size(m1.cols*m1.rows*widthScale, 1) : Size(m1.cols*widthScale, m1.rows);
|
Size(m1.cols*m1.rows*widthScale, 1) : Size(m1.cols*widthScale, m1.rows);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user