June 2011 - Olena-patches

last-svn-commit-922-g1fc7f0c Disable OCR in ICDAR toolchains.
by Guillaume Lazzara 07 Jun '11

07 Jun '11

* scribo/toolchain/internal/content_in_doc_functor.hh, * src/Makefile.am, * src/contest/DAE-2011/content_in_hdoc_dae.cc: Here. --- scribo/ChangeLog | 17 +++++++++++++++++ .../toolchain/internal/content_in_doc_functor.hh | 5 +++++ scribo/src/Makefile.am | 3 ++- scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc | 4 ++-- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a2d00e3..9ba701f 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,22 @@ 2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Disable OCR in ICDAR toolchains. + + * scribo/toolchain/internal/content_in_doc_functor.hh, + * src/Makefile.am, + * src/contest/DAE-2011/content_in_hdoc_dae.cc: Here. + +2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add one more toolchain for DAE contest. + + * scribo/toolchain/internal/content_in_doc_functor.hh: + * src/Makefile.am + * src/contest/DAE-2011/Makefile.am + * src/contest/DAE-2011/content_in_hdoc_dae.cc + +2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/contest/DAE-2011/content_in_hdoc_dae.cc: Specify output dir. 2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/toolchain/internal/content_in_doc_functor.hh b/scribo/scribo/toolchain/internal/content_in_doc_functor.hh index 4308056..4f2c074 100644 --- a/scribo/scribo/toolchain/internal/content_in_doc_functor.hh +++ b/scribo/scribo/toolchain/internal/content_in_doc_functor.hh @@ -57,7 +57,10 @@ # include <scribo/preprocessing/denoise_fg.hh> +# ifndef SCRIBO_NOCR # include <scribo/text/recognition.hh> +# endif // ! SCRIBO_NOCR + # include <scribo/text/merging.hh> # include <scribo/text/link_lines.hh> # include <scribo/text/paragraphs.hh> @@ -437,6 +440,7 @@ namespace scribo on_progress(); +# ifndef SCRIBO_NOCR // Text recognition if (enable_ocr) { @@ -446,6 +450,7 @@ namespace scribo on_progress(); } +# endif // ! SCRIBO_NOCR // // Link text lines // on_new_progress_label("Linking text lines"); diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 6ab5d7d..26f2ade 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -28,7 +28,8 @@ SUBDIRS = \ preprocessing \ table \ text \ - toolchain + toolchain \ + util diff --git a/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc b/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc index f13b8f6..5986142 100644 --- a/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc +++ b/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// Copyright (C) 2011 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -24,7 +24,7 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -# define SCRIBO_NOCR +#define SCRIBO_NOCR #include <libgen.h> #include <fstream> -- 1.5.6.5

1 0

last-svn-commit-921-g5facd27 src/contest/DAE-2011/content_in_hdoc_dae.cc: Specify output dir.
by Guillaume Lazzara 07 Jun '11

07 Jun '11

--- scribo/ChangeLog | 4 ++++ scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e31876d..a2d00e3 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/contest/DAE-2011/content_in_hdoc_dae.cc: Specify output dir. + +2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new example. * src/util/Makefile.am, diff --git a/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc b/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc index 5309d49..f13b8f6 100644 --- a/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc +++ b/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc @@ -60,6 +60,7 @@ const char *args_desc[][2] = { { "input.tif", "An image." }, + { "output_dir", "Output directory." }, {0, 0} }; @@ -70,10 +71,10 @@ int main(int argc, char* argv[]) using namespace scribo; using namespace mln; - if (argc != 2) + if (argc != 3) return scribo::debug::usage(argv, "Document Image Analysis in Historical Documents", - "input.tif", + "input.tif output_dir", args_desc); trace::entering("main"); @@ -144,7 +145,7 @@ int main(int argc, char* argv[]) } std::stringstream ss; - ss << basename(argv[1]) << p << ".pbm"; + ss << argv[2] << "/" << basename(argv[1]) << "." << p << ".pbm"; mln::io::pbm::save(output, ss.str()); } -- 1.5.6.5

1 0

last-svn-commit-920-g7014c9b configure.ac: Configure scribo/src/util.
by Guillaume Lazzara 07 Jun '11

07 Jun '11

--- ChangeLog | 4 ++++ configure.ac | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 435ecb6..d178113 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Configure scribo/src/util. + +2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Configure ICDAR contests directories. 2011-05-05 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr> diff --git a/configure.ac b/configure.ac index c87ffcf..66643a4 100644 --- a/configure.ac +++ b/configure.ac @@ -339,6 +339,7 @@ AC_CONFIG_FILES([ scribo/src/text/Makefile scribo/src/toolchain/Makefile scribo/src/toolchain/nepomuk/Makefile + scribo/src/util/Makefile ]) AC_CONFIG_FILES([scribo/tests/data.hh]) -- 1.5.6.5

1 0

last-svn-commit-919-gbe32894 Add a new example.
by Guillaume Lazzara 07 Jun '11

07 Jun '11

