Commit 1481194b authored by Lluis Gomez-Bigorda's avatar Lluis Gomez-Bigorda

Fix w64 warnings

parent 2315f9ca
...@@ -98,18 +98,18 @@ int main(int argc, char* argv[]) { ...@@ -98,18 +98,18 @@ int main(int argc, char* argv[]) {
voc, transitionProbabilities, emissionProbabilities); voc, transitionProbabilities, emissionProbabilities);
std::string output; std::string output;
double t_r = getTickCount(); double t_r = (double)getTickCount();
ocrTes->run(mask, output); ocrTes->run(mask, output);
output.erase(remove(output.begin(), output.end(), '\n'), output.end()); output.erase(remove(output.begin(), output.end(), '\n'), output.end());
cout << " OCR_Tesseract output \"" << output << "\". Done in " cout << " OCR_Tesseract output \"" << output << "\". Done in "
<< ((double)getTickCount() - t_r)*1000/getTickFrequency() << " ms." << endl; << ((double)getTickCount() - t_r)*1000/getTickFrequency() << " ms." << endl;
t_r = getTickCount(); t_r = (double)getTickCount();
ocrNM->run(mask, output); ocrNM->run(mask, output);
cout << " OCR_NM output \"" << output << "\". Done in " cout << " OCR_NM output \"" << output << "\". Done in "
<< ((double)getTickCount() - t_r)*1000/getTickFrequency() << " ms." << endl; << ((double)getTickCount() - t_r)*1000/getTickFrequency() << " ms." << endl;
t_r = getTickCount(); t_r = (double)getTickCount();
ocrCNN->run(image, mask, output); ocrCNN->run(image, mask, output);
cout << " OCR_CNN output \"" << output << "\". Done in " cout << " OCR_CNN output \"" << output << "\". Done in "
<< ((double)getTickCount() - t_r)*1000/getTickFrequency() << " ms." << endl; << ((double)getTickCount() - t_r)*1000/getTickFrequency() << " ms." << endl;
......
...@@ -459,7 +459,7 @@ OCRBeamSearchClassifierCNN::OCRBeamSearchClassifierCNN (const string& filename) ...@@ -459,7 +459,7 @@ OCRBeamSearchClassifierCNN::OCRBeamSearchClassifierCNN (const string& filename)
nr_feature = weights.rows; nr_feature = weights.rows;
nr_class = weights.cols; nr_class = weights.cols;
patch_size = sqrt(kernels.cols); patch_size = (int)sqrt(kernels.cols);
// algorithm internal parameters // algorithm internal parameters
window_size = 32; window_size = 32;
quad_size = 12; quad_size = 12;
......
...@@ -525,7 +525,7 @@ public: ...@@ -525,7 +525,7 @@ public:
char_center.x += words_rect[w].x; char_center.x += words_rect[w].x;
char_center.y += words_rect[w].y; char_center.y += words_rect[w].y;
int win_size = max(contours_rect.at(i).width,contours_rect.at(i).height); int win_size = max(contours_rect.at(i).width,contours_rect.at(i).height);
win_size += win_size*0.6; // add some pixels in the border TODO: is this a parameter for the user space? win_size += (int)(win_size*0.6); // add some pixels in the border TODO: is this a parameter for the user space?
Rect char_rect = Rect(char_center.x-win_size/2,char_center.y-win_size/2,win_size,win_size); Rect char_rect = Rect(char_center.x-win_size/2,char_center.y-win_size/2,win_size,win_size);
char_rect &= Rect(0,0,image.cols,image.rows); char_rect &= Rect(0,0,image.cols,image.rows);
Mat tmp_image; Mat tmp_image;
...@@ -969,9 +969,9 @@ void OCRHMMClassifierCNN::eval( InputArray _src, vector<int>& out_class, vector< ...@@ -969,9 +969,9 @@ void OCRHMMClassifierCNN::eval( InputArray _src, vector<int>& out_class, vector<
int quad_id = 1; int quad_id = 1;
for (int q_x=0; q_x<=window_size-quad_size; q_x=q_x+(quad_size/2-1)) for (int q_x=0; q_x<=window_size-quad_size; q_x=q_x+(int)(quad_size/2-1))
{ {
for (int q_y=0; q_y<=window_size-quad_size; q_y=q_y+(quad_size/2-1)) for (int q_y=0; q_y<=window_size-quad_size; q_y=q_y+(int)(quad_size/2-1))
{ {
Rect quad_rect = Rect(q_x,q_y,quad_size,quad_size); Rect quad_rect = Rect(q_x,q_y,quad_size,quad_size);
quad = img(quad_rect); quad = img(quad_rect);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment