* scribo/binarization/internal/first_pass_functor.hh, * scribo/binarization/sauvola_ms.hh, * scribo/canvas/integral_browsing.hh, * scribo/convert/to_base64.hh, * scribo/preprocessing/denoise_bg.hh: Here. --- scribo/ChangeLog | 10 ++++++++ .../binarization/internal/first_pass_functor.hh | 6 ++-- scribo/scribo/binarization/sauvola_ms.hh | 24 ++++++++++---------- scribo/scribo/canvas/integral_browsing.hh | 10 ++++---- scribo/scribo/convert/to_base64.hh | 4 +- scribo/scribo/preprocessing/denoise_bg.hh | 5 ++- 6 files changed, 35 insertions(+), 24 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d3a1780..b7e0f5a 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2011-05-06 Guillaume Lazzara <lazzara@fidji.lrde.epita.fr> + Fix namespace ambiguities. + + * scribo/binarization/internal/first_pass_functor.hh, + * scribo/binarization/sauvola_ms.hh, + * scribo/canvas/integral_browsing.hh, + * scribo/convert/to_base64.hh, + * scribo/preprocessing/denoise_bg.hh: Here. + +2011-05-06 Guillaume Lazzara <lazzara@fidji.lrde.epita.fr> + Improve PDF output. * demo/xml2doc/image_crop.cc: Cleanup temporary files. diff --git a/scribo/scribo/binarization/internal/first_pass_functor.hh b/scribo/scribo/binarization/internal/first_pass_functor.hh index fb52be5..0b1a7ac 100644 --- a/scribo/scribo/binarization/internal/first_pass_functor.hh +++ b/scribo/scribo/binarization/internal/first_pass_functor.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -64,7 +64,7 @@ namespace scribo image2d<value::int_u8> t_sub; unsigned n_nbhs; - util::array<int> dp; + mln::util::array<int> dp; double K_; diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index e8eb2c2..c1a3414 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -138,7 +138,7 @@ namespace scribo unsigned lambda_min, unsigned lambda_max, unsigned s, unsigned q, unsigned i, unsigned w, - const image2d<util::couple<double,double> >& integral_sum_sum_2, + const image2d<mln::util::couple<double,double> >& integral_sum_sum_2, double K) { typedef image2d<int_u8> I; @@ -188,7 +188,7 @@ namespace scribo // 2nd pass { - util::array<mln_value_(I) *> ptr(ratio); + mln::util::array<mln_value_(I) *> ptr(ratio); unsigned nrows = geom::nrows(e_2); mln_box_runend_piter_(I) sp(sub.domain()); // Backward. @@ -272,7 +272,7 @@ namespace scribo template <typename I, typename J, typename K> mln_ch_value(I, bool) multi_scale_binarization(const I& in, const J& e2, - const util::array<K>& t_ima, + const mln::util::array<K>& t_ima, unsigned s) { mln_ch_value(I,bool) out; @@ -758,10 +758,10 @@ namespace scribo // Compute domains of subsampled images and make sure they can be // divided by 2. template <typename I> - util::array<util::couple<mln_domain(I), unsigned> > + mln::util::array<mln::util::couple<mln_domain(I), unsigned> > compute_sub_domains(const I& ima, unsigned n_scales, unsigned s) { - util::array<util::couple<unsigned, unsigned> > n(n_scales + 2); + mln::util::array<mln::util::couple<unsigned, unsigned> > n(n_scales + 2); n(1) = mln::make::couple(ima.nrows(), ima.ncols()); n(2) = mln::make::couple(sub(n(1).first(), s), @@ -771,7 +771,7 @@ namespace scribo sub(n(i - 1).second(), 2)); - util::array<util::couple<mln_domain(I), unsigned> > out(n.size()); + mln::util::array<mln::util::couple<mln_domain(I), unsigned> > out(n.size()); out(0) = mln::make::couple(mln::make::box2d(1,1), 1u); out(1) = mln::make::couple(mln::make::box2d(ima.nrows(), ima.ncols()), 2u); @@ -833,7 +833,7 @@ namespace scribo unsigned lambda_max_2 = lambda_min_2 * q; - util::array<I> t_ima; + mln::util::array<I> t_ima; // Make sure t_ima indexes start from 2. { @@ -842,7 +842,7 @@ namespace scribo t_ima.append(dummy); } - util::array<I> sub_ima; + mln::util::array<I> sub_ima; // Make sure sub_ima indexes start from 2. { @@ -851,7 +851,7 @@ namespace scribo sub_ima.append(dummy); } - util::array<util::couple<box2d, unsigned> > + mln::util::array<mln::util::couple<box2d, unsigned> > sub_domains = internal::compute_sub_domains(input_1, nb_subscale, s); border::adjust(input_1, sub_domains(1).second()); @@ -859,7 +859,7 @@ namespace scribo // Resize input and compute integral images. - typedef image2d<util::couple<double,double> > integral_t; + typedef image2d<mln::util::couple<double,double> > integral_t; integral_t integral_sum_sum_2; // Subsampling from scale 1 to 2. diff --git a/scribo/scribo/canvas/integral_browsing.hh b/scribo/scribo/canvas/integral_browsing.hh index 286dc53..0ec3d83 100644 --- a/scribo/scribo/canvas/integral_browsing.hh +++ b/scribo/scribo/canvas/integral_browsing.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -40,7 +40,7 @@ namespace scribo template <typename F> - void integral_browsing(const image2d<util::couple<double, double> >& ima, + void integral_browsing(const image2d<mln::util::couple<double, double> >& ima, unsigned step, unsigned w, unsigned h, F& functor); @@ -75,13 +75,13 @@ namespace scribo template <typename F> - void integral_browsing(const image2d<util::couple<double, double> >& ima, + void integral_browsing(const image2d<mln::util::couple<double, double> >& ima, unsigned step, unsigned w, unsigned h, unsigned s, F& functor) { - typedef util::couple<double, double> V; + typedef mln::util::couple<double, double> V; typedef const V* Ptr; Ptr a_ima, b_ima, c_ima, d_ima; diff --git a/scribo/scribo/convert/to_base64.hh b/scribo/scribo/convert/to_base64.hh index 8df3ed2..81dda1f 100644 --- a/scribo/scribo/convert/to_base64.hh +++ b/scribo/scribo/convert/to_base64.hh @@ -81,7 +81,7 @@ namespace scribo template <typename I> void - to_base64(const Image<I>& input, util::array<unsigned char>& output); + to_base64(const Image<I>& input, mln::util::array<unsigned char>& output); # ifndef MLN_INCLUDE_ONLY @@ -116,7 +116,7 @@ namespace scribo template <typename I> void - to_base64(const Image<I>& input_, util::array<unsigned char>& output) + to_base64(const Image<I>& input_, mln::util::array<unsigned char>& output) { trace::entering("scribo::convert::to_base64"); diff --git a/scribo/scribo/preprocessing/denoise_bg.hh b/scribo/scribo/preprocessing/denoise_bg.hh index 8ad2d45..eda3803 100644 --- a/scribo/scribo/preprocessing/denoise_bg.hh +++ b/scribo/scribo/preprocessing/denoise_bg.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -131,7 +132,7 @@ namespace scribo unsigned nlabels; image2d<unsigned> lbl = labeling::background(input, nbh, nlabels); - util::array<unsigned> + mln::util::array<unsigned> result = labeling::compute(accu::meta::math::count(), lbl, nlabels); mln::fun::i2v::array<bool> f(nlabels + 1, false); -- 1.5.6.5