Commit 396cb068 authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

Fix namespace ambiguities.

	* scribo/binarization/internal/first_pass_functor.hh,
	* scribo/binarization/sauvola_threshold_image.hh,
	* scribo/subsampling/integral_single_image.hh: Add mln:: prefix.
parent 6713b18a
2010-10-11 Guillaume Lazzara <z@lrde.epita.fr>
Fix namespace ambiguities.
* scribo/binarization/internal/first_pass_functor.hh,
* scribo/binarization/sauvola_threshold_image.hh,
* scribo/subsampling/integral_single_image.hh: Add mln:: prefix.
2010-08-24 Guillaume Lazzara <z@lrde.epita.fr> 2010-08-24 Guillaume Lazzara <z@lrde.epita.fr>
* scribo/core/line_info.hh: Make stats computation more robust * scribo/core/line_info.hh: Make stats computation more robust
......
...@@ -126,7 +126,7 @@ namespace scribo ...@@ -126,7 +126,7 @@ namespace scribo
t_p); t_p);
# else # else
value::int_u8 t_p; value::int_u8 t_p;
convert::from_to(sauvola_threshold_formula(mean, stddev, mln::convert::from_to(sauvola_threshold_formula(mean, stddev,
K_, K_,
SCRIBO_DEFAULT_SAUVOLA_R), SCRIBO_DEFAULT_SAUVOLA_R),
t_p); t_p);
......
...@@ -437,7 +437,7 @@ namespace scribo ...@@ -437,7 +437,7 @@ namespace scribo
for(def::coord row = 0; row < nrows; ++row) for(def::coord row = 0; row < nrows; ++row)
for(def::coord col = 0; col < ncols; ++col) for(def::coord col = 0; col < ncols; ++col)
convert::from_to( mln::convert::from_to(
internal::compute_sauvola_threshold(P(row, col), simple, internal::compute_sauvola_threshold(P(row, col), simple,
squared, window_size, squared, window_size,
K, K,
......
...@@ -155,7 +155,7 @@ namespace scribo ...@@ -155,7 +155,7 @@ namespace scribo
+ v21*v21 + v22*v22 + v23*v23 + v21*v21 + v22*v22 + v23*v23
+ v31*v31 + v32*v32 + v33*v33; + v31*v31 + v32*v32 + v33*v33;
convert::from_to(local_sum / 9, *p_sub++); mln::convert::from_to(local_sum / 9, *p_sub++);
h_sum += local_sum; h_sum += local_sum;
h_sum_2 += local_sum_2; h_sum_2 += local_sum_2;
...@@ -193,7 +193,7 @@ namespace scribo ...@@ -193,7 +193,7 @@ namespace scribo
+ v21*v21 + v22*v22 + v23*v23 + v21*v21 + v22*v22 + v23*v23
+ v31*v31 + v32*v32 + v33*v33; + v31*v31 + v32*v32 + v33*v33;
convert::from_to(local_sum / 9, *p_sub++); mln::convert::from_to(local_sum / 9, *p_sub++);
h_sum += local_sum; h_sum += local_sum;
h_sum_2 += local_sum_2; h_sum_2 += local_sum_2;
...@@ -284,7 +284,7 @@ namespace scribo ...@@ -284,7 +284,7 @@ namespace scribo
ptr2 += 2; ptr2 += 2;
S local_sum = v11 + v12 + v21 + v22, S local_sum = v11 + v12 + v21 + v22,
local_sum_2 = v11*v11 + v12*v12 + v21*v21 + v22*v22; local_sum_2 = v11*v11 + v12*v12 + v21*v21 + v22*v22;
convert::from_to(local_sum / 4, *p_sub++); mln::convert::from_to(local_sum / 4, *p_sub++);
h_sum += local_sum; h_sum += local_sum;
h_sum_2 += local_sum_2; h_sum_2 += local_sum_2;
...@@ -319,7 +319,7 @@ namespace scribo ...@@ -319,7 +319,7 @@ namespace scribo
ptr2 += 2; ptr2 += 2;
S local_sum = v11 + v12 + v21 + v22, S local_sum = v11 + v12 + v21 + v22,
local_sum_2 = v11*v11 + v12*v12 + v21*v21 + v22*v22; local_sum_2 = v11*v11 + v12*v12 + v21*v21 + v22*v22;
convert::from_to(local_sum / 4, *p_sub++); mln::convert::from_to(local_sum / 4, *p_sub++);
h_sum += local_sum; h_sum += local_sum;
h_sum_2 += local_sum_2; h_sum_2 += local_sum_2;
......
Supports Markdown
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