generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #56 from vpisarev/bug_2447_2.4

Browse Source
This commit is contained in:
Andrey Kamaev 2012-10-18 13:21:41 +04:00
commit 634fedc3cb
2 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
modules/core/src/arithm.cpp
View File

@ -1218,28 +1218,21 @@ namespace cv
static int actualScalarDepth(const double* data, int len) static int actualScalarDepth(const double* data, int len)
{ {
double minval = data[0]; int i = 0, minval = INT_MAX, maxval = INT_MIN;
double maxval = data[0]; for(; i < len; ++i)
for(int i = 1; i < len; ++i)
{ {
minval = MIN(minval, data[i]); int ival = cvRound(data[i]);
maxval = MAX(maxval, data[i]); if( ival != data[i] )
break;
minval = MIN(minval, ival);
maxval = MAX(maxval, ival);
} }
return i < len ? CV_64F :
int depth = CV_64F; minval >= 0 && maxval <= UCHAR_MAX ? CV_8U :
if(minval >= 0 && maxval <= UCHAR_MAX) minval >= SCHAR_MIN && maxval <= SCHAR_MAX ? CV_8S :
depth = CV_8U; minval >= 0 && maxval <= USHRT_MAX ? CV_16U :
else if(minval >= SCHAR_MIN && maxval <= SCHAR_MAX) minval >= SHRT_MIN && maxval <= SHRT_MAX ? CV_16S :
depth = CV_8S; CV_32S;
else if(minval >= 0 && maxval <= USHRT_MAX)
depth = CV_16U;
else if(minval >= SHRT_MIN && maxval <= SHRT_MAX)
depth = CV_16S;
else if(minval >= INT_MIN && maxval <= INT_MAX)
depth = CV_32S;
else if(minval >= -FLT_MAX && maxval <= FLT_MAX)
depth = CV_32F;
return depth;
} }
static void arithm_op(InputArray _src1, InputArray _src2, OutputArray _dst, static void arithm_op(InputArray _src1, InputArray _src2, OutputArray _dst,
@ -1264,7 +1257,9 @@ static void arithm_op(InputArray _src1, InputArray _src2, OutputArray _dst,
bool haveScalar = false, swapped12 = false; bool haveScalar = false, swapped12 = false;
int depth2 = src2.depth(); int depth2 = src2.depth();
if( src1.size != src2.size || src1.channels() != src2.channels() ) if( src1.size != src2.size || src1.channels() != src2.channels() ||
((kind1 == _InputArray::MATX || kind2 == _InputArray::MATX) &&
src1.cols == 1 && src2.rows == 4) )
{ {
if( checkScalar(src1, src2.type(), kind1, kind2) ) if( checkScalar(src1, src2.type(), kind1, kind2) )
{ {
@ -1279,10 +1274,14 @@ static void arithm_op(InputArray _src1, InputArray _src2, OutputArray _dst,
haveScalar = true; haveScalar = true;
CV_Assert(src2.type() == CV_64F && (src2.rows == 4 || src2.rows == 1)); CV_Assert(src2.type() == CV_64F && (src2.rows == 4 || src2.rows == 1));
if (usrdata == 0) // hack to filter out multiply and divide if (!muldiv)
{
depth2 = actualScalarDepth(src2.ptr<double>(), src1.channels()); depth2 = actualScalarDepth(src2.ptr<double>(), src1.channels());
if( depth2 == CV_64F && (src1.depth() < CV_32S || src1.depth() == CV_32F) )
depth2 = CV_32F;
}
else else
depth2 = CV_64F; depth2 = src1.depth() < CV_32S || src1.depth() == CV_32F ? CV_32F : CV_64F;
} }
int cn = src1.channels(), depth1 = src1.depth(), wtype; int cn = src1.channels(), depth1 = src1.depth(), wtype;

15
modules/core/test/test_operations.cpp
View File

@ -76,6 +76,7 @@ protected:
bool TestVec(); bool TestVec();
bool TestMatxMultiplication(); bool TestMatxMultiplication();
bool TestSubMatAccess(); bool TestSubMatAccess();
bool TestExp();
bool TestSVD(); bool TestSVD();
bool operations1(); bool operations1();
@ -1003,6 +1004,17 @@ bool CV_OperationsTest::operations1()
} }
bool CV_OperationsTest::TestExp()
{
Mat1f tt = Mat1f::ones(4,2);
Mat1f outs;
exp(-tt, outs);
Mat1f tt2 = Mat1f::ones(4,1), outs2;
exp(-tt2, outs2);
return true;
}
bool CV_OperationsTest::TestSVD() bool CV_OperationsTest::TestSVD()
{ {
try try
@ -1079,6 +1091,9 @@ void CV_OperationsTest::run( int /* start_from */)
if (!TestSubMatAccess()) if (!TestSubMatAccess())
return; return;
if (!TestExp())
return;
if (!TestSVD()) if (!TestSVD())
return; return;