From: Mathieu Barnachon Date: Sun, 24 Nov 2013 12:22:10 +0000 (+0100) Subject: Fix some warning. X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~708^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e1955759afaffb87bbb0d7a9abd03b7356be9414;p=profile%2Fivi%2Fopencv.git Fix some warning. Adding missing credit for a function. --- diff --git a/samples/cpp/train_HOG.cpp b/samples/cpp/train_HOG.cpp index 2cc15db..5975bf8 100644 --- a/samples/cpp/train_HOG.cpp +++ b/samples/cpp/train_HOG.cpp @@ -150,6 +150,7 @@ void sample_neg( const vector< Mat > & full_neg_lst, vector< Mat > & neg_lst, co } } +// From http://www.juergenwiki.de/work/wiki/doku.php?id=public:hog_descriptor_computation_and_visualization Mat get_hogdescriptor_visu(Mat& color_origImg, vector& descriptorValues, const Size & size ) { const int DIMX = size.width; @@ -158,7 +159,6 @@ Mat get_hogdescriptor_visu(Mat& color_origImg, vector& descriptorValues, Mat visu; resize(color_origImg, visu, Size(color_origImg.cols*zoomFac, color_origImg.rows*zoomFac)); - int blockSize = 16; int cellSize = 8; int gradientBinSize = 9; float radRangeForOneBin = CV_PI/(float)gradientBinSize; // dividing 180° into 9 bins, how large (in rad) is one bin? @@ -166,7 +166,6 @@ Mat get_hogdescriptor_visu(Mat& color_origImg, vector& descriptorValues, // prepare data structure: 9 orientation / gradient strenghts for each cell int cells_in_x_dir = DIMX / cellSize; int cells_in_y_dir = DIMY / cellSize; - int totalnrofcells = cells_in_x_dir * cells_in_y_dir; float*** gradientStrengths = new float**[cells_in_y_dir]; int** cellUpdateCounter = new int*[cells_in_y_dir]; for (int y=0; y& descriptorValues, for (int cellNr=0; cellNr<4; cellNr++) { // compute corresponding cell nr - int cellx = blockx; - int celly = blocky; + cellx = blockx; + celly = blocky; if (cellNr==1) celly++; if (cellNr==2) cellx++; if (cellNr==3) @@ -440,7 +439,7 @@ int main( int argc, char** argv ) load_images( argv[1], argv[2], pos_lst ); labels.assign( pos_lst.size(), +1 ); - const int old = labels.size(); + const unsigned int old = labels.size(); load_images( argv[3], argv[4], full_neg_lst ); sample_neg( full_neg_lst, neg_lst, Size( 96,160 ) ); labels.insert( labels.end(), neg_lst.size(), -1 );