diff --git a/modules/calib3d/src/calibinit.cpp b/modules/calib3d/src/calibinit.cpp index 39b6b9fcf9e744693c68869c4bac8faae7c5c2b7..31a0231e9996040699425ef38e8a5692c21536b0 100644 --- a/modules/calib3d/src/calibinit.cpp +++ b/modules/calib3d/src/calibinit.cpp @@ -1929,8 +1929,8 @@ void cv::drawChessboardCorners( InputOutputArray _image, Size patternSize, bool cv::findCirclesGrid( const InputArray& _image, Size patternSize, OutputArray _centers, int flags, const Ptr &blobDetector ) { - bool isAsymmetricGrid = (bool)(flags & CALIB_CB_ASYMMETRIC_GRID); - bool isSymmetricGrid = (bool)(flags & CALIB_CB_SYMMETRIC_GRID); + bool isAsymmetricGrid = (flags & CALIB_CB_ASYMMETRIC_GRID) ? true : false; + bool isSymmetricGrid = (flags & CALIB_CB_SYMMETRIC_GRID ) ? true : false; CV_Assert(isAsymmetricGrid ^ isSymmetricGrid); Mat image = _image.getMat(); diff --git a/modules/ml/src/svm.cpp b/modules/ml/src/svm.cpp index cf7d0324a44ef16776861c384c4050ffe32bf7e9..c16cce5a8ac8743bae011c7b0c1e5871b7065e81 100644 --- a/modules/ml/src/svm.cpp +++ b/modules/ml/src/svm.cpp @@ -2001,6 +2001,7 @@ float CvSVM::predict( const float* row_sample, int row_len, bool returnDFVal ) c int var_count = get_var_count(); assert( row_len == var_count ); + (void)row_len; int class_count = class_labels ? class_labels->cols : params.svm_type == ONE_CLASS ? 1 : 0; diff --git a/samples/c/adaptiveskindetector.cpp b/samples/c/adaptiveskindetector.cpp index e3ed84a5ba6df7151c89e10a556a076ca4693b34..f91e5f3fd399326fbc6e6bfd71d755be10c648fb 100644 --- a/samples/c/adaptiveskindetector.cpp +++ b/samples/c/adaptiveskindetector.cpp @@ -180,7 +180,7 @@ bool ASDFrameSequencer::isOpen() return false; }; -void ASDFrameSequencer::getFrameCaption(char *caption) { +void ASDFrameSequencer::getFrameCaption(char* /*caption*/) { return; }; diff --git a/samples/c/find_obj_ferns.cpp b/samples/c/find_obj_ferns.cpp index ae20520b87a35f95608e21eca129e22169732bff..207619f6c2e1379a0b56f9e5e5735dbdeba13768 100644 --- a/samples/c/find_obj_ferns.cpp +++ b/samples/c/find_obj_ferns.cpp @@ -120,7 +120,7 @@ int main(int argc, char** argv) for( i = 0; i < (int)pairs.size(); i += 2 ) { line( correspond, objKeypoints[pairs[i]].pt, - imgKeypoints[pairs[i+1]].pt + Point2f(0,object.rows), + imgKeypoints[pairs[i+1]].pt + Point2f(0,(float)object.rows), Scalar(0,255,0) ); } diff --git a/samples/c/one_way_sample.cpp b/samples/c/one_way_sample.cpp index e9320a9ca1c350871e9720fe516080bbd29d69c9..817a1d5816c49f6b41ec90d0d6f0f350d2d264d4 100644 --- a/samples/c/one_way_sample.cpp +++ b/samples/c/one_way_sample.cpp @@ -108,7 +108,7 @@ IplImage* DrawCorrespondences(IplImage* img1, const vector& features1, for (size_t i = 0; i < features2.size(); i++) { - CvPoint pt = cvPoint(features2[i].pt.x + img1->width, features2[i].pt.y); + CvPoint pt = cvPoint((int)features2[i].pt.x + img1->width, (int)features2[i].pt.y); cvCircle(img_corr, pt, 3, CV_RGB(255, 0, 0)); cvLine(img_corr, features1[desc_idx[i]].pt, pt, CV_RGB(0, 255, 0)); } diff --git a/samples/c/polar_transforms.c b/samples/c/polar_transforms.c index 2dfab7a90c821e9c2ac9fbc631d30404d4dd9255..4271e3a42cb2607fe1acd33c6cb316e50442b615 100644 --- a/samples/c/polar_transforms.c +++ b/samples/c/polar_transforms.c @@ -1,6 +1,8 @@ #include "opencv2/imgproc/imgproc.hpp" #include "opencv2/highgui/highgui.hpp" +#include "opencv2/imgproc/imgproc_c.h" + #include #include diff --git a/samples/c/pyramid_segmentation.c b/samples/c/pyramid_segmentation.c index f955fbfb3b82177193e16d2ac25eeb6ba636df38..5bd84640ba83626ccbef3dc68e080e49a1281e72 100644 --- a/samples/c/pyramid_segmentation.c +++ b/samples/c/pyramid_segmentation.c @@ -1,5 +1,6 @@ #include "opencv2/imgproc/imgproc.hpp" #include "opencv2/highgui/highgui.hpp" +#include "opencv2/imgproc/imgproc_c.h" #include void help() diff --git a/samples/cpp/bagofwords_classification.cpp b/samples/cpp/bagofwords_classification.cpp index 22ac48ef02d016e390a82ab03ac66c960a7a875c..f48ed7c445c776ece2e6a7818dab9232094f8eb3 100644 --- a/samples/cpp/bagofwords_classification.cpp +++ b/samples/cpp/bagofwords_classification.cpp @@ -855,7 +855,7 @@ void VocData::calcPrecRecall_impl(const vector& ground_truth, const vector { recall_norm = recall_normalization; } else { - recall_norm = (int)std::count_if(ground_truth.begin(),ground_truth.end(),std::bind2nd(std::equal_to(),true)); + recall_norm = (int)std::count_if(ground_truth.begin(),ground_truth.end(),std::bind2nd(std::equal_to(),(char)1)); } ap = 0; @@ -985,7 +985,7 @@ void VocData::calcClassifierConfMatRow(const string& obj_class, const vector(),true)); + total_relevant = std::count_if(ground_truth.begin(),ground_truth.end(),std::bind2nd(std::equal_to(),(char)1)); } /* iterate through images */ @@ -2292,8 +2292,8 @@ void removeBowImageDescriptorsByCount( vector& images, vector bow const SVMTrainParamsExt& svmParamsExt, int descsToDelete ) { RNG& rng = theRNG(); - int pos_ex = std::count( objectPresent.begin(), objectPresent.end(), true ); - int neg_ex = std::count( objectPresent.begin(), objectPresent.end(), false ); + int pos_ex = std::count( objectPresent.begin(), objectPresent.end(), (char)1 ); + int neg_ex = std::count( objectPresent.begin(), objectPresent.end(), (char)0 ); while( descsToDelete != 0 ) { diff --git a/samples/cpp/kinect_maps.cpp b/samples/cpp/kinect_maps.cpp index 432b29aee9d5a71aa7e3d73bba62c28939aa65d9..280c6fd5bc1de9783667ddcba16c8b28aab9e633 100644 --- a/samples/cpp/kinect_maps.cpp +++ b/samples/cpp/kinect_maps.cpp @@ -79,8 +79,8 @@ void colorizeDisparity( const Mat& gray, Mat& rgb, double maxDisp=-1.f, float S= float getMaxDisparity( VideoCapture& capture ) { const int minDistance = 400; // mm - float b = capture.get( CV_CAP_OPENNI_DEPTH_GENERATOR_BASELINE ); // mm - float F = capture.get( CV_CAP_OPENNI_DEPTH_GENERATOR_FOCAL_LENGTH ); // pixels + float b = (float)capture.get( CV_CAP_OPENNI_DEPTH_GENERATOR_BASELINE ); // mm + float F = (float)capture.get( CV_CAP_OPENNI_DEPTH_GENERATOR_FOCAL_LENGTH ); // pixels return b * F / minDistance; } diff --git a/samples/cpp/letter_recog.cpp b/samples/cpp/letter_recog.cpp index 61a75d70dc20cd214274ab6d7cdda5c759acaac7..9dd072befca1a1d7efb0ccf359b987b8384d1b5b 100644 --- a/samples/cpp/letter_recog.cpp +++ b/samples/cpp/letter_recog.cpp @@ -495,8 +495,8 @@ int build_knearest_classifier( char* data_filename, int K ) int ok = read_num_class_data( data_filename, 16, &data, &responses ); int nsamples_all = 0, ntrain_samples = 0; - int i, j; - double train_hr = 0, test_hr = 0; + //int i, j; + //double /*train_hr = 0,*/ test_hr = 0; CvANN_MLP mlp; if( !ok ) @@ -572,8 +572,8 @@ int build_nbayes_classifier( char* data_filename ) int ok = read_num_class_data( data_filename, 16, &data, &responses ); int nsamples_all = 0, ntrain_samples = 0; - int i, j; - double train_hr = 0, test_hr = 0; + //int i, j; + //double /*train_hr = 0, */test_hr = 0; CvANN_MLP mlp; if( !ok ) @@ -612,7 +612,7 @@ int build_nbayes_classifier( char* data_filename ) CvMat *result = cvCreateMat(1, nsamples_all - ntrain_samples, CV_32FC1); (int)nbayes.predict(&sample, result); int true_resp = 0; - int accuracy = 0; + //int accuracy = 0; for (int i = 0; i < nsamples_all - ntrain_samples; i++) { if (result->data.fl[i] == true_results[i]) diff --git a/samples/cpp/multicascadeclassifier.cpp b/samples/cpp/multicascadeclassifier.cpp index b25ee404359b4736f33ca5f60242f08f0e4f41dd..29fe7acd938cb98179e7f39a7906bc5b3aa78adc 100644 --- a/samples/cpp/multicascadeclassifier.cpp +++ b/samples/cpp/multicascadeclassifier.cpp @@ -155,7 +155,7 @@ void DetectAndDraw( Mat& img, CascadeClassifier& cascade) int radius; center.x = cvRound(r->x + r->width*0.5); center.y = cvRound(r->y + r->height*0.5); - radius = cvRound(r->width + r->height)*0.25; + radius = (int)(cvRound(r->width + r->height)*0.25); circle( img, center, radius, color, 3, 8, 0 ); } diff --git a/samples/cpp/points_classifier.cpp b/samples/cpp/points_classifier.cpp index 0479e29d4b5ae9806fcef793980875dbe5178043..b6a9027b0b95483a5eb6d62795e9e3554263491a 100644 --- a/samples/cpp/points_classifier.cpp +++ b/samples/cpp/points_classifier.cpp @@ -493,7 +493,7 @@ int main() for(;;) { - uchar key = waitKey(); + uchar key = (uchar)waitKey(); if( key == 27 ) break;