Chiebot-Mirror
/
opencv_contrib
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #921 from logic1988/master

Browse Source 
Bug in Text module when set Optimization Level to "-Ofast" in xcode (#921)

* Bug in Text module when set Optimization Level to "-Ofast" in xcode

Bug when set Optimization Level to "-Ofast" (Fastest, Aggressive Optimizations) in xcode, read the wrong patch_size parameters to 7 (should be 8). This bug will occured in loadOCRHMMClassifierCNN function called by example_text_character_recognition and example_text_segmented_word_recognition.

*  Bug in Text module when set Optimization Level to "-Ofast" in xcode

Bug when set Optimization Level to "-Ofast" (Fastest, Aggressive Optimizations) in xcode, read the wrong patch_size parameters to 7 (should be 8). This bug will occured in loadOCRHMMClassifierCNN function called by example_text_character_recognition and example_text_segmented_word_recognition.
pull/937/head
logic1988 8 years ago committed by Alexander Alekhin
parent 4ec1d827c1
commit 99294995f0
2 changed files with 22 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      modules/text/src/ocr_beamsearch_decoder.cpp
  2. 16
      modules/text/src/ocr_hmm_decoder.cpp

21
modules/text/src/ocr_beamsearch_decoder.cpp
Unescape View File

@ -566,7 +566,7 @@ OCRBeamSearchClassifierCNN::OCRBeamSearchClassifierCNN (const string& filename)
nr_feature = weights.rows;
nr_class = weights.cols;
patch_size = (int)sqrt((float)kernels.cols);
patch_size = (int)round(sqrt((float)kernels.cols));
window_size = 4*patch_size;
step_size = 4;
quad_size = 12;
@ -602,8 +602,12 @@ void OCRBeamSearchClassifierCNN::eval( InputArray _src, vector< vector<double> >
Mat tmp;
Mat img;
int sz = src.cols - window_size;
int sz_window_quad = window_size - quad_size;
int sz_half_quad = (int)(quad_size/2-1);
int sz_quad_patch = quad_size - patch_size;
// begin sliding window loop foreach detection window
for (int x_c=0; x_c<=src.cols-window_size; x_c=x_c+step_size)
for (int x_c = 0; x_c <= sz; x_c += step_size)
{
img = src(Rect(Point(x_c,0),Size(window_size,window_size)));
@ -613,21 +617,21 @@ void OCRBeamSearchClassifierCNN::eval( InputArray _src, vector< vector<double> >
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 <= sz_window_quad; q_x += sz_half_quad)
{
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 <= sz_window_quad; q_y += sz_half_quad)
{
Rect quad_rect = Rect(q_x,q_y,quad_size,quad_size);
quad = img(quad_rect);
//start sliding window (8x8) in each tile and store the patch as row in data_pool
for (int w_x=0; w_x<=quad_size-patch_size; w_x++)
for (int w_x = 0; w_x <= sz_quad_patch; w_x++)
{
for (int w_y=0; w_y<=quad_size-patch_size; w_y++)
for (int w_y = 0; w_y <= sz_quad_patch; w_y++)
{
quad(Rect(w_x,w_y,patch_size,patch_size)).copyTo(tmp);
quad(Rect(w_x,w_y,patch_size,patch_size)).convertTo(tmp, CV_64F);
tmp = tmp.reshape(0,1);
tmp.convertTo(tmp, CV_64F);
normalizeAndZCA(tmp);
vector<double> patch;
tmp.copyTo(patch);
@ -657,6 +661,7 @@ void OCRBeamSearchClassifierCNN::eval( InputArray _src, vector< vector<double> >
}
}
//do dot product of each normalized and whitened patch
//each pool is averaged and this yields a representation of 9xD
Mat feature = Mat::zeros(9,kernels.rows,CV_64FC1);

16
modules/text/src/ocr_hmm_decoder.cpp
Unescape View File

@ -982,7 +982,7 @@ OCRHMMClassifierCNN::OCRHMMClassifierCNN (const string& filename)
nr_feature = weights.rows;
nr_class = weights.cols;
patch_size = (int)sqrt((float)kernels.cols);
patch_size = (int)round(sqrt((float)kernels.cols));
// algorithm internal parameters
window_size = 32;
num_quads = 25;
@ -1017,21 +1017,23 @@ void OCRHMMClassifierCNN::eval( InputArray _src, vector<int>& out_class, vector<
int quad_id = 1;
for (int q_x=0; q_x<=window_size-quad_size; q_x=q_x+(int)(quad_size/2-1))
int sz_window_quad = window_size - quad_size;
int sz_half_quad = (int)(quad_size/2-1);
int sz_quad_patch = quad_size - patch_size;
for (int q_x=0; q_x <= sz_window_quad; q_x += sz_half_quad)
{
for (int q_y=0; q_y<=window_size-quad_size; q_y=q_y+(int)(quad_size/2-1))
for (int q_y=0; q_y <= sz_window_quad; q_y += sz_half_quad)
{
Rect quad_rect = Rect(q_x,q_y,quad_size,quad_size);
quad = img(quad_rect);
//start sliding window (8x8) in each tile and store the patch as row in data_pool
for (int w_x=0; w_x<=quad_size-patch_size; w_x++)
for (int w_x = 0; w_x <= sz_quad_patch; w_x++)
{
for (int w_y=0; w_y<=quad_size-patch_size; w_y++)
for (int w_y = 0; w_y <= sz_quad_patch; w_y++)
{
quad(Rect(w_x,w_y,patch_size,patch_size)).copyTo(tmp);
quad(Rect(w_x,w_y,patch_size,patch_size)).convertTo(tmp, CV_64F);
tmp = tmp.reshape(0,1);
tmp.convertTo(tmp, CV_64F);
normalizeAndZCA(tmp);
vector<double> patch;
tmp.copyTo(patch);

Write Preview
Loading…
Cancel
Save