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

reworked nearly all of the OpenCV tests (except for opencv_gpu tests) - they now use the Google Test engine.

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-02-09 20:55:11 +00:00
parent 63806c9ab9
commit 061b49e0b2
122 changed files with 39081 additions and 28854 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/imgproc/src/emd.cpp
View File

@@ -1137,5 +1137,23 @@ icvDistC( const float *x, const float *y, void *user_param )
return (float)s;
}
/* End of file. */
namespace cv
{
float EMD( const Mat& signature1, const Mat& signature2,
int distType, const Mat& cost, float* lowerBound, Mat* flow )
{
CvMat _signature1 = signature1;
CvMat _signature2 = signature2;
CvMat _cost = cost, _flow;
if( flow )
_flow = *flow;
return cvCalcEMD2( &_signature1, &_signature2, distType, 0, cost.empty() ? 0 : &_cost,
flow ? &_flow : 0, lowerBound, 0 );
}
}
/* End of file. */

4
modules/imgproc/src/filter.cpp
View File

@@ -3025,8 +3025,8 @@ void sepFilter2D( const Mat& src, Mat& dst, int ddepth,
dst.create( src.size(), CV_MAKETYPE(ddepth, src.channels()) );
Ptr<FilterEngine> f = createSeparableLinearFilter(src.type(),
dst.type(), kernelX, kernelY, anchor, delta, borderType );
f->apply(src, dst);
dst.type(), kernelX, kernelY, anchor, delta, borderType & ~BORDER_ISOLATED );
f->apply(src, dst, Rect(0,0,-1,-1), Point(), (borderType & BORDER_ISOLATED) != 0 );
}
}

2
modules/imgproc/src/pyramids.cpp
View File

@@ -45,8 +45,6 @@
namespace cv
{
//#undef CV_SSE2
template<typename T, int shift> struct FixPtCast
{
typedef int type1;

2
modules/imgproc/src/undistort.cpp
View File

@@ -380,7 +380,7 @@ void undistortPoints( const Mat& src, Mat& dst,
const Mat& cameraMatrix, const Mat& distCoeffs,
const Mat& R, const Mat& P )
{
CV_Assert( src.isContinuous() && src.depth() == CV_32F &&
CV_Assert( src.isContinuous() && (src.depth() == CV_32F || src.depth() == CV_64F) &&
((src.rows == 1 && src.channels() == 2) || src.cols*src.channels() == 2));
dst.create(src.size(), src.type());