[Olena-patches] last-svn-commit-491-g396cb06 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. --- scribo/ChangeLog | 8 ++++++++ .../binarization/internal/first_pass_functor.hh | 6 +++--- .../scribo/binarization/sauvola_threshold_image.hh | 2 +- scribo/scribo/subsampling/integral_single_image.hh | 8 ++++---- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index dc6c426..986678e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,11 @@ +2010-10-11 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + 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 &lt;z(a)lrde.epita.fr&gt; * scribo/core/line_info.hh: Make stats computation more robust diff --git a/scribo/scribo/binarization/internal/first_pass_functor.hh b/scribo/scribo/binarization/internal/first_pass_functor.hh index 92ccc55..694779f 100644 --- a/scribo/scribo/binarization/internal/first_pass_functor.hh +++ b/scribo/scribo/binarization/internal/first_pass_functor.hh @@ -126,9 +126,9 @@ namespace scribo t_p); # else value::int_u8 t_p; - convert::from_to(sauvola_threshold_formula(mean, stddev, - K_, - SCRIBO_DEFAULT_SAUVOLA_R), + mln::convert::from_to(sauvola_threshold_formula(mean, stddev, + K_, + SCRIBO_DEFAULT_SAUVOLA_R), t_p); # endif // SCRIBO_SAUVOLA_DEBUG diff --git a/scribo/scribo/binarization/sauvola_threshold_image.hh b/scribo/scribo/binarization/sauvola_threshold_image.hh index 0225d37..beaf06e 100644 --- a/scribo/scribo/binarization/sauvola_threshold_image.hh +++ b/scribo/scribo/binarization/sauvola_threshold_image.hh @@ -437,7 +437,7 @@ namespace scribo for(def::coord row = 0; row < nrows; ++row) for(def::coord col = 0; col < ncols; ++col) - convert::from_to( + mln::convert::from_to( internal::compute_sauvola_threshold(P(row, col), simple, squared, window_size, K, diff --git a/scribo/scribo/subsampling/integral_single_image.hh b/scribo/scribo/subsampling/integral_single_image.hh index 077172a..fc0c8dd 100644 --- a/scribo/scribo/subsampling/integral_single_image.hh +++ b/scribo/scribo/subsampling/integral_single_image.hh @@ -155,7 +155,7 @@ namespace scribo + v21*v21 + v22*v22 + v23*v23 + 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_2 += local_sum_2; @@ -193,7 +193,7 @@ namespace scribo + v21*v21 + v22*v22 + v23*v23 + 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_2 += local_sum_2; @@ -284,7 +284,7 @@ namespace scribo ptr2 += 2; S local_sum = v11 + v12 + v21 + 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_2 += local_sum_2; @@ -319,7 +319,7 @@ namespace scribo ptr2 += 2; S local_sum = v11 + v12 + v21 + 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_2 += local_sum_2; -- 1.5.6.5