fixed warnings and errors reported by VS2010
This commit is contained in:
@@ -44,7 +44,7 @@ void matches2points(const vector<DMatch>& matches, const vector<KeyPoint>& kpts_
|
||||
|
||||
}
|
||||
|
||||
float match(const vector<KeyPoint>& kpts_train, const vector<KeyPoint>& kpts_query, DescriptorMatcher& matcher,
|
||||
double match(const vector<KeyPoint>& kpts_train, const vector<KeyPoint>& kpts_query, DescriptorMatcher& matcher,
|
||||
const Mat& train, const Mat& query, vector<DMatch>& matches)
|
||||
{
|
||||
|
||||
@@ -112,7 +112,7 @@ int main(int ac, char ** av)
|
||||
cout << "matching with BruteForceMatcher<Hamming>" << endl;
|
||||
BruteForceMatcher<Hamming> matcher_popcount;
|
||||
vector<DMatch> matches_popcount;
|
||||
float pop_time = match(kpts_1, kpts_2, matcher_popcount, desc_1, desc_2, matches_popcount);
|
||||
double pop_time = match(kpts_1, kpts_2, matcher_popcount, desc_1, desc_2, matches_popcount);
|
||||
cout << "done BruteForceMatcher<Hamming> matching. took " << pop_time << " seconds" << endl;
|
||||
|
||||
vector<Point2f> mpts_1, mpts_2;
|
||||
|
||||
@@ -371,7 +371,7 @@ struct EqKeypoints
|
||||
|
||||
static void build3dmodel( const Ptr<FeatureDetector>& detector,
|
||||
const Ptr<DescriptorExtractor>& descriptorExtractor,
|
||||
const vector<Point3f>& modelBox,
|
||||
const vector<Point3f>& /*modelBox*/,
|
||||
const vector<string>& imageList,
|
||||
const vector<Rect>& roiList,
|
||||
const vector<Vec6f>& poseList,
|
||||
|
||||
@@ -33,7 +33,7 @@ void on_trackbar(int, void*)
|
||||
imshow("contours", cnt_img);
|
||||
}
|
||||
|
||||
int main( int argc, char** argv)
|
||||
int main( int argc, char**)
|
||||
{
|
||||
Mat img = Mat::zeros(w, w, CV_8UC1);
|
||||
if(argc > 1)
|
||||
|
||||
@@ -35,7 +35,7 @@ int process(VideoCapture& capture) {
|
||||
if (frame.empty())
|
||||
continue;
|
||||
imshow(window_name, frame);
|
||||
char key = waitKey(5); //delay N millis, usually long enough to display and capture input
|
||||
char key = (char)waitKey(5); //delay N millis, usually long enough to display and capture input
|
||||
switch (key) {
|
||||
case 'q':
|
||||
case 'Q':
|
||||
|
||||
Reference in New Issue
Block a user