fixed ~300 warnings under windows (had to hack gtest a bit)

This commit is contained in:
Anatoly Baksheev
2011-05-06 21:45:48 +00:00
parent c67f1a2551
commit 1c18e5fef9
25 changed files with 87 additions and 46 deletions

View File

@@ -253,7 +253,7 @@ static int decode(Sampler &sa, code &cc)
for (i = 0; i < 64; i++)
sum += sa.getpixel(1 + (i & 7), 1 + (i >> 3));
uint8 mean = sum / 64;
uint8 mean = (uint8)(sum / 64);
for (i = 0; i < 64; i++) {
b = (b << 1) + (sa.getpixel(pickup[i].x, pickup[i].y) <= mean);
if ((i & 7) == 7) {

View File

@@ -647,7 +647,7 @@ void DOTDetector::save( const std::string& filename ) const
}
}
void DOTDetector::train( const string& _baseDirName, const TrainParams& _trainParams, bool _isAddImageAndGradientMask )
void DOTDetector::train( const string& _baseDirName, const TrainParams& _trainParams, bool /*_isAddImageAndGradientMask*/ )
{
clear();

View File

@@ -272,7 +272,7 @@ int searchObjectThreshold(const CvLSVMFeaturePyramid *H,
float scoreThreshold,
CvPoint **points, int **levels, int *kPoints,
float **score, CvPoint ***partsDisplacement,
int numThreads)
int /*numThreads*/)
{
int opResult;
@@ -551,7 +551,7 @@ int searchObjectThresholdSomeComponents(const CvLSVMFeaturePyramid *H,
const float *b, float scoreThreshold,
CvPoint **points, CvPoint **oppPoints,
float **score, int *kPoints,
int numThreads)
int /*numThreads*/)
{
int error = 0;
int i, j, s, f, componentIndex;