[Olena-patches] olena-2.0-90-g50b0efa scribo/binarization/sauvola_ms.hh: More fixes in debug.

--- scribo/ChangeLog | 4 ++++ scribo/scribo/binarization/sauvola_ms.hh | 23 ++++++----------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4fed8d3..aa3bcae 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2012-08-23 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + * scribo/binarization/sauvola_ms.hh: More fixes in debug. + +2012-08-23 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Fix warning in Otsu related files. * scribo/binarization/otsu_threshold.hh, diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index 70964ea..fe9f1f0 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -72,7 +72,7 @@ # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG # include <scribo/binarization/internal/local_threshold_debug.hh> # include <mln/io/pgm/save.hh> -# include <mln/debug/filename.hh> +# include <scribo/make/debug_filename.hh> # endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG # include <mln/util/timer.hh> @@ -228,11 +228,8 @@ namespace scribo if (f.parent.element(p) == p) { // test over the component cardinality - f.msk.element(p) = f.card.element(p) > lambda_min; -// && f.card.element(p) < lambda_max; -# ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG - f.full_msk.element(p) = true; -# endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG + f.msk.element(p) = f.card.element(p) > lambda_min + && f.card.element(p) < lambda_max; if (f.msk.element(p) && e_2(sq) == 0u) { @@ -245,9 +242,6 @@ namespace scribo { // Propagation f.msk.element(p) = f.msk.element(f.parent.element(p)); -# ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG - f.full_msk.element(p) = f.full_msk.element(f.parent.element(p)); -# endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG if (f.msk.element(p) && e_2(sq) == 0u) { @@ -272,10 +266,7 @@ namespace scribo # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG if (internal::threshold_image_output) io::pbm::save(f.msk, - mln::debug::filename(internal::threshold_image_output)); - if (internal::full_threshold_image_output) - io::pbm::save(f.full_msk, - mln::debug::filename(internal::full_threshold_image_output)); + scribo::make::debug_filename(internal::threshold_image_output).c_str()); # endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG return f.t_sub; @@ -915,8 +906,7 @@ namespace scribo # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG if (internal::scale_image_output) - io::pgm::save(e_2, - mln::debug::filename(internal::scale_image_output)); + io::pgm::save(e_2, internal::scale_image_output); # endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG // Propagate scale values. @@ -929,8 +919,7 @@ namespace scribo # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG if (internal::scale_iz_image_output) - io::pgm::save(e_2, - mln::debug::filename(internal::scale_iz_image_output)); + io::pgm::save(e_2, internal::scale_iz_image_output); # endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG // Binarize -- 1.7.2.5