[Olena-patches] last-svn-commit-158-ga2d98b1 Small fixes.

* debug/save_linked_bboxes_image.hh: Fix namespace ambiguity. * src/pbm_text_in_doc.cc: Fix comment. * src/text_in_picture: Change few settings. * text/recognition.hh: Fix invalid default arguments. --- scribo/ChangeLog | 12 ++++++++++++ scribo/debug/save_linked_bboxes_image.hh | 8 ++++---- scribo/src/pbm_text_in_doc.cc | 3 +-- scribo/src/text_in_picture.cc | 4 ++-- scribo/text/recognition.hh | 6 ++---- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index be33d47..2a9a626 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,17 @@ 2010-06-15 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Small fixes. + + * debug/save_linked_bboxes_image.hh: Fix namespace ambiguity. + + * src/pbm_text_in_doc.cc: Fix comment. + + * src/text_in_picture: Change few settings. + + * text/recognition.hh: Fix invalid default arguments. + +2010-06-15 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Remove deprecated code. * util/all.hh, diff --git a/scribo/debug/save_linked_bboxes_image.hh b/scribo/debug/save_linked_bboxes_image.hh index 1e328f8..ef70435 100644 --- a/scribo/debug/save_linked_bboxes_image.hh +++ b/scribo/debug/save_linked_bboxes_image.hh @@ -171,7 +171,7 @@ namespace scribo draw::bounding_boxes(tmp, components, box_value); draw::bounding_box_links(tmp, array, link_value, anchor); - io::ppm::save(tmp, filename); + mln::io::ppm::save(tmp, filename); trace::exiting("scribo::debug::save_linked_bboxes_image"); } @@ -214,7 +214,7 @@ namespace scribo left_link, right_link, value); - io::ppm::save(tmp, filename); + mln::io::ppm::save(tmp, filename); trace::exiting("scribo::debug::save_linked_bboxes_image"); } @@ -249,7 +249,7 @@ namespace scribo left_link_value, right_link_value, validated_link_value); - io::ppm::save(tmp, filename); + mln::io::ppm::save(tmp, filename); trace::exiting("scribo::debug::save_linked_bboxes_image"); } @@ -275,7 +275,7 @@ namespace scribo draw::bounding_boxes(tmp, components, box_value); draw::bounding_box_links(tmp, components, g, link_value); - io::ppm::save(tmp, filename); + mln::io::ppm::save(tmp, filename); trace::exiting("scribo::debug::save_linked_bboxes_image"); } diff --git a/scribo/src/pbm_text_in_doc.cc b/scribo/src/pbm_text_in_doc.cc index 993bbcb..4c760a0 100644 --- a/scribo/src/pbm_text_in_doc.cc +++ b/scribo/src/pbm_text_in_doc.cc @@ -124,9 +124,8 @@ int main(int argc, char* argv[]) // Saving results scribo::io::xml::save_text_lines(argv[1], lines, "out.xml"); - // Specify shift due to previous crop. + // Specify shift due to potential previous crop. scribo::io::text_boxes::save(lines, argv[2], crop_shift); - trace::exiting("main"); } diff --git a/scribo/src/text_in_picture.cc b/scribo/src/text_in_picture.cc index c47786c..a7cf8d2 100644 --- a/scribo/src/text_in_picture.cc +++ b/scribo/src/text_in_picture.cc @@ -128,11 +128,11 @@ namespace mln { config() { - sauvola_s = 3u; + sauvola_s = 2u; // 3? sauvola_min_w = 51u; // Group Filtering - bbox_h_ratio = 1.50f; + bbox_h_ratio = 1.60f; bbox_overlap = 0.80f; small_groups = 3; v_thickness = 8; diff --git a/scribo/text/recognition.hh b/scribo/text/recognition.hh index 44533e9..a3ccd50 100644 --- a/scribo/text/recognition.hh +++ b/scribo/text/recognition.hh @@ -52,8 +52,6 @@ # include <scribo/core/macros.hh> -# include <scribo/util/text.hh> - # include <scribo/text/clean.hh> # include <scribo/core/line_set.hh> @@ -89,7 +87,7 @@ namespace scribo void recognition(const Image<I>& line, const char *language, - const std::string& output_file = 0); + const std::string& output_file = std::string()); @@ -187,7 +185,7 @@ namespace scribo void recognition(const Image<I>& line_, const char *language, - const std::string& output_file = 0) + const std::string& output_file = std::string()) { trace::entering("scribo::text::recognition"); -- 1.5.6.5