diff --git a/include/opencv2/opencv.hpp b/include/opencv2/opencv.hpp index 3c2f414fe7..4d1c2afdab 100644 --- a/include/opencv2/opencv.hpp +++ b/include/opencv2/opencv.hpp @@ -45,12 +45,10 @@ #include "opencv2/core/core_c.h" #include "opencv2/core/core.hpp" -#include "opencv2/core/wimage.hpp" #include "opencv2/flann/flann.hpp" #include "opencv2/imgproc/imgproc_c.h" #include "opencv2/imgproc/imgproc.hpp" #include "opencv2/video/tracking.hpp" -#include "opencv2/video/blobtrack.hpp" #include "opencv2/video/background_segm.hpp" #include "opencv2/features2d/features2d.hpp" #include "opencv2/objdetect/objdetect.hpp" diff --git a/modules/core/include/opencv2/core/mat.hpp b/modules/core/include/opencv2/core/mat.hpp index 80febfee04..367a61b793 100644 --- a/modules/core/include/opencv2/core/mat.hpp +++ b/modules/core/include/opencv2/core/mat.hpp @@ -757,7 +757,7 @@ SVD::backSubst( const Matx<_Tp, nm, 1>& w, const Matx<_Tp, m, nm>& u, Matx<_Tp, n, nb>& dst ) { 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); CV_Assert(_dst.data == (uchar*)&dst.val[0]); } diff --git a/samples/cpp/camshiftdemo.cpp b/samples/cpp/camshiftdemo.cpp index 02d741dce8..dc321808ad 100644 --- a/samples/cpp/camshiftdemo.cpp +++ b/samples/cpp/camshiftdemo.cpp @@ -50,7 +50,6 @@ int main( int argc, char** argv ) VideoCapture cap; Rect trackWindow; RotatedRect trackBox; - CvConnectedComp trackComp; int hsize = 16; float hranges[] = {0,180}; const float* phranges = hranges; diff --git a/samples/cpp/lkdemo.cpp b/samples/cpp/lkdemo.cpp index a482656e71..4030a2a7bd 100644 --- a/samples/cpp/lkdemo.cpp +++ b/samples/cpp/lkdemo.cpp @@ -106,7 +106,7 @@ int main( int argc, char** argv ) points[1].resize(k); } - if( addRemovePt && points[1].size() < MAX_COUNT ) + if( addRemovePt && points[1].size() < (size_t)MAX_COUNT ) { vector tmp; tmp.push_back(pt);