From b0ad424087b283a47b38c7a39f0fe93c5b68abcc Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Tue, 9 Oct 2012 17:24:37 +0400 Subject: [PATCH] fixed several warnings from VS2010 --- modules/features2d/src/fast.cpp | 2 +- modules/imgproc/src/imgwarp.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/features2d/src/fast.cpp b/modules/features2d/src/fast.cpp index 9fcc5b5..ec0f335 100644 --- a/modules/features2d/src/fast.cpp +++ b/modules/features2d/src/fast.cpp @@ -272,7 +272,7 @@ FastFeatureDetector::FastFeatureDetector( int _threshold, bool _nonmaxSuppressio {} FastFeatureDetector::FastFeatureDetector( int _threshold, bool _nonmaxSuppression, int _type ) -: threshold(_threshold), nonmaxSuppression(_nonmaxSuppression), type(_type) +: threshold(_threshold), nonmaxSuppression(_nonmaxSuppression), type((short)_type) {} void FastFeatureDetector::detectImpl( const Mat& image, vector& keypoints, const Mat& mask ) const diff --git a/modules/imgproc/src/imgwarp.cpp b/modules/imgproc/src/imgwarp.cpp index cca3d45..e3374f0 100644 --- a/modules/imgproc/src/imgwarp.cpp +++ b/modules/imgproc/src/imgwarp.cpp @@ -1368,7 +1368,7 @@ public: } private: - const Mat src; + Mat src; Mat dst; int scale_x, scale_y; const int *ofs, *xofs; @@ -1552,7 +1552,7 @@ static void resizeArea_( const Mat& src, Mat& dst, const DecimateAlpha* xofs, in } } - Range range(0, bands.size()); + Range range(0, (int)bands.size()); resizeArea_Invoker invoker(src, dst, xofs, xofs_count, scale_y_, cur_dy_ofs, bands); //parallel_for_(range, invoker); invoker(Range(range.start, range.end)); -- 2.7.4