warningx fixed under vs2008
This commit is contained in:
parent
0545e780f8
commit
998fab0ef5
@ -1155,7 +1155,7 @@ ChamferMatcher::Matches* ChamferMatcher::Matching::matchTemplates(Mat& dist_img,
|
|||||||
* @param edge_img Edge image
|
* @param edge_img Edge image
|
||||||
* @return a match object
|
* @return a match object
|
||||||
*/
|
*/
|
||||||
ChamferMatcher::Matches* ChamferMatcher::Matching::matchEdgeImage(Mat& edge_img, const ImageRange& range, float orientation_weight, int max_matches, float min_match_distance)
|
ChamferMatcher::Matches* ChamferMatcher::Matching::matchEdgeImage(Mat& edge_img, const ImageRange& range, float orientation_weight, int /*max_matches*/, float /*min_match_distance*/)
|
||||||
{
|
{
|
||||||
CV_Assert(edge_img.channels()==1);
|
CV_Assert(edge_img.channels()==1);
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ void matches2points(const vector<DMatch>& matches, const vector<KeyPoint>& kpts_
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
double 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)
|
const Mat& train, const Mat& query, vector<DMatch>& matches)
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -106,7 +106,7 @@ int main(int ac, char ** av)
|
|||||||
cout << "matching with BruteForceMatcher<HammingLUT>" << endl;
|
cout << "matching with BruteForceMatcher<HammingLUT>" << endl;
|
||||||
BruteForceMatcher<HammingLUT> matcher;
|
BruteForceMatcher<HammingLUT> matcher;
|
||||||
vector<DMatch> matches_lut;
|
vector<DMatch> matches_lut;
|
||||||
float lut_time = match(kpts_1, kpts_2, matcher, desc_1, desc_2, matches_lut);
|
float lut_time = (float)match(kpts_1, kpts_2, matcher, desc_1, desc_2, matches_lut);
|
||||||
cout << "done BruteForceMatcher<HammingLUT> matching. took " << lut_time << " seconds" << endl;
|
cout << "done BruteForceMatcher<HammingLUT> matching. took " << lut_time << " seconds" << endl;
|
||||||
|
|
||||||
cout << "matching with BruteForceMatcher<Hamming>" << endl;
|
cout << "matching with BruteForceMatcher<Hamming>" << endl;
|
||||||
|
@ -59,7 +59,7 @@ int main( int argc, char** argv )
|
|||||||
|
|
||||||
// Define trackbar callback functon. This function find contours,
|
// Define trackbar callback functon. This function find contours,
|
||||||
// draw it and approximate it by ellipses.
|
// draw it and approximate it by ellipses.
|
||||||
void processImage(int h, void*)
|
void processImage(int /*h*/, void*)
|
||||||
{
|
{
|
||||||
vector<vector<Point> > contours;
|
vector<vector<Point> > contours;
|
||||||
Mat bimage = image >= sliderPos;
|
Mat bimage = image >= sliderPos;
|
||||||
|
@ -14,7 +14,7 @@ void help()
|
|||||||
"./kmeans\n" << endl;
|
"./kmeans\n" << endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
int main( int argc, char** argv )
|
int main( int /*argc*/, char** /*argv*/ )
|
||||||
{
|
{
|
||||||
const int MAX_CLUSTERS = 5;
|
const int MAX_CLUSTERS = 5;
|
||||||
Scalar colorTab[] =
|
Scalar colorTab[] =
|
||||||
|
@ -26,7 +26,7 @@ void help()
|
|||||||
Point2f pt;
|
Point2f pt;
|
||||||
bool addRemovePt = false;
|
bool addRemovePt = false;
|
||||||
|
|
||||||
void onMouse( int event, int x, int y, int flags, void* param )
|
void onMouse( int event, int x, int y, int /*flags*/, void* /*param*/ )
|
||||||
{
|
{
|
||||||
if( event == CV_EVENT_LBUTTONDOWN )
|
if( event == CV_EVENT_LBUTTONDOWN )
|
||||||
{
|
{
|
||||||
|
@ -16,7 +16,7 @@ void help()
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
int main( int argc, char** argv )
|
int main( int /*argc*/, char** /*argv*/ )
|
||||||
{
|
{
|
||||||
Mat img(500, 500, CV_8UC3);
|
Mat img(500, 500, CV_8UC3);
|
||||||
RNG& rng = theRNG();
|
RNG& rng = theRNG();
|
||||||
|
@ -210,7 +210,7 @@ int main(int ac, char ** av)
|
|||||||
train_kpts = query_kpts;
|
train_kpts = query_kpts;
|
||||||
query_desc.copyTo(train_desc);
|
query_desc.copyTo(train_desc);
|
||||||
}
|
}
|
||||||
char key = waitKey(2);
|
char key = (char)waitKey(2);
|
||||||
switch (key)
|
switch (key)
|
||||||
{
|
{
|
||||||
case 'l':
|
case 'l':
|
||||||
|
@ -222,7 +222,7 @@ void CV_ChessboardDetectorTest::run_batch( const string& filename )
|
|||||||
Size pattern_size = expected.size();
|
Size pattern_size = expected.size();
|
||||||
|
|
||||||
vector<Point2f> v;
|
vector<Point2f> v;
|
||||||
bool result;
|
bool result = false;
|
||||||
switch( pattern )
|
switch( pattern )
|
||||||
{
|
{
|
||||||
case CHESSBOARD:
|
case CHESSBOARD:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user