[Olena-patches] olena: olena-2.0-646-ga2d5c26 Remove Scribo debug code making side effects on streams.

* scribo/core/line_set.hh, * scribo/core/object_groups.hh, * scribo/core/paragraph_set.hh, * scribo/preprocessing/deskew_crop.hh, * scribo/primitive/extract/non_text_kmean.hh: Here. --- scribo/ChangeLog | 11 +++++++++++ scribo/scribo/core/line_set.hh | 2 -- scribo/scribo/core/object_groups.hh | 5 +---- scribo/scribo/core/paragraph_set.hh | 3 +-- scribo/scribo/preprocessing/deskew_crop.hh | 3 +-- scribo/scribo/primitive/extract/non_text_kmean.hh | 5 +---- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b5efaa7..2aee2ed 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,14 @@ +2013-08-27 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Remove Scribo debug code making side effects on streams. + + * scribo/core/line_set.hh, + * scribo/core/object_groups.hh, + * scribo/core/paragraph_set.hh, + * scribo/preprocessing/deskew_crop.hh, + * scribo/primitive/extract/non_text_kmean.hh: + Here. + 2013-08-26 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Improve the generation of Doxyfiles in Scribo. diff --git a/scribo/scribo/core/line_set.hh b/scribo/scribo/core/line_set.hh index 7200bdd..0de2484 100644 --- a/scribo/scribo/core/line_set.hh +++ b/scribo/scribo/core/line_set.hh @@ -453,14 +453,12 @@ namespace scribo { if (! (lhs.groups() == rhs.groups() && lhs.nelements() == rhs.nelements())) { - std::cout << "line.group" << std::endl; return false; } for_all_lines(l, lhs) if ( ! (lhs(l) != rhs(l))) { - std::cout << "line.info" << std::endl; return false; } diff --git a/scribo/scribo/core/object_groups.hh b/scribo/scribo/core/object_groups.hh index 53ba7f9..749f194 100644 --- a/scribo/scribo/core/object_groups.hh +++ b/scribo/scribo/core/object_groups.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -397,13 +397,11 @@ namespace scribo { if (! (lhs.components() == rhs.components())) { - std::cout << "group.comp" << std::endl; return false; } if (!( lhs.comp_to_group() == rhs.comp_to_group() && lhs.nelements() == rhs.nelements())) { - std::cout << "group.comp_to_group" << std::endl; return false; } @@ -411,7 +409,6 @@ namespace scribo for_all_groups(g, lhs) if (! (lhs(g) == rhs(g))) { - std::cout << "group.info" << std::endl; return false; } diff --git a/scribo/scribo/core/paragraph_set.hh b/scribo/scribo/core/paragraph_set.hh index 42bf4a3..0106acc 100644 --- a/scribo/scribo/core/paragraph_set.hh +++ b/scribo/scribo/core/paragraph_set.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -258,7 +258,6 @@ namespace scribo for_all_paragraphs(p, lhs) if (!(lhs(p) == rhs(p))) { - std::cout << "paragraph.info" << std::endl; return false; } diff --git a/scribo/scribo/preprocessing/deskew_crop.hh b/scribo/scribo/preprocessing/deskew_crop.hh index e504370..87880e0 100644 --- a/scribo/scribo/preprocessing/deskew_crop.hh +++ b/scribo/scribo/preprocessing/deskew_crop.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// Copyright (C) 2010, 2011, 2013 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -158,7 +158,6 @@ namespace scribo mlc_is_not_a(mln_value(I), value::Vectorial)::check(); double angle = internal::perform_deskew(crop_gl); - std::cout << angle << std::endl; mln_concrete(I) output = crop_gl; diff --git a/scribo/scribo/primitive/extract/non_text_kmean.hh b/scribo/scribo/primitive/extract/non_text_kmean.hh index 55b9a7b..e478b0e 100644 --- a/scribo/scribo/primitive/extract/non_text_kmean.hh +++ b/scribo/scribo/primitive/extract/non_text_kmean.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// Copyright (C) 2010, 2011, 2013 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -161,7 +161,6 @@ namespace scribo component_set<L> output; - std::cout << "Removing small elements" << std::endl; { image2d<bool> elts; initialize(elts, img_lbl8); @@ -175,8 +174,6 @@ namespace scribo } - std::cout << "Ignoring inner elements" << std::endl; - { // FIXME: We would like to use the convex hull instead of the bbox. internal::order_bbox<L> func(output); -- 1.7.10.4