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

removed obsolete headers from opencv.hpp, fixed 2 gcc warnings and bug in SVBackSubst().

Browse Source
This commit is contained in:
Vadim Pisarevsky 2010-11-29 15:31:25 +00:00
parent cfeca1411e
commit fa1d85bc14
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/opencv2/opencv.hpp
View File

@ -45,12 +45,10 @@
#include "opencv2/core/core_c.h" #include "opencv2/core/core_c.h"
#include "opencv2/core/core.hpp" #include "opencv2/core/core.hpp"
#include "opencv2/core/wimage.hpp"
#include "opencv2/flann/flann.hpp" #include "opencv2/flann/flann.hpp"
#include "opencv2/imgproc/imgproc_c.h" #include "opencv2/imgproc/imgproc_c.h"
#include "opencv2/imgproc/imgproc.hpp" #include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/video/tracking.hpp" #include "opencv2/video/tracking.hpp"
#include "opencv2/video/blobtrack.hpp"
#include "opencv2/video/background_segm.hpp" #include "opencv2/video/background_segm.hpp"
#include "opencv2/features2d/features2d.hpp" #include "opencv2/features2d/features2d.hpp"
#include "opencv2/objdetect/objdetect.hpp" #include "opencv2/objdetect/objdetect.hpp"

2
modules/core/include/opencv2/core/mat.hpp
View File

@ -757,7 +757,7 @@ SVD::backSubst( const Matx<_Tp, nm, 1>& w, const Matx<_Tp, m, nm>& u,
Matx<_Tp, n, nb>& dst ) Matx<_Tp, n, nb>& dst )
{ {
assert( nm == MIN(m, n)); assert( nm == MIN(m, n));
Mat _u(u, false), _w(w, false), _vt(vt, false), _rhs(_rhs, false), _dst(dst, false); Mat _u(u, false), _w(w, false), _vt(vt, false), _rhs(rhs, false), _dst(dst, false);
SVD::backSubst(_w, _u, _vt, _rhs, _dst); SVD::backSubst(_w, _u, _vt, _rhs, _dst);
CV_Assert(_dst.data == (uchar*)&dst.val[0]); CV_Assert(_dst.data == (uchar*)&dst.val[0]);
} }

1
samples/cpp/camshiftdemo.cpp
View File

@ -50,7 +50,6 @@ int main( int argc, char** argv )
VideoCapture cap; VideoCapture cap;
Rect trackWindow; Rect trackWindow;
RotatedRect trackBox; RotatedRect trackBox;
CvConnectedComp trackComp;
int hsize = 16; int hsize = 16;
float hranges[] = {0,180}; float hranges[] = {0,180};
const float* phranges = hranges; const float* phranges = hranges;

2
samples/cpp/lkdemo.cpp
View File

@ -106,7 +106,7 @@ int main( int argc, char** argv )
points[1].resize(k); points[1].resize(k);
} }
if( addRemovePt && points[1].size() < MAX_COUNT ) if( addRemovePt && points[1].size() < (size_t)MAX_COUNT )
{ {
vector<Point2f> tmp; vector<Point2f> tmp;
tmp.push_back(pt); tmp.push_back(pt);