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

fixed several warnings from VS2010

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-10-09 17:24:37 +04:00
parent a135e862c1
commit b0ad424087
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/features2d/src/fast.cpp
View File

@ -272,7 +272,7 @@ FastFeatureDetector::FastFeatureDetector( int _threshold, bool _nonmaxSuppressio
{} {}
FastFeatureDetector::FastFeatureDetector( int _threshold, bool _nonmaxSuppression, int _type ) 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<KeyPoint>& keypoints, const Mat& mask ) const void FastFeatureDetector::detectImpl( const Mat& image, vector<KeyPoint>& keypoints, const Mat& mask ) const

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

@ -1368,7 +1368,7 @@ public:
} }
private: private:
const Mat src; Mat src;
Mat dst; Mat dst;
int scale_x, scale_y; int scale_x, scale_y;
const int *ofs, *xofs; 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<T, WT> invoker(src, dst, xofs, xofs_count, scale_y_, cur_dy_ofs, bands); resizeArea_Invoker<T, WT> invoker(src, dst, xofs, xofs_count, scale_y_, cur_dy_ofs, bands);
//parallel_for_(range, invoker); //parallel_for_(range, invoker);
invoker(Range(range.start, range.end)); invoker(Range(range.start, range.end));