* src/util/Makefile.am, * src/util/component_precise_outline.cc: New. --- scribo/ChangeLog | 7 ++ scribo/src/{primitive/remove => util}/Makefile.am | 6 +- .../component_precise_outline.cc} | 61 ++++++++++---------- 3 files changed, 41 insertions(+), 33 deletions(-) copy scribo/src/{primitive/remove => util}/Makefile.am (86%) copy scribo/src/{debug/show_text_lines_wo_seps.cc => util/component_precise_outline.cc} (67%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 3cc2cac..e31876d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new example. + + * src/util/Makefile.am, + * src/util/component_precise_outline.cc: New. + +2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Add binaries for ICDAR 2011 contests. * scribo/toolchain/internal/content_in_hdoc_functor.hh: Remove diff --git a/scribo/src/primitive/remove/Makefile.am b/scribo/src/util/Makefile.am similarity index 86% copy from scribo/src/primitive/remove/Makefile.am copy to scribo/src/util/Makefile.am index a673886..729a7c0 100644 --- a/scribo/src/primitive/remove/Makefile.am +++ b/scribo/src/util/Makefile.am @@ -16,8 +16,8 @@ include $(top_srcdir)/scribo/scribo.mk +noinst_PROGRAMS = \ + component_precise_outline -noinst_PROGRAMS = \ - separators -separators_SOURCES = separators.cc +component_precise_outline_SOURCES = component_precise_outline.cc diff --git a/scribo/src/debug/show_text_lines_wo_seps.cc b/scribo/src/util/component_precise_outline.cc similarity index 67% copy from scribo/src/debug/show_text_lines_wo_seps.cc copy to scribo/src/util/component_precise_outline.cc index 98ef05e..09c3f90 100644 --- a/scribo/src/debug/show_text_lines_wo_seps.cc +++ b/scribo/src/util/component_precise_outline.cc @@ -23,65 +23,66 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#include <iostream> - #include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> -#include <mln/value/int_u16.hh> -#include <mln/draw/box_plain.hh> -#include <mln/pw/all.hh> -#include <mln/core/image/dmorph/image_if.hh> +#include <mln/io/ppm/save.hh> #include <mln/data/convert.hh> +#include <mln/value/rgb8.hh> #include <mln/literal/colors.hh> +#include <mln/draw/line.hh> +#include <mln/util/timer.hh> -#include <scribo/text/recognition.hh> - +#include <scribo/util/component_precise_outline.hh> #include <scribo/debug/usage.hh> -#include <scribo/core/document.hh> -#include <scribo/core/component_set.hh> -#include <scribo/core/object_links.hh> -#include <scribo/core/object_groups.hh> - -#include <scribo/text/extract_lines.hh> - -#include <scribo/io/xml/save.hh> +#include <mln/pw/all.hh> +#include <mln/core/image/dmorph/image_if.hh> const char *args_desc[][2] = { + { "input.pbm", "A binary image" }, + { "output.ppm", "Output image." }, {0, 0} }; - -int main(int argc, char* argv[]) +int main(int argc, char *argv[]) { - using namespace scribo; using namespace mln; + using namespace scribo; if (argc != 3) return scribo::debug::usage(argv, - "Show text lines", - "input.pbm output.ppm", + "Extract component precise outlines", + "input.pbm output.pbm", args_desc); trace::entering("main"); image2d<bool> input; - mln::io::pbm::load(input, argv[1]); + io::pbm::load(input, argv[1]); + + mln::util::timer t; + t.start(); - typedef image2d<scribo::def::lbl_type> L; - line_set<L> lines = text::extract_lines(input, c8()); + typedef mln::p_array<mln::point2d> par_t; + par_t par = scribo::util::component_precise_outline(input); - // Color image with line bboxes. + t.stop(); + std::cout << t << std::endl; + + image2d<value::rgb8> input_rgb = data::convert(value::rgb8(), input); + + point2d last_point = par[0]; + mln_piter_(par_t) p(par); + for_all(p) { - image2d<value::rgb8> output = data::convert(value::rgb8(), input); - for_all_lines(l, lines) - if (lines(l).is_textline()) - mln::draw::box(output, lines(l).bbox(), literal::red); - mln::io::ppm::save(output, argv[2]); + mln::draw::line(input_rgb, last_point, p, literal::red); + last_point = p; } + io::ppm::save(input_rgb, argv[2]); + trace::exiting("main"); } -- 1.5.6.5

1 0

last-svn-commit-918-gafb3778 configure.ac: Configure ICDAR contests directories.
by Guillaume Lazzara 07 Jun '11

07 Jun '11

--- ChangeLog | 4 ++++ configure.ac | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 852ea6e..435ecb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Configure ICDAR contests directories. + 2011-05-05 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr> * configure.ac: Configure scribo/tests/util. diff --git a/configure.ac b/configure.ac index fdbddd9..c87ffcf 100644 --- a/configure.ac +++ b/configure.ac @@ -323,6 +323,8 @@ AC_CONFIG_FILES([ scribo/src/binarization/Makefile scribo/src/contest/Makefile scribo/src/contest/hdibco-2010/Makefile + scribo/src/contest/hdlac-2011/Makefile + scribo/src/contest/DAE-2011/Makefile scribo/src/debug/Makefile scribo/src/filter/Makefile scribo/src/misc/Makefile -- 1.5.6.5

1 0

last-svn-commit-917-g3f75647 Add binaries for ICDAR 2011 contests.
by Guillaume Lazzara 07 Jun '11

07 Jun '11

* scribo/toolchain/internal/content_in_hdoc_functor.hh: Remove debug. * src/content_in_hdoc.cc: Disable debug. * src/contest/DAE-2011/Makefile.am, * src/contest/Makefile.am, * src/contest/hdlac-2011/Makefile.am: New targets. * src/contest/DAE-2011/content_in_hdoc_dae.cc, * src/contest/hdlac-2011/content_in_hdoc_hdlac.cc: New. --- scribo/ChangeLog | 16 +++ .../toolchain/internal/content_in_hdoc_functor.hh | 6 +- scribo/src/content_in_hdoc.cc | 20 ++-- .../estim => src/contest/DAE-2011}/Makefile.am | 22 +++-- .../DAE-2011/content_in_hdoc_dae.cc} | 111 ++++++++++++-------- scribo/src/contest/Makefile.am | 7 +- .../estim => src/contest/hdlac-2011}/Makefile.am | 22 +++-- .../hdlac-2011/content_in_hdoc_hdlac.cc} | 91 +++++++++-------- 8 files changed, 184 insertions(+), 111 deletions(-) copy scribo/{tests/estim => src/contest/DAE-2011}/Makefile.am (64%) copy scribo/src/{non_text_components.cc => contest/DAE-2011/content_in_hdoc_dae.cc} (51%) copy scribo/{tests/estim => src/contest/hdlac-2011}/Makefile.am (63%) copy scribo/src/{non_text_components.cc => contest/hdlac-2011/content_in_hdoc_hdlac.cc} (56%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index c4768a4..3cc2cac 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,21 @@ 2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Add binaries for ICDAR 2011 contests. + + * scribo/toolchain/internal/content_in_hdoc_functor.hh: Remove + debug. + + * src/content_in_hdoc.cc: Disable debug. + + * src/contest/DAE-2011/Makefile.am, + * src/contest/Makefile.am, + * src/contest/hdlac-2011/Makefile.am: New targets. + + * src/contest/DAE-2011/content_in_hdoc_dae.cc, + * src/contest/hdlac-2011/content_in_hdoc_hdlac.cc: New. + +2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes. * scribo/io/xml/internal/page_xml_visitor.hh: Fix duplicate ids. diff --git a/scribo/scribo/toolchain/internal/content_in_hdoc_functor.hh b/scribo/scribo/toolchain/internal/content_in_hdoc_functor.hh index adfcdb3..5e98f3e 100644 --- a/scribo/scribo/toolchain/internal/content_in_hdoc_functor.hh +++ b/scribo/scribo/toolchain/internal/content_in_hdoc_functor.hh @@ -272,7 +272,8 @@ namespace scribo { on_new_progress_label("Denoise..."); - std::cout << ">> min_area = " << min_area << std::endl; + if (verbose) + std::cout << ">> min_area = " << min_area << std::endl; input_cleaned = preprocessing::denoise_fg(input_cleaned, c8(), min_area); @@ -547,7 +548,8 @@ namespace scribo if (!(closing_size % 2)) closing_size += 1; - std::cout << ">> CLosing size = " << closing_size << std::endl; + if (verbose) + std::cout << ">> CLosing size = " << closing_size << std::endl; component_set<L> elements = scribo::primitive::extract::non_text_hdoc(doc, closing_size); diff --git a/scribo/src/content_in_hdoc.cc b/scribo/src/content_in_hdoc.cc index ed15693..737b1d3 100644 --- a/scribo/src/content_in_hdoc.cc +++ b/scribo/src/content_in_hdoc.cc @@ -31,7 +31,6 @@ #include <mln/core/image/image2d.hh> -#include <mln/io/pbm/save.hh> #include <mln/io/magick/load.hh> #include <scribo/toolchain/content_in_hdoc.hh> @@ -95,8 +94,6 @@ int main(int argc, char* argv[]) scribo::make::internal::debug_filename_prefix = argv[argc - 1]; } - scribo::debug::logger().set_level(scribo::debug::None); - trace::entering("main"); Magick::InitializeMagick(*argv); @@ -198,16 +195,23 @@ int main(int argc, char* argv[]) find_line_seps, find_whitespace_seps, !language.empty(), language); + doc.set_filename(basename(argv[1])); + // Saving results std::cout << "Saving results..." << std::endl; -// scribo::io::xml::save(doc, "page.xml", scribo::io::xml::Page); + scribo::io::xml::save(doc, "page.xml", scribo::io::xml::Page); std::cout << "End of process - " << t << std::endl; - scribo::io::xml::save(doc, argv[2], scribo::io::xml::PageExtended); - scribo::io::img::save(doc, "debug.png", scribo::io::img::DebugWoImage); - scribo::io::img::save(doc, "full.png", scribo::io::img::Full); - // scribo::io::xml::save(doc, "full.xml", scribo::io::xml::Full); +// scribo::io::xml::save(doc, argv[2], scribo::io::xml::PageExtended); + + // scribo::io::img::save(doc, "debug.png", scribo::io::img::DebugWoImage); + // std::cout << "Debug image saved " << t << std::endl; + // scribo::io::img::save(doc, "full.png", scribo::io::img::DebugWithImage); + // std::cout << "Full Debug image saved " << t << std::endl; + // scribo::io::img::save(doc, "full_hd.png", scribo::io::img::Full); + +// sleep(10); trace::exiting("main"); } diff --git a/scribo/tests/estim/Makefile.am b/scribo/src/contest/DAE-2011/Makefile.am similarity index 64% copy from scribo/tests/estim/Makefile.am copy to scribo/src/contest/DAE-2011/Makefile.am index 1c39ab6..09bccd7 100644 --- a/scribo/tests/estim/Makefile.am +++ b/scribo/src/contest/DAE-2011/Makefile.am @@ -17,13 +17,21 @@ ## Process this file through Automake to create Makefile.in. -include $(top_srcdir)/scribo/tests/tests.mk +include $(top_srcdir)/scribo/scribo.mk -check_PROGRAMS = \ - font_color \ - font_boldness +noinst_PROGRAMS = -font_color_SOURCES = font_color.cc -font_boldness_SOURCES = font_boldness.cc -TESTS = $(check_PROGRAMS) +if HAVE_MAGICKXX + +noinst_PROGRAMS += content_in_hdoc_dae + +content_in_hdoc_dae_SOURCES = content_in_hdoc_dae.cc +content_in_hdoc_dae_CPPFLAGS = $(AM_CPPFLAGS) \ + $(TESSERACT_CPPFLAGS) \ + -I$(top_builddir) +content_in_hdoc_dae_LDFLAGS = $(AM_LDFLAGS) \ + -lpthread \ + $(MAGICKXX_LDFLAGS) + +endif HAVE_MAGICKXX \ No newline at end of file diff --git a/scribo/src/non_text_components.cc b/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc similarity index 51% copy from scribo/src/non_text_components.cc copy to scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc index 0f4cce4..5309d49 100644 --- a/scribo/src/non_text_components.cc +++ b/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -24,22 +24,24 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +# define SCRIBO_NOCR #include <libgen.h> #include <fstream> #include <iostream> +#include <sstream> #include <mln/core/image/image2d.hh> -#include <mln/io/pbm/save.hh> #include <mln/io/magick/load.hh> -#include <scribo/toolchain/content_in_doc.hh> +#include <scribo/toolchain/content_in_hdoc.hh> #include <scribo/toolchain/text_in_doc_preprocess.hh> #include <scribo/core/document.hh> #include <scribo/debug/usage.hh> +#include <scribo/debug/logger.hh> #include <scribo/preprocessing/crop_without_localization.hh> #include <scribo/preprocessing/crop.hh> @@ -48,12 +50,16 @@ #include <scribo/io/img/save.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/labeling/compute.hh> +#include <mln/labeling/foreground.hh> +#include <mln/util/timer.hh> + + + const char *args_desc[][2] = { - { "input.*", "An image." }, - { "non_text_comps.pbm", "Non text components mask." }, - { "enable_debug", "Enable debug image output. Set to 1 or 0." }, - { "enable_tabstops", "Enable tabstops detection. Set to 1 or 0." }, + { "input.tif", "An image." }, {0, 0} }; @@ -64,65 +70,84 @@ int main(int argc, char* argv[]) using namespace scribo; using namespace mln; - if (argc != 4 && argc != 3 && argc != 5) + if (argc != 2) return scribo::debug::usage(argv, - "Extract non text components mask/", - "input.* non_text_comps.pbm [enable_debug] [enable_tabstops]", + "Document Image Analysis in Historical Documents", + "input.tif", args_desc); - std::string out_img = basename(argv[1]); - out_img.erase(out_img.size() - 4); - - std::string filename_prefix = out_img + "_debug"; - scribo::debug::logger().set_filename_prefix(filename_prefix.c_str()); - if (argc > 3 && atoi(argv[3])) - scribo::debug::logger().set_level(scribo::debug::Special); - else - scribo::debug::logger().set_level(scribo::debug::None); - trace::entering("main"); Magick::InitializeMagick(*argv); + mln::util::timer t; + t.start(); + typedef image2d<scribo::def::lbl_type> L; image2d<value::rgb8> input; mln::io::magick::load(input, argv[1]); - util::timer t; - t.start(); - // Preprocess document - image2d<bool> + image2d<bool> input_preproc; + { input_preproc = toolchain::text_in_doc_preprocess(input, false, 0.34); - - bool denoise = true; + // Cleanup components on borders + { + typedef scribo::def::lbl_type V; + V nlabels; + image2d<V> lbl = labeling::foreground(input_preproc, c8(), nlabels); + mln::util::array<box2d> + bbox = labeling::compute(accu::shape::bbox<point2d>(), lbl, nlabels); + + const box2d& b = input.domain(); + for_all_ncomponents(e, nlabels) + if (bbox(e).pmin().row() == b.pmin().row() + || bbox(e).pmax().row() == b.pmax().row() + || bbox(e).pmin().col() == b.pmin().col() + || bbox(e).pmax().col() == b.pmax().col()) + data::fill(((input_preproc | bbox(e)).rw() | (pw::value(lbl) == pw::cst(e))).rw(), false); + } + } + + bool denoise = 1; std::string language = ""; bool find_line_seps = true; - bool find_whitespace_seps = (argc > 4 && atoi(argv[4])); - - std::cout << "Running with the following options :" - << " ocr_language = " << language - << " | find_lines_seps = " << find_line_seps - << " | find_whitespace_seps = " << find_whitespace_seps - << " | debug = " << scribo::debug::logger().is_enabled() - << std::endl; + bool find_whitespace_seps = true; // Run document toolchain. // Text std::cout << "Analysing document..." << std::endl; document<L> - doc = scribo::toolchain::content_in_doc(input, input_preproc, denoise, - find_line_seps, find_whitespace_seps, - !language.empty(), language); - t.stop(); - std::cout << t << std::endl; - - mln::io::pbm::save(data::convert(bool(), doc.elements().labeled_image()), argv[2]); + doc = scribo::toolchain::content_in_hdoc(input, input_preproc, denoise, + find_line_seps, find_whitespace_seps, + !language.empty(), language); + + doc.set_filename(basename(argv[1])); + + const paragraph_set<L>& par_set = doc.paragraphs(); + image2d<bool> output(input.domain()); + for_all_paragraphs(p, par_set) + { + data::fill(output, true); + const paragraph_info<L>& current_par = par_set(p); + const mln::util::array<line_id_t>& line_ids = current_par.line_ids(); + const unsigned nelements = line_ids.nelements(); + + for (unsigned i = 0; i < nelements; ++i) + { + const line_id_t& line_id = line_ids(i); + const line_info<L>& current_line = par_set.lines()(line_id); + + scribo::draw::line_components(output, par_set.lines(), current_line, false); + } + + std::stringstream ss; + ss << basename(argv[1]) << p << ".pbm"; + mln::io::pbm::save(output, ss.str()); + } - scribo::io::img::save(doc, out_img + "_debug_wo_image.png", scribo::io::img::DebugWoImage); - scribo::io::img::save(doc, out_img + "_debug_with_image.png", scribo::io::img::DebugWithImage); trace::exiting("main"); } diff --git a/scribo/src/contest/Makefile.am b/scribo/src/contest/Makefile.am index b1d2dfb..ade408a 100644 --- a/scribo/src/contest/Makefile.am +++ b/scribo/src/contest/Makefile.am @@ -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. # @@ -20,4 +21,6 @@ include $(top_srcdir)/scribo/scribo.mk SUBDIRS = \ - hdibco-2010 \ No newline at end of file + hdibco-2010 \ + hdlac-2011 \ + DAE-2011 \ No newline at end of file diff --git a/scribo/tests/estim/Makefile.am b/scribo/src/contest/hdlac-2011/Makefile.am similarity index 63% copy from scribo/tests/estim/Makefile.am copy to scribo/src/contest/hdlac-2011/Makefile.am index 1c39ab6..f5ead52 100644 --- a/scribo/tests/estim/Makefile.am +++ b/scribo/src/contest/hdlac-2011/Makefile.am @@ -17,13 +17,21 @@ ## Process this file through Automake to create Makefile.in. -include $(top_srcdir)/scribo/tests/tests.mk +include $(top_srcdir)/scribo/scribo.mk -check_PROGRAMS = \ - font_color \ - font_boldness +noinst_PROGRAMS = -font_color_SOURCES = font_color.cc -font_boldness_SOURCES = font_boldness.cc -TESTS = $(check_PROGRAMS) +if HAVE_MAGICKXX + +noinst_PROGRAMS += content_in_hdoc_hdlac + +content_in_hdoc_hdlac_SOURCES = content_in_hdoc_hdlac.cc +content_in_hdoc_hdlac_CPPFLAGS = $(AM_CPPFLAGS) \ + $(TESSERACT_CPPFLAGS) \ + -I$(top_builddir) +content_in_hdoc_hdlac_LDFLAGS = $(AM_LDFLAGS) \ + -lpthread \ + $(MAGICKXX_LDFLAGS) + +endif HAVE_MAGICKXX \ No newline at end of file diff --git a/scribo/src/non_text_components.cc b/scribo/src/contest/hdlac-2011/content_in_hdoc_hdlac.cc similarity index 56% copy from scribo/src/non_text_components.cc copy to scribo/src/contest/hdlac-2011/content_in_hdoc_hdlac.cc index 0f4cce4..045803f 100644 --- a/scribo/src/non_text_components.cc +++ b/scribo/src/contest/hdlac-2011/content_in_hdoc_hdlac.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -24,6 +24,7 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +# define SCRIBO_NOCR #include <libgen.h> #include <fstream> @@ -31,15 +32,15 @@ #include <mln/core/image/image2d.hh> -#include <mln/io/pbm/save.hh> #include <mln/io/magick/load.hh> -#include <scribo/toolchain/content_in_doc.hh> +#include <scribo/toolchain/content_in_hdoc.hh> #include <scribo/toolchain/text_in_doc_preprocess.hh> #include <scribo/core/document.hh> #include <scribo/debug/usage.hh> +#include <scribo/debug/logger.hh> #include <scribo/preprocessing/crop_without_localization.hh> #include <scribo/preprocessing/crop.hh> @@ -48,12 +49,17 @@ #include <scribo/io/img/save.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/labeling/compute.hh> +#include <mln/labeling/foreground.hh> +#include <mln/util/timer.hh> + + + const char *args_desc[][2] = { - { "input.*", "An image." }, - { "non_text_comps.pbm", "Non text components mask." }, - { "enable_debug", "Enable debug image output. Set to 1 or 0." }, - { "enable_tabstops", "Enable tabstops detection. Set to 1 or 0." }, + { "input.tif", "An image." }, + { "out.xml", "Result of the document analysis." }, {0, 0} }; @@ -64,65 +70,66 @@ int main(int argc, char* argv[]) using namespace scribo; using namespace mln; - if (argc != 4 && argc != 3 && argc != 5) + if (argc != 3) return scribo::debug::usage(argv, - "Extract non text components mask/", - "input.* non_text_comps.pbm [enable_debug] [enable_tabstops]", + "Document Image Analysis in Historical Documents", + "input.tif out.xml", args_desc); - std::string out_img = basename(argv[1]); - out_img.erase(out_img.size() - 4); - - std::string filename_prefix = out_img + "_debug"; - scribo::debug::logger().set_filename_prefix(filename_prefix.c_str()); - if (argc > 3 && atoi(argv[3])) - scribo::debug::logger().set_level(scribo::debug::Special); - else - scribo::debug::logger().set_level(scribo::debug::None); - trace::entering("main"); Magick::InitializeMagick(*argv); + mln::util::timer t; + t.start(); + typedef image2d<scribo::def::lbl_type> L; image2d<value::rgb8> input; mln::io::magick::load(input, argv[1]); - util::timer t; - t.start(); - // Preprocess document - image2d<bool> + image2d<bool> input_preproc; + { input_preproc = toolchain::text_in_doc_preprocess(input, false, 0.34); - - bool denoise = true; + // Cleanup components on borders + { + typedef scribo::def::lbl_type V; + V nlabels; + image2d<V> lbl = labeling::foreground(input_preproc, c8(), nlabels); + mln::util::array<box2d> + bbox = labeling::compute(accu::shape::bbox<point2d>(), lbl, nlabels); + + const box2d& b = input.domain(); + for_all_ncomponents(e, nlabels) + if (bbox(e).pmin().row() == b.pmin().row() + || bbox(e).pmax().row() == b.pmax().row() + || bbox(e).pmin().col() == b.pmin().col() + || bbox(e).pmax().col() == b.pmax().col()) + data::fill(((input_preproc | bbox(e)).rw() | (pw::value(lbl) == pw::cst(e))).rw(), false); + } + } + + bool denoise = 1; std::string language = ""; bool find_line_seps = true; - bool find_whitespace_seps = (argc > 4 && atoi(argv[4])); - - std::cout << "Running with the following options :" - << " ocr_language = " << language - << " | find_lines_seps = " << find_line_seps - << " | find_whitespace_seps = " << find_whitespace_seps - << " | debug = " << scribo::debug::logger().is_enabled() - << std::endl; + bool find_whitespace_seps = true; // Run document toolchain. // Text std::cout << "Analysing document..." << std::endl; document<L> - doc = scribo::toolchain::content_in_doc(input, input_preproc, denoise, - find_line_seps, find_whitespace_seps, - !language.empty(), language); - t.stop(); - std::cout << t << std::endl; + doc = scribo::toolchain::content_in_hdoc(input, input_preproc, denoise, + find_line_seps, find_whitespace_seps, + !language.empty(), language); - mln::io::pbm::save(data::convert(bool(), doc.elements().labeled_image()), argv[2]); + doc.set_filename(basename(argv[1])); - scribo::io::img::save(doc, out_img + "_debug_wo_image.png", scribo::io::img::DebugWoImage); - scribo::io::img::save(doc, out_img + "_debug_with_image.png", scribo::io::img::DebugWithImage); + // Saving results + std::cout << "Saving results..." << std::endl; + scribo::io::xml::save(doc, argv[2], scribo::io::xml::Page); + std::cout << "End of process - " << t << std::endl; trace::exiting("main"); } -- 1.5.6.5

1 0

last-svn-commit-916-g21c1887 Small fixes.
by Guillaume Lazzara 07 Jun '11

07 Jun '11

* scribo/io/xml/internal/page_xml_visitor.hh: Fix duplicate ids. * scribo/toolchain/internal/content_in_hdoc_functor.hh: Remove debug and disable OCR. * scribo/util/component_precise_outline.hh: Remove debug. --- scribo/ChangeLog | 11 +++++++ scribo/scribo/io/xml/internal/page_xml_visitor.hh | 15 ++++++++- .../toolchain/internal/content_in_hdoc_functor.hh | 32 +++++++++++-------- scribo/scribo/util/component_precise_outline.hh | 4 -- 4 files changed, 42 insertions(+), 20 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 59e3e84..c4768a4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,14 @@ +2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> + + Small fixes. + + * scribo/io/xml/internal/page_xml_visitor.hh: Fix duplicate ids. + + * scribo/toolchain/internal/content_in_hdoc_functor.hh: Remove + debug and disable OCR. + + * scribo/util/component_precise_outline.hh: Remove debug. + 2011-06-01 Guillaume Lazzara <z(a)lrde.epita.fr> Fix use of uninitialized values. diff --git a/scribo/scribo/io/xml/internal/page_xml_visitor.hh b/scribo/scribo/io/xml/internal/page_xml_visitor.hh index 8373b02..dab1cce 100644 --- a/scribo/scribo/io/xml/internal/page_xml_visitor.hh +++ b/scribo/scribo/io/xml/internal/page_xml_visitor.hh @@ -85,6 +85,7 @@ namespace scribo private: // Attributes std::ofstream& output; mutable int base_vertical_line_id_; + mutable int base_text_id_; mutable L lbl_; }; @@ -113,13 +114,23 @@ namespace scribo // 0, so vertical and horizontal lines with the same id // exist. base_vertical_line_id_ = doc.hline_seps_comps().nelements(); + base_text_id_ = 0; // Preambule print_PAGE_preambule(output, doc, true); // Text if (doc.has_text()) + { + + // FIXME: counting the number of valid lines... + for_all_paragraphs(p, doc.paragraphs()) + if (doc.paragraphs()(p).is_valid()) + ++base_text_id_; + --base_text_id_; + doc.paragraphs().accept(*this); + } // Page elements (Pictures, ...) if (doc.has_elements()) @@ -191,8 +202,8 @@ namespace scribo case component::DropCapital: { - output << " <TextRegion id=\"r" << id << "\" " - << " Type=\"Drop_Capital\">" + output << " <TextRegion id=\"r" << base_text_id_ + id << "\" " + << " type=\"drop-capital\">" // FIXME: should not be inline here! << std::endl; internal::print_image_coords(output, par, " "); diff --git a/scribo/scribo/toolchain/internal/content_in_hdoc_functor.hh b/scribo/scribo/toolchain/internal/content_in_hdoc_functor.hh index 24d24a3..adfcdb3 100644 --- a/scribo/scribo/toolchain/internal/content_in_hdoc_functor.hh +++ b/scribo/scribo/toolchain/internal/content_in_hdoc_functor.hh @@ -70,7 +70,10 @@ # include <scribo/postprocessing/images_to_drop_capital.hh> +# ifndef SCRIBO_NOCR # include <scribo/text/recognition.hh> +# endif // ! SCRIBO_NOCR + # include <scribo/text/merging.hh> # include <scribo/text/link_lines.hh> # include <scribo/text/paragraphs.hh> @@ -505,6 +508,8 @@ namespace scribo # endif // ! SCRIBO_NDEBUG //===== END OF DEBUG ===== + +# ifndef SCRIBO_NOCR // Text recognition if (enable_ocr) { @@ -514,6 +519,7 @@ namespace scribo on_progress(); } +# endif // ! SCRIBO_NOCR on_new_progress_label("Extracting paragraphs"); @@ -524,11 +530,11 @@ namespace scribo on_new_progress_label("Filtering paragraphs"); - paragraph_set<L> parset_f = filter::paragraphs_bbox_overlap(parset); - doc.set_paragraphs(parset_f); + // paragraph_set<L> parset_f = filter::paragraphs_bbox_overlap(parset); + // doc.set_paragraphs(parset_f); - // parset = filter::paragraphs_bbox_overlap(parset); - // doc.set_paragraphs(parset); + parset = filter::paragraphs_bbox_overlap(parset); + doc.set_paragraphs(parset); on_progress(); @@ -557,14 +563,14 @@ namespace scribo on_progress(); -// TEMPORARY DEBUG - on_new_progress_label("Saving debug data"); - doc.set_paragraphs(parset); - scribo::io::img::save(doc, "debug_wo_filter.png", scribo::io::img::DebugWoImage); - scribo::io::img::save(doc, "full_wo_filter.png", scribo::io::img::DebugWithImage); - doc.set_paragraphs(parset_f); - on_progress(); -// END OF TEMPORARY DEBUG +// // TEMPORARY DEBUG +// on_new_progress_label("Saving debug data"); +// doc.set_paragraphs(parset); +// scribo::io::img::save(doc, "debug_wo_filter.png", scribo::io::img::DebugWoImage); +// scribo::io::img::save(doc, "full_wo_filter.png", scribo::io::img::DebugWithImage); +// doc.set_paragraphs(parset_f); +// on_progress(); +// // END OF TEMPORARY DEBUG on_new_progress_label("Cleanup miscellaneous false positive"); @@ -604,8 +610,6 @@ namespace scribo on_end(); - sleep(10); - return doc; } diff --git a/scribo/scribo/util/component_precise_outline.hh b/scribo/scribo/util/component_precise_outline.hh index 70fc995..175160c 100644 --- a/scribo/scribo/util/component_precise_outline.hh +++ b/scribo/scribo/util/component_precise_outline.hh @@ -386,13 +386,9 @@ namespace scribo } } - std::cout << "Before filter points - " << points.nsites() << std::endl; - mln::p_array waypoints; internal::filter_points(points, waypoints); - std::cout << "After filter points - " << waypoints.nsites() << std::endl; - trace::exiting("scribo::util::component_precise_outline"); return waypoints; } -- 1.5.6.5

1 0

last-svn-commit-913-g3aef9a5 mln/draw/polygon.hh: New.
by Guillaume Lazzara 07 Jun '11

07 Jun '11

--- milena/ChangeLog | 4 ++ milena/mln/draw/{line.hh => polygon.hh} | 76 ++++++++++++++++++------------- 2 files changed, 48 insertions(+), 32 deletions(-) copy milena/mln/draw/{line.hh => polygon.hh} (55%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 47dbff5..459cce6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/draw/polygon.hh: New. + +2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a missing conversion routine for object ids. * mln/convert/from_to.hxx, diff --git a/milena/mln/draw/line.hh b/milena/mln/draw/polygon.hh similarity index 55% copy from milena/mln/draw/line.hh copy to milena/mln/draw/polygon.hh index 528dce3..5c6c917 100644 --- a/milena/mln/draw/line.hh +++ b/milena/mln/draw/polygon.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -17,27 +16,24 @@ // // As a special exception, you may use this file as part of a free // software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this +// instantiate templates or use macros or inpolygon functions from this // file, or you compile this file and link it with other files to produce // an executable, this file does not by itself cause the resulting // executable to be covered by the GNU General Public License. This // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_DRAW_LINE_HH -# define MLN_DRAW_LINE_HH +#ifndef MLN_DRAW_POLYGON_HH +# define MLN_DRAW_POLYGON_HH /// \file /// -/// Draw a line in an image. -/// \fixme Add specializations for horizontal lines (use pointers/memset). +/// Draw a polygon in an image. +/// \fixme Add specializations for horizontal polygons (use pointers/memset). # include <mln/core/concept/image.hh> -# include <mln/core/site_set/p_line2d.hh> -# include <mln/core/image/imorph/safe.hh> -# include <mln/data/paste.hh> -# include <mln/pw/image.hh> -# include <mln/pw/cst.hh> +# include <mln/core/site_set/p_array.hh> +# include <mln/draw/line.hh> namespace mln @@ -46,41 +42,57 @@ namespace mln namespace draw { - /*! Draw a line at level \p v in image \p ima between the points - * \p beg and \p end. + /*! Draw a polygon at level \p v in image \p ima. * * \param[in,out] ima The image to be drawn. - * \param[in] beg The start point to drawn line. - * \param[in] end The end point to drawn line. + * \param[in] par The polygon site set. * \param[in] v The value to assign to all drawn pixels. * * \pre \p ima has to be initialized. - * \pre \p ima has \p beg. - * \pre \p ima has \p end. * */ template <typename I> - void line(Image& ima, - const mln_psite(I)& beg, const mln_psite(I)& end, - const mln_value(I)& v); + void polygon(Image& ima, + const p_array<mln_site(I)>& par, + const mln_value(I)& v, + unsigned output_ratio); + + // \overload + template <typename I> + void polygon(Image& ima, + const p_array<mln_site(I)>& par, + const mln_value(I)& v); # ifndef MLN_INCLUDE_ONLY template <typename I> - inline - void line(Image& ima_, - const mln_psite(I)& beg, const mln_psite(I)& end, - const mln_value(I)& v) + void polygon(Image& ima_, + const p_array<mln_site(I)>& par, + const mln_value(I)& v, + unsigned output_ratio) { I& ima = exact(ima_); mln_precondition(ima.is_valid()); - if (! ima.has(beg)) - trace::warning("Begin site is not part of the given image."); - if (! ima.has(end)) - trace::warning("End site is not part of the given image."); - data::paste(pw::cst(v) | p_line2d(beg, end), - safe(ima).rw()); + mln_precondition(par.nelements() > 1); + + mln_site(I) p_last, tmp; + mln_piter(p_array<mln_site(I)>) p(par); + p_last = par[0] / output_ratio; + for_all(p) + { + tmp = p / output_ratio; + draw::line(ima, p_last, tmp, v); + p_last = tmp; + } + } + + template <typename I> + void polygon(Image& ima, + const p_array<mln_site(I)>& par, + const mln_value(I)& v) + { + polygon(ima, par, v, 1); } # endif // ! MLN_INCLUDE_ONLY @@ -90,4 +102,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_DRAW_LINE_HH +#endif // ! MLN_DRAW_POLYGON_HH -- 1.5.6.5

1 0

last-svn-commit-912-gaea0fc0 Add a missing conversion routine for object ids.
by Guillaume Lazzara 07 Jun '11

07 Jun '11

* mln/convert/from_to.hxx, * mln/util/object_id.hh: Here. --- milena/ChangeLog | 7 ++++++ milena/mln/convert/from_to.hxx | 7 +++++- milena/mln/util/object_id.hh | 41 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 52 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8ea11b0..47dbff5 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a missing conversion routine for object ids. + + * mln/convert/from_to.hxx, + * mln/util/object_id.hh: Here. + 2011-05-26 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/draw/site_set.hh: new. diff --git a/milena/mln/convert/from_to.hxx b/milena/mln/convert/from_to.hxx index cc7cc15..7891e9a 100644 --- a/milena/mln/convert/from_to.hxx +++ b/milena/mln/convert/from_to.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -84,6 +84,7 @@ namespace mln namespace util { template <typename T> class array; + template <typename Tag, typename V> class object_id; } namespace value { @@ -473,6 +474,10 @@ namespace mln from_to(from.second(), to.second()); } + // util::object_id<Tag,V> -> V. + template <typename Tag, typename V> + void from_to_(const util::object_id<Tag,V>& from, V& to_); + } // end of namespace mln::convert::over_load } // end of namespace mln::convert diff --git a/milena/mln/util/object_id.hh b/milena/mln/util/object_id.hh index d7db929..794abc4 100644 --- a/milena/mln/util/object_id.hh +++ b/milena/mln/util/object_id.hh @@ -38,6 +38,24 @@ namespace mln { + // Forward declaration + namespace util { template <typename Tag, typename V> class object_id; } + + namespace convert + { + + namespace over_load + { + + // object_id<Tag,V> -> V. + template <typename Tag, typename V> + void from_to_(const util::object_id<Tag,V>& from, V& to_); + + } // end of namespace mln::convert::over_load + + } // end of namespace mln::convert + + namespace util { @@ -90,9 +108,12 @@ namespace mln bool operator<(const object_id<Tag,V>& lhs, const object_id<Tag,V>& rhs); + } // end of namespace mln::util # ifndef MLN_INCLUDE_ONLY + namespace util + { template <typename Tag, typename V> inline @@ -205,10 +226,26 @@ namespace mln return lhs.value() < rhs.value(); } + } // end of namespace mln::util -# endif // ! MLN_INCLUDE_ONLY + namespace convert + { - } // end of namespace mln::util + namespace over_load + { + + // object_id<Tag,V> -> V. + template <typename Tag, typename V> + void from_to_(const util::object_id<Tag,V>& from, V& to_) + { + to_ = from.value(); + } + + } // end of namespace mln::convert::over_load + + } // end of namespace mln::convert + +# endif // ! MLN_INCLUDE_ONLY } // end of namespace mln -- 1.5.6.5

1 0

last-svn-commit-911-ga32b976 scribo/text/paragraphs_closing.hh: Revamp code.
by Guillaume Lazzara 07 Jun '11

07 Jun '11

--- scribo/ChangeLog | 4 + scribo/scribo/text/paragraphs_closing.hh | 284 ++++++++++++++++++------------ 2 files changed, 175 insertions(+), 113 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 6403a35..5cf6f94 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/text/paragraphs_closing.hh: Revamp code. + +2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/util/box_is_included.hh: New. 2011-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/text/paragraphs_closing.hh b/scribo/scribo/text/paragraphs_closing.hh index ec1d5c8..efc5259 100644 --- a/scribo/scribo/text/paragraphs_closing.hh +++ b/scribo/scribo/text/paragraphs_closing.hh @@ -31,6 +31,9 @@ /// /// Paragraphs closing using CRLA. +# include <mln/draw/line.hh> +# include <scribo/draw/line_components.hh> + namespace scribo { @@ -39,162 +42,217 @@ namespace scribo using namespace mln; - template< typename L, typename V > - void - paragraphs_closing(image2d<V>& output, - const paragraph_set<L>& par_set, - const box2d& domain); + template< typename L> + mln_concrete(L) + paragraphs_closing(const paragraph_set<L>& parset); + # ifndef MLN_INCLUDE_ONLY - template< typename V > - inline - void horizontal_CRLA(const image2d<V>& input, - image2d<V>& output, - const mln::util::array<int>& deltas) + namespace internal { - mln_piter(image2d<V>) p(input.domain()); - int count = 0; - unsigned nrows = input.nrows(); - unsigned ncols = input.ncols(); - V last_pixel_value = 0; - for (unsigned i = 0; i < nrows; ++i) + template<typename L> + inline + void horizontal_CRLA(const Image<L>& input_, + Image<L>& output_, + const mln::util::array<int>& deltas) { - for (unsigned j = 0; j < ncols; ++j) - { - const V& current_pixel = input.at_(i, j); + const L& input = exact(input_); + L& output = exact(output_); + mln_precondition(input.is_valid()); + mln_precondition(output.is_valid()); + + mln_piter(L) p(input.domain()); + int count = 0; + unsigned nrows = input.nrows(); + unsigned ncols = input.ncols(); + mln_value(L) last_pixel_value = 0; - if (!current_pixel) + for (unsigned i = 0; i < nrows; ++i) + { + for (unsigned j = 0; j < ncols; ++j) { - if (last_pixel_value) + const mln_value(L)& current_pixel = input.at_(i, j); + + if (!current_pixel) { - unsigned k = j + 1; - for (; !input.at_(i, k) && (k < ncols); ++k); + if (last_pixel_value) + { + unsigned k = j + 1; + for (; !(input.at_(i, k)) && (k < ncols); ++k); - count = k - j; - const int threshold = deltas(last_pixel_value - 1); + count = k - j; + const int threshold = deltas(last_pixel_value); - if (last_pixel_value == input.at_(i, k) && count < threshold) - for (unsigned l = j; l <= k; ++l) - output.at_(i, l) = last_pixel_value; + if (last_pixel_value == input.at_(i, k) && count < threshold) + for (unsigned l = j; l <= k; ++l) + output.at_(i, l) = last_pixel_value; - j = k; - last_pixel_value = 0; + j = k; + last_pixel_value = 0; + } + } + else + { + output.at_(i, j) = current_pixel; + last_pixel_value = current_pixel; } - } - else - { - output.at_(i, j) = current_pixel; - last_pixel_value = current_pixel; } } } - } - template< typename V > - inline - void vertical_CRLA(const image2d<V>& input, - image2d<V>& output, - const mln::util::array<int>& deltas) - { - mln_piter(image2d<V>) p(input.domain()); - int count = 0; - unsigned nrows = input.nrows(); - unsigned ncols = input.ncols(); - V last_pixel_value = 0; - - for (unsigned j = 0; j < ncols; ++j) + template<typename L> + inline + void vertical_CRLA(const Image<L>& input_, + Image<L>& output_, + const mln::util::array<int>& deltas) { - for (unsigned i = 0; i < nrows; ++i) - { - const V& current_pixel = input.at_(i, j); - - if (!current_pixel) - { - if (last_pixel_value) - { - unsigned k = i + 1; - for (; !input.at_(k, j) && (k < nrows); ++k); + const L& input = exact(input_); + L& output = exact(output_); + mln_precondition(input.is_valid()); + mln_precondition(output.is_valid()); - count = k - i; - const int threshold = deltas(last_pixel_value - 1); + mln_piter(L) p(input.domain()); + int count = 0; + unsigned nrows = input.nrows(); + unsigned ncols = input.ncols(); + mln_value(L) last_pixel_value = 0; - if (last_pixel_value == input.at_(k, j) - && count < threshold) - for (unsigned l = i; l <= k; ++l) - output.at_(l, j) = last_pixel_value; + for (unsigned j = 0; j < ncols; ++j) + { + for (unsigned i = 0; i < nrows; ++i) + { + const mln_value(L)& current_pixel = input.at_(i, j); - i = k; - last_pixel_value = 0; + if (!current_pixel) + { + if (last_pixel_value) + { + unsigned k = i + 1; + for (; !(input.at_(k, j)) && (k < nrows); ++k); + + count = k - i; + const int threshold = deltas(last_pixel_value); + + if (last_pixel_value == input.at_(k, j) + && count < threshold) + for (unsigned l = i; l <= k; ++l) + output.at_(l, j) = last_pixel_value; + + i = k; + last_pixel_value = 0; + } + } + else + { + output.at_(i, j) = current_pixel; + last_pixel_value = current_pixel; } - } - else - { - output.at_(i, j) = current_pixel; - last_pixel_value = current_pixel; } } } - } - template< typename V > - inline - void CRLA(const image2d<V>& input, - image2d<V>& output, - const mln::util::array<int>& deltas, - const mln::util::array<int>& deltas_factor) - { - horizontal_CRLA(input, output, deltas_factor); - vertical_CRLA(output, output, deltas); - horizontal_CRLA(output, output, deltas_factor); - } + template<typename L> + inline + void CRLA(const Image<L>& input, + Image<L>& output, + const mln::util::array<int>& deltas, + const mln::util::array<int>& deltas_factor) + { + horizontal_CRLA(input, output, deltas_factor); + + debug::logger().log_image(debug::AuxiliaryResults, + output, + "paragraph_closing_horizontal_CRLA"); + + + vertical_CRLA(output, output, deltas); + + debug::logger().log_image(debug::AuxiliaryResults, + output, + "paragraph_closing_vertical_CRLA"); + + horizontal_CRLA(output, output, deltas_factor); + } + + } // end of namespace scribo::text::internal + - template< typename L, typename V > - void - paragraphs_closing(image2d<V>& output, - const paragraph_set<L>& par_set, - const box2d& domain) + template<typename L> + mln_concrete(L) + paragraphs_closing(const paragraph_set<L>& parset) { trace::entering("scribo::text::paragraphs_closing"); - image2d<V> debug(domain); + // FIXME: 'debug' may be useless. + mln_concrete(L) output, debug; + initialize(output, parset.lines().components().labeled_image()); + initialize(debug, output); - mln::util::array<int> deltas; - deltas.reserve(par_set.nelements()); - mln::util::array<int> deltas_factor; - deltas_factor.reserve(par_set.nelements()); + mln::util::array<int> deltas(parset.nelements() + 1, 0); + mln::util::array<int> deltas_factor(parset.nelements() + 1, 0); data::fill(debug, 0); data::fill(output, 0); - const line_set<L>& lines = par_set.lines(); + const line_set<L>& lines = parset.lines(); - for_all_paragraphs(p, par_set) - { - const paragraph_info<L>& current_par = par_set(p); - const mln::util::array<line_id_t>& line_ids = current_par.line_ids(); - const unsigned nelements = line_ids.nelements(); - - for (unsigned i = 0; i < nelements; ++i) + for_all_paragraphs(p, parset) + if (parset(p).is_valid()) { - const line_id_t& line_id = line_ids(i); - const line_info<L>& current_line = lines(line_id); + const paragraph_info<L>& current_par = parset(p); + const mln::util::array<line_id_t>& line_ids = current_par.line_ids(); - draw::line_components(debug, current_line, p); - } + line_id_t last_id = line_ids[0]; + for_all_elements(i, line_ids) + { + const line_id_t& line_id = line_ids(i); + const line_info<L>& current_line = lines(line_id); + + scribo::draw::line_components(debug, current_line, p); + + // HACK DISCLAIMER : this line is drawn in order to be + // sure that every line will be reduced to a single + // component after closing. It is necessary to reduce a + // paragraph to one component in order to extract its + // outline correctly for xml/debug output. + component_id_t last_comp = lines(line_id).component_ids()(0); + for_all_elements(i, lines(line_id).component_ids()) + { + const unsigned c = lines(line_id).component_ids()(i); + mln::draw::line(debug, + lines.components()(c).mass_center(), + lines.components()(last_comp).mass_center(), + p); + last_comp = c; + } - int delta_baseline = current_par.delta_baseline(); + // mln::draw::line(debug, current_line.bbox().pcenter(), lines(last_id).bbox().pcenter(), p); + // last_id = line_id; + } - if (delta_baseline % 2 == 0) + int delta_baseline = current_par.delta_baseline(); + + if (delta_baseline % 2 == 0) --delta_baseline; - deltas.append(delta_baseline); - deltas_factor.append(3 * delta_baseline); - } - CRLA(debug, output, deltas, deltas_factor); + deltas(p) = 2 * delta_baseline; // Vertical + deltas_factor(p) = 3 * delta_baseline; // Horizontal + } + + debug::logger().log_image(debug::AuxiliaryResults, + debug, + "paragraph_closing_input_CRLA"); + + internal::CRLA(debug, output, deltas, deltas_factor); + + debug::logger().log_image(debug::Results, + output, + "paragraph_closing"); - trace::exiting("scribo::draw::line_components"); + trace::exiting("scribo::text::paragraphs_closing"); + return output; } # endif -- 1.5.6.5

1 0