~40 warnings under VS2008
HAVE_CONFIG_H -> HAVE_CVCONFIG_H
This commit is contained in:
@@ -532,6 +532,8 @@ namespace
|
||||
putText(image, code_text, code.corners[0], CV_FONT_HERSHEY_SIMPLEX, 0.8, c2, 1, CV_AA, false);
|
||||
}
|
||||
cv::Mat& image;
|
||||
|
||||
DrawDataMatrixCode& operator=(const DrawDataMatrixCode&);
|
||||
};
|
||||
}
|
||||
|
||||
|
@@ -277,6 +277,8 @@ struct TrainImageQuantizer
|
||||
|
||||
// Result matrix
|
||||
Mat* quantizedImage;
|
||||
|
||||
TrainImageQuantizer& operator=(const TrainImageQuantizer&);
|
||||
};
|
||||
|
||||
static void quantizeToTrain( const Mat& _magnitudesExt, const Mat& _anglesExt, const Mat& maskExt,
|
||||
@@ -360,6 +362,8 @@ struct DetectImageQuantizer
|
||||
|
||||
// Result matrix
|
||||
Mat* quantizedImage;
|
||||
|
||||
DetectImageQuantizer& operator=(const DetectImageQuantizer&);
|
||||
};
|
||||
|
||||
static void quantizeToDetect( const Mat& _magnitudes, const Mat& angles,
|
||||
@@ -902,6 +906,8 @@ struct TemplateComparator
|
||||
vector<ConcurrentRectVector>* concurrRectsPtr;
|
||||
vector<ConcurrentFloatVector>* concurrRatiosPtr;
|
||||
vector<ConcurrentIntVector>* concurrTemplateIndicesPtr;
|
||||
|
||||
TemplateComparator& operator=(const TemplateComparator&);
|
||||
};
|
||||
|
||||
void DOTDetector::detectQuantized( const Mat& queryQuantizedImage, float minRatio,
|
||||
|
@@ -47,7 +47,7 @@
|
||||
#pragma warning( disable: 4251 4710 4711 4514 4996 )
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#ifdef HAVE_CVCONFIG_H
|
||||
#include "cvconfig.h"
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user