[Olena-patches] olena-2.0-121-gae6ece0 scribo/binarization/otsu.hh: Fix namespace ambiguities.

--- scribo/ChangeLog | 4 ++++ scribo/scribo/binarization/otsu_threshold.hh | 11 ++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e0f9201..9fb6f4e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2012-06-20 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + * scribo/binarization/otsu_threshold.hh: Fix namespace ambiguities. + 2012-05-22 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; Small fixes in Scribo. diff --git a/scribo/scribo/binarization/otsu_threshold.hh b/scribo/scribo/binarization/otsu_threshold.hh index fa2d725..b2407a0 100644 --- a/scribo/scribo/binarization/otsu_threshold.hh +++ b/scribo/scribo/binarization/otsu_threshold.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -77,13 +78,13 @@ namespace scribo /* calculation of probability density */ - util::array<double> pdf(hist.nvalues()); //probability distribution + mln::util::array<double> pdf(hist.nvalues()); //probability distribution for(unsigned i = 0; i< maxval; ++i) pdf[i] = (double)hist[i] / nsites; - util::array<double> cdf(hist.nvalues()); //cumulative probability distribution - util::array<double> myu(hist.nvalues()); // mean value for separation + mln::util::array<double> cdf(hist.nvalues()); //cumulative probability distribution + mln::util::array<double> myu(hist.nvalues()); // mean value for separation /* cdf & myu generation */ cdf[0] = pdf[0]; @@ -100,7 +101,7 @@ namespace scribo and determines optimal threshold value */ mln_value(I) threshold = literal::zero; double max_sigma = 0.0; - util::array<double> sigma(hist.nvalues()); // inter-class variance + mln::util::array<double> sigma(hist.nvalues()); // inter-class variance for(int i = 0; i < (maxval - 1); ++i) { -- 1.7.2.5