Olena-patches April 2010

olena-patches@lrde.epita.fr

5 participants
182 discussions

[Olena] #148: Missing files in the distribution of Olena 0.11

by Olena

#148: Missing files in the distribution of Olena 0.11 ------------------------+--------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: defect | Status: new Priority: trivial | Milestone: Olena 0.11.1 Component: Milena | Version: 0.11 Keywords: EXTRA_DIST | ------------------------+--------------------------------------------------- Reported by Théo, relaunching `bootstrap.sh` from a distributed tarball of Olena 0.11: {{{ este% ./bootstrap.sh sh: Can't open ./cleanup.sh sh: Can't open ./gen_filelists.sh }}} -- Ticket URL: <https://trac.lrde.org/olena/ticket/148> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

14 years

[Olena] #217: Nasty bug in mln::data::impl::in memcpy_ with g++ 4.2 on Debian GNU/Linux on IA-32

by Olena Trac

#217: Nasty bug in mln::data::impl::in memcpy_ with g++ 4.2 on Debian GNU/Linux on IA-32 ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: defect | Status: new Priority: critical | Milestone: Olena 1.1 Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- Running the following test exhibits this issue: {{{ make -C milena/apps/graph-morpho CXX="ccache g++-4.2" checkTESTS=samples- image2d TESTS_ENVIRONMENT="valgrind" }}} This seems to be a bug (or a weird implementation-defined behavior) in Debian's `g++` 4.2 on IA-32, due to some strict-aliasing rule not respected in Milena's code. I added a `#warning` in `memcpy_.hh` in r4608. But the thing is, `g++` 4.2 is the main compiler in Debian GNU/Linux 5.0, which is used on most GCC-based Olena buildbots, meaning we won't get a successful build on these hosts until we circumvent this bug. That's bad. -- Ticket URL: <https://trac.lrde.org/olena/ticket/217> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

14 years

[Olena] #201: Use « olena » instead of « oln » as an identifier

by Olena Trac

#201: Use « olena » instead of « oln » as an identifier ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Component: Olena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- We should no longer use « `oln` » ; « `olena` » is much more clearer. * The Subversion repository is called `oln`, because `olena` was already used (arg!); we should not do this mistake again: the future Git repository shall be named `olena`. * Likewise, Olena's build farm URL (https://buildfarm.lrde.org/buildfarm/oln/) should be renamed to `olena`. If you find some other places where the project is called `oln` instead of `olena`, please report them here. TIA. -- Ticket URL: <https://trac.lrde.org/olena/ticket/201> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

14 years

[Olena] #126: Speed up tests

by Olena

#126: Speed up tests -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: major | Milestone: Olena 1.0ß Component: Milena | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- Some tests take a very long time to execute. Main causes are: * input image(s) are too big [[BR]] => they should be reduced (sometimes, testing on `lena.pgm` is just too costly); * the default, non-optimized compilation settings (`-O0 -ggdb`) produces very inefficient code for certain algorithms [[BR]] => we should locally increase the level of optimization (e.g., `-O1` or `-O2`) for these tests, and '''document''' this in `Makefile.am` (explain why we made changes in `CXXFLAGS` for a given test). We might want to make a list of lengthy tests here before solving this ticket. -- Ticket URL: <https://trac.lrde.org/olena/ticket/126> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image library.

14 years

[Olena] #214: Use Automake 1.11's AM_DEFAULT_SOURCE_EXT

by Olena Trac

#214: Use Automake 1.11's AM_DEFAULT_SOURCE_EXT -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: minor | Milestone: Component: Milena | Version: 1.0 Keywords: Make | -------------------------+-------------------------------------------------- Quoting the [http://www.mail-archive.com/automake@gnu.org/msg15022.html announce of Automake 1.11]: {{{ - The default source file extension (.c) can be overridden with AM_DEFAULT_SOURCE_EXT now. }}} Which allows us to replace {{{ bin_PROGRAMS = foo bar baz foo_SOURCES = foo.cc bar_SOURCES = bar.cc baz_SOURCES = baz.cc }}} with {{{ bin_PROGRAMS = foo bar baz AM_DEFAULT_SOURCE_EXT = .cc }}} (Of course, « `AM_DEFAULT_SOURCE_EXT = .cc` » should be factored in some `common.mk` file.) This just rocks if you consider the tons of `*_SOURCES` lines in the zillions of `tests/*/Makefile.am` files. On the downward side, this change requires Automake 1.11, which is not even in Debian unstable as of July 24, 2009. We might want to wait a little bit before requiring this version. -- Ticket URL: <https://trac.lrde.org/olena/ticket/214> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

14 years

[Olena] #228: Use Automake 1.11's dist-xz option

by Olena Trac

#228: Use Automake 1.11's dist-xz option -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: minor | Milestone: Component: Milena | Version: 1.0 Keywords: Make | -------------------------+-------------------------------------------------- Quoting the [http://www.mail-archive.com/automake@gnu.org/msg15022.html announce of Automake 1.11]: {{{ - "make dist" can now create xz-compressed tarballs, as well as (deprecated?) lzma-compressed tarballs. }}} Note that this change requires Automake 1.11, which is not in Debian stable (Lenny). We might want to wait a little bit before requiring this version. -- Ticket URL: <https://trac.lrde.org/olena/ticket/228> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

14 years

[Olena] #207: Use Automake 1.11

by Olena Trac

#207: Use Automake 1.11 -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: enhancement | Status: new Priority: major | Milestone: Olena 1.1 Component: Olena | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- Automake 1.11 provides a better framework for tests: each test can generate a log file, and the test suite is a mere rule generating a summary log, depending on all these logs. The `check` rule is no longer based on a shell `for` loop, and `make` can truly honors its `-j` (parallel instances) option when testing. Of course, one need to be careful with side effects, notably files created by tests, as one test may overwrite the output(s) of another tests. Akim recommends that test `foo` writes its outputs to `foo.dir`. Moreover, this permits many improvements: * One can generate pretty-printed versions of the tests using, e.g., `rst2html` (if the log contains an RST output) on the logs. * One can have a `recheck` rule reruning only the failed tests, since the first line of the log records the outcome of the test (pass or fail). * Also, provided dependencies are well set, this can probably help one write rules to rerun only the needed tests when a change occurred in the source tree (but I don't know yet how to do this). -- Ticket URL: <https://trac.lrde.org/olena/ticket/207> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

14 years

last-svn-commit-111-gfa4e901 Improve OCR recognition.

by Guillaume Lazzara

* src/text_in_article_pbm.cc: Update call to text::recognition. * text/clean.hh: Resize text lines according to their x_height. * text/extract_lines.hh: Update call to extract::components. * text/merging.hh: Remove Debug. * text/recognition.hh: Update call to text::clean and do recognition only on lines considered as text. * subsampling/bilinear.hh, * upsampling/bs2x.hh: New. --- scribo/ChangeLog | 18 +++++ scribo/src/text_in_article_pbm.cc | 147 +++++++++++++++++++------------------ scribo/subsampling/bilinear.hh | 114 ++++++++++++++++++++++++++++ scribo/text/clean.hh | 86 ++++++++++------------ scribo/text/extract_lines.hh | 6 +- scribo/text/merging.hh | 30 ++++---- scribo/text/recognition.hh | 5 +- scribo/upsampling/bs2x.hh | 147 +++++++++++++++++++++++++++++++++++++ 8 files changed, 413 insertions(+), 140 deletions(-) create mode 100644 scribo/subsampling/bilinear.hh create mode 100644 scribo/upsampling/bs2x.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 97f15b8..f2850e0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,23 @@ 2010-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve OCR recognition. + + * src/text_in_article_pbm.cc: Update call to text::recognition. + + * text/clean.hh: Resize text lines according to their x_height. + + * text/extract_lines.hh: Update call to extract::components. + + * text/merging.hh: Remove Debug. + + * text/recognition.hh: Update call to text::clean and do + recognition only on lines considered as text. + + * subsampling/bilinear.hh, + * upsampling/bs2x.hh: New. + +2010-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * postprocessing/fill_object_holes.hh: New routine. 2010-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/src/text_in_article_pbm.cc b/scribo/src/text_in_article_pbm.cc index 3f37529..e71d21b 100644 --- a/scribo/src/text_in_article_pbm.cc +++ b/scribo/src/text_in_article_pbm.cc @@ -48,12 +48,14 @@ #include <scribo/primitive/remove/separators.hh> #include <scribo/primitive/link/merge_double_link.hh> +#include <scribo/primitive/link/internal/dmax_width_and_height.hh> #include <scribo/primitive/link/with_single_left_link_dmax_ratio.hh> #include <scribo/primitive/link/with_single_right_link_dmax_ratio.hh> #include <scribo/primitive/group/from_single_link.hh> #include <scribo/filter/object_links_bbox_h_ratio.hh> +#include <scribo/filter/objects_small.hh> #include <scribo/debug/usage.hh> @@ -71,6 +73,7 @@ #include <scribo/preprocessing/denoise_fg.hh> +#include <scribo/io/xml/save_text_lines.hh> // #include <mln/morpho/closing/structural.hh> // #include <mln/win/rectangle2d.hh> @@ -80,6 +83,7 @@ const char *args_desc[][2] = { { "input.pbm", "A binary image. 'False' for object, 'True'\ for the background." }, + { "out.txt", "Text output" }, { "denoise", "1 enables denoising, 0 disables it. (enabled by default)" }, { "debug_dir", "Output directory for debug image" }, {0, 0} @@ -95,8 +99,7 @@ int main(int argc, char* argv[]) return scribo::debug::usage(argv, "Find text lines using left/right validation and display x-height in a binarized article.", "input.pbm out.txt <denoise: 0|1> <debug_dir>", - args_desc, - "Text output."); + args_desc); if (argc == 5) scribo::make::internal::debug_filename_prefix = argv[4]; @@ -151,13 +154,19 @@ int main(int argc, char* argv[]) components.add_separators(separators); // components.add_separators(whitespaces); + components = scribo::filter::components_small(components, 3); + /// Linking potential objects std::cout << "Linking objects..." << std::endl; object_links<L> left_link - = primitive::link::with_single_left_link_dmax_ratio(components, 2); + = primitive::link::with_single_left_link_dmax_ratio(components, + primitive::link::internal::dmax_width_and_height(1), + anchor::MassCenter); object_links<L> right_link - = primitive::link::with_single_right_link_dmax_ratio(components, 2); + = primitive::link::with_single_right_link_dmax_ratio(components, + primitive::link::internal::dmax_width_and_height(1), + anchor::MassCenter); // Validating left and right links. object_links<L> @@ -218,38 +227,38 @@ int main(int argc, char* argv[]) scribo::make::debug_filename("step1_looks_like_a_text_line.ppm")); - // Bboxes + line infos - { - std::ofstream file(scribo::make::debug_filename("step1_bboxes_100p.txt").c_str()); - std::ofstream file_50p(scribo::make::debug_filename("step1_bboxes_50p.txt").c_str()); - - for_all_lines(l, lines) - if (lines(l).tag() != line::Merged - && lines(l).tag() != line::Ignored - && lines(l).tag() != line::Pathological) - { - file << lines(l).bbox().pmin().row() << " " - << lines(l).bbox().pmin().col() << " " - << lines(l).bbox().pmax().row() << " " - << lines(l).bbox().pmax().col() << " " - << lines(l).card() << " " - << lines(l).baseline() << " " - << lines(l).x_height() << " " - << lines(l).meanline() << " " - << lines(l).d_height() << " " - << lines(l).a_height() << " " - << lines(l).char_space() << " " - << lines(l).char_width() << std::endl; +// // Bboxes + line infos +// { +// std::ofstream file(scribo::make::debug_filename("step1_bboxes_100p.txt").c_str()); +// // std::ofstream file_50p(scribo::make::debug_filename("step1_bboxes_50p.txt").c_str()); - file_50p << lines(l).bbox().pmin().row() / 2 << " " - << lines(l).bbox().pmin().col() / 2 << " " - << lines(l).bbox().pmax().row() / 2 << " " - << lines(l).bbox().pmax().col() / 2 << std::endl; - } +// for_all_lines(l, lines) +// if (lines(l).tag() != line::Merged +// && lines(l).tag() != line::Ignored +// && lines(l).tag() != line::Pathological) +// { +// file << lines(l).bbox().pmin().row() << " " +// << lines(l).bbox().pmin().col() << " " +// << lines(l).bbox().pmax().row() << " " +// << lines(l).bbox().pmax().col() << " " +// << lines(l).card() << " " +// << lines(l).baseline() << " " +// << lines(l).x_height() << " " +// << lines(l).meanline() << " " +// << lines(l).d_height() << " " +// << lines(l).a_height() << " " +// << lines(l).char_space() << " " +// << lines(l).char_width() << std::endl; + +// // file_50p << lines(l).bbox().pmin().row() / 2 << " " +// // << lines(l).bbox().pmin().col() / 2 << " " +// // << lines(l).bbox().pmax().row() / 2 << " " +// // << lines(l).bbox().pmax().col() / 2 << std::endl; +// } - file.close(); - file_50p.close(); - } +// file.close(); +// // file_50p.close(); +// } // mean and base lines. @@ -280,57 +289,49 @@ int main(int argc, char* argv[]) scribo::debug::save_bboxes_image(input, lines, scribo::make::debug_filename("step2_bboxes.ppm")); - //===== END OF DEBUG ===== - + { + std::ofstream file(scribo::make::debug_filename("step2_bboxes_100p.txt").c_str()); +// std::ofstream file_50p(scribo::make::debug_filename("step2_bboxes_50p.txt").c_str()); - scribo::text::recognition(lines, "fra", argv[2]); + for_all_lines(l, lines) + if (lines(l).tag() != line::Merged + && lines(l).tag() != line::Ignored + && lines(l).tag() != line::Pathological) + { + file << lines(l).bbox().pmin().row() << " " + << lines(l).bbox().pmin().col() << " " + << lines(l).bbox().pmax().row() << " " + << lines(l).bbox().pmax().col() << " " + << lines(l).card() << " " + << lines(l).baseline() << " " + << lines(l).x_height() << " " + << lines(l).meanline() << " " + << lines(l).d_height() << " " + << lines(l).a_height() << " " + << lines(l).char_space() << " " + << lines(l).char_width() << std::endl; +// file_50p << lines(l).bbox().pmin().row() / 2 << " " +// << lines(l).bbox().pmin().col() / 2 << " " +// << lines(l).bbox().pmax().row() / 2 << " " +// << lines(l).bbox().pmax().col() / 2 << std::endl; + } -// // Display median character space. -// { -// image2d<value::rgb8> output = data::convert(value::rgb8(), input); -// typedef mln::value::int_u<8> median_t; -// typedef mln::accu::stat::median_h<median_t> accu_t; -// util::array<accu_t> -// lspace_med(static_cast<unsigned>(grouped_objects.nlabels()) + 1); - -// for_all_components(i, filtered_objects.bboxes()) -// if (groups_packed(i) != 0) -// { -// if (hratio_filtered_links(i) != i) -// { -// unsigned -// space = filtered_objects.bbox(i).pmin().col() - filtered_objects.bbox(hratio_filtered_links(i)).pmax().col(); + file.close(); +// file_50p.close(); + } -// lspace_med(groups_packed(i)).take(space); -// } -// } + //===== END OF DEBUG ===== -// std::cout << "Drawing median character space" << std::endl; -// for_all_components(i, filtered_objects.bboxes()) -// if (groups_packed(i) != 0 && lspace_med(groups_packed(i)).card() > 1) -// { -// unsigned med = lspace_med(groups_packed(i)).to_result(); -// mln::draw::box(output, grouped_objects.bbox(groups_packed(i)), -// literal::purple); + scribo::io::xml::save_text_lines(argv[1], lines, "out.xml"); -// point2d -// beg = filtered_objects.bbox(i).pmax(), -// end = beg; -// beg.row() = filtered_objects.bbox(i).pmin().row(); -// mln::draw::line(output, beg, end, literal::cyan); -// beg.col() += med; -// end.col() += med; -// mln::draw::line(output, beg, end, literal::cyan); -// } -// io::ppm::save(output, "median_wspace.ppm"); + scribo::text::recognition(lines, "fra", argv[2]); -// } trace::exiting("main"); } diff --git a/scribo/subsampling/bilinear.hh b/scribo/subsampling/bilinear.hh new file mode 100644 index 0000000..cb95a11 --- /dev/null +++ b/scribo/subsampling/bilinear.hh @@ -0,0 +1,114 @@ +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// 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 +// 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 SCRIBO_SUBSAMPLING_BILINEAR_HH +# define SCRIBO_SUBSAMPLING_BILINEAR_HH + +/// \file +/// +/// Bilinear subsampling. + +# include <mln/core/concept/image.hh> +# include <mln/opt/at.hh> + + +namespace scribo +{ + + namespace subsampling + { + + + template <typename I> + mln_concrete(I) + bilinear(const Image& input_, int sub_ratio); + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename I> + mln_concrete(I) + bilinear(const Image& input_, int sub_ratio) + { + trace::entering("scribo::subsampling::bilinear"); + + const I& input = exact(input_); + mln_precondition(input.is_valid()); + mlc_is(mln_domain(I), box2d)::check(); + + mln_concrete(I) output(input.domain().nrows() / sub_ratio, + input.domain().ncols() / sub_ratio); + + std::cout << "output domain = " << output.domain() << std::endl; + + mln_piter(I) p(output.domain()); + mln_value(I) pixels[4]; + + def::coord + x_offset = input.domain().pmin().col(), + y_offset = input.domain().pmin().row(); + + for_all(p) + { + int x = round(-0.5 + p.col() * sub_ratio); + int y = round(-0.5 + p.row() * sub_ratio); + + if (x < 0) + x = 0; + else if (x >= geom::max_col(input)) + x = input.ncols() - 1; + + if (y < 0) + y = 0; + else if (y >= geom::max_row(input)) + y = input.nrows() - 1; + + double dx = (p.col() * sub_ratio) - x; + double dy = (p.row() * sub_ratio) - y; + + pixels[0] = opt::at(input, y + y_offset, x + x_offset); + pixels[1] = opt::at(input, y + y_offset, x + x_offset + 1); + pixels[2] = opt::at(input, y + y_offset + 1, x + x_offset); + pixels[3] = opt::at(input, y + y_offset + 1, x + x_offset + 1); + + output(p) = pixels[0] * (1 - dx) * (1 - dy) + pixels[1] * dx * (1 - dy) + + pixels[2] * (1 - dx) * dy + pixels[3] * dx * dy; + + } + + trace::exiting("scribo::subsampling::bilinear"); + return output; + } + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace subsampling + +} // end of namespace scribo + + +#endif // SCRIBO_SUBSAMPLING_BILINEAR_HH diff --git a/scribo/text/clean.hh b/scribo/text/clean.hh index ba200fc..fa31ebe 100644 --- a/scribo/text/clean.hh +++ b/scribo/text/clean.hh @@ -64,8 +64,9 @@ #include <mln/value/rgb8.hh> #include <mln/io/pgm/all.hh> -#include <sandbox/inim/2009/ocr/resize.hh> -#include <sandbox/fabien/mln/upsampling/hq2x.hh> +#include <scribo/upsampling/bs2x.hh> +#include <scribo/subsampling/bilinear.hh> + namespace scribo { @@ -80,69 +81,60 @@ namespace scribo /// /// \param[in] input_ A binary image. Object are set to 'false' /// and backgroud to 'true'. - /// \param[in] dmap_win_ A weighted window. /// /// \return An image. The text have better quality. // - template <typename I, typename W> + template <typename L, typename I> mln_concrete(I) - clean(const Image& input_, const Weighted_Window<W>& dmap_win_); + clean(const line_info<L>& line, const Image& input_); # ifndef MLN_INCLUDE_ONLY - template <typename I, typename W> + template <typename L, typename I> mln_concrete(I) - clean(const Image& input_, const Weighted_Window<W>& dmap_win_) + clean(const line_info<L>& line, const Image& input_) { trace::entering("scribo::text::clean"); const I& input = exact(input_); - const W& dmap_win = exact(dmap_win_); mlc_bool(mln_site_(I)::dim == 2)::check(); mlc_equal(mln_value(I),bool)::check(); mln_precondition(input.is_valid()); - mln_precondition(dmap_win.is_valid()); - (void) dmap_win; - - - // Resize - typedef image2d<value::rgb8> J; - J tmp = data::convert(value::rgb8(), input); - J clarge = tmp;//mln::upsampling::hq2x(tmp); (FIXME: re-enable) - - //FIXME: not generic! -// if (input.domain().pmax()[0] - input.domain().pmin()[0] <= 10) -// clarge = mln::upsampling::hq4x(clarge); - - I input_large = data::convert(bool(), clarge); - - // Blur - image2d<value::int_u8> - blur = linear::gaussian(data::convert(value::int_u8(), input_large), 2); - - // Skeleton constraint - I K = topo::skeleton::crest(input_large, blur, c8()); - - // Skeleton - I skel_on_gaussian = - morpho::skeleton_constrained(input_large, c8(), - topo::skeleton::is_simple_point<I,neighb2d>, - extend(K, false), arith::revert(blur)); - - // Dilation - win::octagon2d oct(7); - I dilate_on_gaussian = morpho::dilation(skel_on_gaussian, oct); - -// io::pgm::save(arith::revert(blur), "blur_revert.pgm"); -// io::pgm::save(blur, "gaussian.pgm"); -// io::pbm::save(input_large, mln::debug::filename("input_large_4x.pbm")); -// io::pbm::save(K, mln::debug::filename("K.pbm")); -// io::pbm::save(skel_on_gaussian, mln::debug::filename("skeleton_on_gaussian.pbm")); -// io::pbm::save(dilate_on_gaussian, mln::debug::filename("dilation_on_gaussian.pbm")); + mln_precondition(line.is_valid()); + + mln_concrete(I) output = duplicate(input); + + if (line.x_height() < 5) // Non significative text/remaining lines... + return output; + + float fact = line.x_height() / 40.0f; + std::cout << fact << " - " << output.domain() << std::endl; + if (fact < 1) + { + std::cout << "Upsampling..." << " - " + << std::ceil(fact) << std::endl; + while (fact < 1) + { + output = scribo::upsampling::bs2x(output); // 2x upsampling + fact *= 2.0f; +// std::cout << "fact = " << fact +// << " - output.domain = " << output.domain() +// << std::endl; + } + } + else if (fact > 2.5f) + { + std::cout << "subsampling::bilinear" << " - " + << std::ceil(fact) << std::endl; + output = subsampling::bilinear(output, std::ceil(fact - 0.5)); // math::floor instead? + + } + else + std::cout << "not cleaning text. Seems ok." << std::endl; trace::exiting("scribo::text::clean"); - return dilate_on_gaussian; + return output; } # endif // ! MLN_INCLUDE_ONLY diff --git a/scribo/text/extract_lines.hh b/scribo/text/extract_lines.hh index 44dca50..c720d70 100644 --- a/scribo/text/extract_lines.hh +++ b/scribo/text/extract_lines.hh @@ -47,7 +47,7 @@ # include <mln/util/graph.hh> # include <mln/value/label_16.hh> -# include <scribo/primitive/extract/objects.hh> +# include <scribo/primitive/extract/components.hh> # include <scribo/primitive/group/apply.hh> # include <scribo/primitive/link/with_several_left_links.hh> # include <scribo/primitive/link/with_several_right_links.hh> @@ -75,7 +75,7 @@ namespace scribo ** \param[in,out] nbboxes Will hold the number of bounding boxes ** at the end of the routine. ** - ** \return An object image with grouped potential text objects. + ** \return An object image with grouped potential text components. */ template <typename I, typename N, typename V> object_image(mln_ch_value(I,V)) @@ -103,7 +103,7 @@ namespace scribo typedef mln_ch_value(I,V) L; typedef object_image(L) text_t; - text_t text = scribo::primitive::extract::objects(input, nbh, nbboxes); + text_t text = scribo::primitive::extract::components(input, nbh, nbboxes); # ifndef SCRIBO_NDEBUG debug::save_bboxes_image(input, text.bboxes(), literal::red, diff --git a/scribo/text/merging.hh b/scribo/text/merging.hh index e509475..b29e63f 100644 --- a/scribo/text/merging.hh +++ b/scribo/text/merging.hh @@ -800,21 +800,21 @@ namespace scribo (void) ith_pass; - if (ith_pass == 1) - { - mln::io::pgm::save(log, "log_1.pgm"); - mln::io::pgm::save(data::wrap(int_u8(), billboard), "log_1e.pgm"); - } - else if (ith_pass == 2) - { - mln::io::pgm::save(log, "log_2.pgm"); - mln::io::pgm::save(data::wrap(int_u8(), billboard), "log_2e.pgm"); - } - else if (ith_pass == 3) - { - mln::io::pgm::save(log, "log_3.pgm"); - mln::io::pgm::save(data::wrap(int_u8(), billboard), "log_3e.pgm"); - } +// if (ith_pass == 1) +// { +// mln::io::pgm::save(log, "log_1.pgm"); +// mln::io::pgm::save(data::wrap(int_u8(), billboard), "log_1e.pgm"); +// } +// else if (ith_pass == 2) +// { +// mln::io::pgm::save(log, "log_2.pgm"); +// mln::io::pgm::save(data::wrap(int_u8(), billboard), "log_2e.pgm"); +// } +// else if (ith_pass == 3) +// { +// mln::io::pgm::save(log, "log_3.pgm"); +// mln::io::pgm::save(data::wrap(int_u8(), billboard), "log_3e.pgm"); +// } } diff --git a/scribo/text/recognition.hh b/scribo/text/recognition.hh index 5927d44..72df1e2 100644 --- a/scribo/text/recognition.hh +++ b/scribo/text/recognition.hh @@ -128,11 +128,12 @@ namespace scribo /// Use text bboxes with Tesseract for_all_lines(i, lines) { - if (! lines(i).is_valid()) + if (! lines(i).is_valid() || lines(i).tag() != line::None || lines(i).type() != line::Text) continue; std::cout << "Text recognition... (" << i << "/" << lines.nelements() << ")" << std::endl; + std::cout << "x_height = " << lines(i).x_height() << std::endl; mln_domain(I) box = lines(i).bbox(); // Make sure characters are isolated from the borders. @@ -157,7 +158,7 @@ namespace scribo /// Improve text quality. /// text_ima_cleaned domain is larger than text_ima's. - I text_ima_cleaned = text::clean(text_ima, dmap_win); + I text_ima_cleaned = text::clean(lines(i), text_ima); mln::io::pbm::save(text_ima_cleaned, mln::debug::filename("line.pbm", debug_id++)); // Setting objects to 'True' diff --git a/scribo/upsampling/bs2x.hh b/scribo/upsampling/bs2x.hh new file mode 100644 index 0000000..6ff8546 --- /dev/null +++ b/scribo/upsampling/bs2x.hh @@ -0,0 +1,147 @@ +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// 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 +// 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 SCRIBO_UPSAMPLING_BS2X_HH +# define SCRIBO_UPSAMPLING_BS2X_HH + +/// \file +/// +/// Scale 2x algorithm for binary images. + +# include <mln/core/concept/image.hh> +# include <mln/core/alias/box2d.hh> +# include <mln/opt/at.hh> +# include <mln/geom/all.hh> + + + +namespace scribo +{ + + namespace upsampling + { + using namespace mln; + + + /// \brief Scale 2x algorithm for binary images. + /// + // + template <typename I> + mln_concrete(I) + bs2x(const Image& input); + + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename I> + mln_concrete(I) + bs2x(const mln::Image& input_) + { + trace::entering("scribo::upsampling::bs2x"); + + const I& input = exact(input_); + + mlc_is(mln_domain(I), mln::box2d)::check(); + mlc_is(mln_value(I), bool)::check(); + + mln_precondition(input.is_valid()); + + typedef mln_value(I) V; + + def::coord + mrow = geom::min_row(input), + mcol = geom::min_col(input); + + + mln_piter(I) p(input.domain()); + mln_concrete(I) output(mln::make::box2d(mrow, mcol, + mrow + 2 * input.nrows() - 1, + mcol + 2 * input.ncols() - 1)); + for_all(p) + { + def::coord + row = mrow + 2 * (p.row() - mrow), + col = mcol + 2 * (p.col() - mcol); + + if(p.row() == geom::min_row(input) + || p.col() == geom::min_col(input) + || p.row() == geom::max_row(input) + || p.col() == geom::max_col(input)) + { + mln::box2d b = mln::make::box2d(row, col, + row + 1, col + 1); + V value = opt::at(input, p.row(), p.col()); + + data::fill((output | b).rw(), value); + } + else + { + // nw n ne + // + // w value e + // + // sw s se + + V n = input(p + mln::up), + s = input(p + mln::down), + e = input(p + mln::right), + w = input(p + mln::left), + nw = input(p + mln::up_left), + ne = input(p + mln::up_right), + sw = input(p + mln::down_left), + se = input(p + mln::down_right), + value = input(p); + + if(e != w && n != s) + { + opt::at(output, row, col) = (w == n &&((se != nw) || !value)) ? w : value; + opt::at(output, row, col + 1) = (e == n &&((sw != ne) || !value)) ? e : value; + opt::at(output, row + 1, col) = (w == s &&((ne != sw) || !value)) ? w : value; + opt::at(output, row + 1, col + 1) = (e == s &&((nw != se) || !value)) ? e : value; + } + else + { + mln::box2d b = mln::make::box2d(row, col, + row + 1, col + 1); + data::fill((output | b).rw(), value); + } + } + } + + trace::exiting("scribo::upsampling::bs2x"); + return output; + } + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace upsampling + +} // end of namespace scribo + + +#endif // ! SCRIBO_UPSAMPLING_BS2X_HH -- 1.5.6.5

14 years

last-svn-commit-110-gc79a06f postprocessing/fill_object_holes.hh: New routine.

by Guillaume Lazzara

--- scribo/ChangeLog | 12 ++- .../fill_object_holes.hh} | 134 ++++++++++++++++---- 2 files changed, 118 insertions(+), 28 deletions(-) copy scribo/{filter/object_groups_with_holes.hh => postprocessing/fill_object_holes.hh} (65%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4aa545d..97f15b8 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,11 +1,15 @@ 2010-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * postprocessing/fill_object_holes.hh: New routine. + +2010-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + Add new routines to detect separators. - * scribo/primitive/extract/horizontal_separators.hh, - * scribo/primitive/extract/separators.hh, - * scribo/primitive/extract/vertical_separators.hh, - * scribo/primitive/remove/separators.hh: New. + * primitive/extract/horizontal_separators.hh, + * primitive/extract/separators.hh, + * primitive/extract/vertical_separators.hh, + * primitive/remove/separators.hh: New. 2010-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/filter/object_groups_with_holes.hh b/scribo/postprocessing/fill_object_holes.hh similarity index 65% copy from scribo/filter/object_groups_with_holes.hh copy to scribo/postprocessing/fill_object_holes.hh index 570ae6a..4771844 100644 --- a/scribo/filter/object_groups_with_holes.hh +++ b/scribo/postprocessing/fill_object_holes.hh @@ -23,12 +23,16 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_FILTER_OBJECT_GROUPS_WITH_HOLES_HH -# define SCRIBO_FILTER_OBJECT_GROUPS_WITH_HOLES_HH +#ifndef SCRIBO_POSTPROCESSING_FILL_OBJECT_HOLES_HH +# define SCRIBO_POSTPROCESSING_FILL_OBJECT_HOLES_HH /// \file /// -/// \brief Remove groups not having a minimum number of holes. +/// \brief Fill-in object small holes. + +/// \FIXME share code with filter/object_groups_with_holes.hh +/// \FIXME Merge the two following routines. +/// \FIXME Use a size ratio in both overloads. # include <sstream> @@ -47,28 +51,32 @@ # include <mln/fun/i2v/array.hh> # include <scribo/core/macros.hh> -# include <scribo/core/component_set.hh> +# include <scribo/core/object_groups.hh> +# include <scribo/primitive/group/apply.hh> namespace scribo { - namespace filter + namespace postprocessing { using namespace mln; - /*! \brief Remove groups not having a minimum number of holes. + /*! \brief Fill-in object small holes. + */ + template <typename I> + inline + mln_concrete(I) + fill_object_holes(const Image& input, float ratio); - */ template <typename L> inline object_groups<L> - object_groups_with_holes(const object_groups<L>& components, - unsigned min_size); - + fill_object_holes(const object_groups<L>& groups, + unsigned min_size); # ifndef MLN_INCLUDE_ONLY @@ -124,7 +132,7 @@ namespace scribo } - } // end of namespace scribo::filter::internal + } // end of namespace scribo::postprocessing::internal @@ -139,10 +147,10 @@ namespace scribo template <typename L> inline object_groups<L> - object_groups_with_holes(const object_groups<L>& groups, + fill_object_holes(const object_groups<L>& groups, unsigned min_size) { - trace::entering("scribo::filter::impl::generic::object_groups_with_holes"); + trace::entering("scribo::postprocessing::impl::generic::fill_object_holes"); // Grouping groups and relabel the underlying labeled image. // Groups are now considered as components. @@ -259,7 +267,7 @@ namespace scribo if (kept == components.nelements()) { - trace::exiting("scribo::filter::impl::generic::object_groups_with_holes"); + trace::exiting("scribo::postprocessing::impl::generic::fill_object_holes"); return groups.duplicate(); } @@ -269,15 +277,15 @@ namespace scribo output(c) = 0; - trace::exiting("scribo::filter::impl::generic::object_groups_with_holes"); + trace::exiting("scribo::postprocessing::impl::generic::fill_object_holes"); return output; } } - } // end of namespace scribo::filter::impl::generic + } // end of namespace scribo::postprocessing::impl::generic - } // end of namespace scribo::filter::impl + } // end of namespace scribo::postprocessing::impl @@ -286,25 +294,103 @@ namespace scribo template <typename L> inline object_groups<L> - object_groups_with_holes(const object_groups<L>& groups, - unsigned min_size) + fill_object_holes(const object_groups<L>& groups, + unsigned min_size) { - trace::entering("scribo::filter::object_groups_with_holes"); + trace::entering("scribo::postprocessing::fill_object_holes"); mln_precondition(groups.is_valid()); object_groups<L> - output = impl::generic::object_groups_with_holes(groups, min_size); + output = impl::generic::fill_object_holes(groups, min_size); + + trace::exiting("scribo::postprocessing::fill_object_holes"); + return output; + } + + + template <typename I> + inline + mln_concrete(I) + fill_object_holes(const Image& input_, float ratio) + { + trace::entering("scribo::postprocessing::fill_object_holes"); + + mln_precondition(input.is_valid()); + mlc_is(mln_value(I), bool)::check(); + + const I& input = exact(input_); + mln_concrete(I) output = duplicate(input); + + typedef value::int_u16 L; + typedef mln_ch_value(I, L) Li; + typedef accu::math::count<mln_site(Li)> A; + + typedef util::couple<Li, util::couple<util::array<unsigned>, + util::array<A> > > res_t; + + // Holes card Image + + std::cout << "> Holes card image" << std::endl; + + L nlabels; + + res_t res = labeling::blobs_and_compute(input, c8(), nlabels, A()); - trace::exiting("scribo::filter::object_groups_with_holes"); + util::array<unsigned>& holes_card = res.second().first(); + mln_ch_value(I, unsigned) + holes = data::transform(res.first(), holes_card); + + + + // Threshold Image + + std::cout << "> Threshold image" << std::endl; + + + I input_i = logical::not_(input); + res = labeling::blobs_and_compute(input_i, c8(), nlabels, A()); + + util::array<unsigned>& card = res.second().first(); + for (unsigned i = 1; i < card.size(); ++i) + card(i) = card(i) * ratio; + + mln_ch_value(I, unsigned) + thres = data::transform(res.first(), card); + thres = transform::influence_zone_geodesic(thres, c8()); + + + + // Thresholding + + std::cout << "> Thresholding" << std::endl; + + I hole_mask; + initialize(hole_mask, holes); + data::fill(hole_mask, false); + mln_piter(I) p(input.domain()); + for_all(p) + if (holes(p)) + hole_mask(p) = holes(p) < thres(p); + + + // Cleanup + + std::cout << "> Cleanup" << std::endl; + + data::fill((output | pw::value(hole_mask)).rw(), false); + + + trace::exiting("scribo::postprocessing::fill_object_holes"); return output; } + # endif // ! MLN_INCLUDE_ONLY - } // end of namespace scribo::filter + } // end of namespace scribo::postprocessing } // end of namespace scribo -#endif // ! SCRIBO_FILTER_OBJECT_GROUPS_WITH_HOLES_HH +#endif // ! SCRIBO_POSTPROCESSING_FILL_OBJECT_HOLES_HH -- 1.5.6.5

14 years

last-svn-commit-109-gd4c8eff Add new routines to detect separators.

by Guillaume Lazzara

* scribo/primitive/extract/horizontal_separators.hh, * scribo/primitive/extract/separators.hh, * scribo/primitive/extract/vertical_separators.hh, * scribo/primitive/remove/separators.hh: New. --- scribo/ChangeLog | 9 ++ .../primitive/extract/horizontal_separators.hh | 69 ++++++++-------- .../extract/{lines_v_pattern.hh => separators.hh} | 78 ++++++++---------- .../primitive/extract/vertical_separators.hh | 69 ++++++++-------- .../lines_v_pattern.hh => remove/separators.hh} | 86 +++++++++---------- 5 files changed, 155 insertions(+), 156 deletions(-) copy milena/mln/world/inter_pixel/full2image.hh => scribo/primitive/extract/horizontal_separators.hh (53%) copy scribo/primitive/extract/{lines_v_pattern.hh => separators.hh} (53%) copy milena/mln/world/inter_pixel/full2image.hh => scribo/primitive/extract/vertical_separators.hh (53%) copy scribo/primitive/{extract/lines_v_pattern.hh => remove/separators.hh} (50%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b4d325e..4aa545d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2010-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + Add new routines to detect separators. + + * scribo/primitive/extract/horizontal_separators.hh, + * scribo/primitive/extract/separators.hh, + * scribo/primitive/extract/vertical_separators.hh, + * scribo/primitive/remove/separators.hh: New. + +2010-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + Add A first draft of a README in Scribo. * README: New. diff --git a/milena/mln/world/inter_pixel/full2image.hh b/scribo/primitive/extract/horizontal_separators.hh similarity index 53% copy from milena/mln/world/inter_pixel/full2image.hh copy to scribo/primitive/extract/horizontal_separators.hh index db3bcf3..9a6ea39 100644 --- a/milena/mln/world/inter_pixel/full2image.hh +++ b/scribo/primitive/extract/horizontal_separators.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,37 +23,44 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_WORLD_INTER_PIXEL_FULL2IMAGE_HH -# define MLN_WORLD_INTER_PIXEL_FULL2IMAGE_HH +#ifndef SCRIBO_PRIMITIVE_EXTRACT_VERTICAL_SEPARATORS_HH +# define SCRIBO_PRIMITIVE_EXTRACT_VERTICAL_SEPARATORS_HH /// \file /// -/// Convert an inter-pixel image to a classical image. +/// Extract vertical separators. # include <mln/core/concept/image.hh> -# include <mln/data/paste_without_localization.hh> -# include <mln/geom/nsites.hh> -# include <mln/world/inter_pixel/is_pixel.hh> +# include <mln/arith/plus.hh> +# include <scribo/primitive/extract/lines_v_pattern.hh> -namespace mln + +namespace scribo { - namespace world + namespace primitive { - namespace inter_pixel + namespace extract { - /// Convert an inter-pixel image to a classical image. - /// - /// \param[in] input An inter-pixel image. - /// - /// \return A classical image without inter-pixel data. - // + using namespace mln; + + /// \brief Extract vertical separators. + /*! + * + * \param[in] input A binary image. + * \param[in] line_length The minimum line length. + * + * \return A binary image were separators are set to 'True'. + * + * \sa primitive::remove::separators + */ template <typename I> mln_concrete(I) - full2image(const Image& input); + vertical_separators(const Image& input, unsigned line_length); + # ifndef MLN_INCLUDE_ONLY @@ -61,34 +68,28 @@ namespace mln template <typename I> mln_concrete(I) - full2image(const Image& input_) + vertical_separators(const Image& input_, unsigned line_length) { - trace::entering("world::inter_pixel::full2image"); - - mlc_is_a(mln_domain(I), Box)::check(); + trace::entering("scribo::primitive::extract::vertical_separators"); const I& input = exact(input_); + mlc_is(mln_value(I), bool)::check(); mln_precondition(input.is_valid()); - mln_domain(I) b(input.domain().pmin() / 2, - input.domain().pmax() / 2); - mln_concrete(I) output(b); - mln_assertion(geom::nsites(output) == geom::nsites(input | is_pixel())); + mln_concrete(I) + vlines = extract::lines_v_pattern(input, line_length, 3); - data::paste_without_localization(input | is_pixel(), output); - - trace::exiting("world::inter_pixel::full2image"); - return output; + trace::exiting("scribo::primitive::extract::vertical_separators"); + return vlines; } # endif // ! MLN_INCLUDE_ONLY + } // end of namespace scribo::primitive::extract - } // end of namespace mln::world::inter_pixel - - } // end of namespace mln::world + } // end of namespace scribo::primitive -} // end of namespace mln +} // end of namespace scribo -#endif // ! MLN_WORLD_INTER_PIXEL_FULL2IMAGE_HH +#endif // ! SCRIBO_PRIMITIVE_EXTRACT_VERTICAL_SEPARATORS_HH diff --git a/scribo/primitive/extract/lines_v_pattern.hh b/scribo/primitive/extract/separators.hh similarity index 53% copy from scribo/primitive/extract/lines_v_pattern.hh copy to scribo/primitive/extract/separators.hh index ccd21c5..2ba22b4 100644 --- a/scribo/primitive/extract/lines_v_pattern.hh +++ b/scribo/primitive/extract/separators.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,21 +23,19 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_PRIMITIVE_EXTRACT_LINES_V_PATTERN_HH -# define SCRIBO_PRIMITIVE_EXTRACT_LINES_V_PATTERN_HH +#ifndef SCRIBO_PRIMITIVE_EXTRACT_SEPARATORS_HH +# define SCRIBO_PRIMITIVE_EXTRACT_SEPARATORS_HH /// \file /// -/// Extract vertical lines matching a specific pattern. +/// Extract vertical and horizontal separators. -#include <mln/core/concept/image.hh> -#include <mln/core/alias/window2d.hh> +# include <mln/core/concept/image.hh> +# include <mln/arith/plus.hh> -# include <mln/win/hline2d.hh> +# include <scribo/primitive/extract/lines_h_pattern.hh> +# include <scribo/primitive/extract/lines_v_pattern.hh> -# include <mln/morpho/dilation.hh> - -# include <scribo/primitive/extract/lines_pattern.hh> namespace scribo { @@ -50,17 +48,20 @@ namespace scribo using namespace mln; - - /// Extract vertical lines matching a specific pattern. - /// - /// \param[in] input A binary image. - /// \param[in] length The minimum line length. - /// - /// \result An image of vertical lines. - // + /// \brief Extract vertical and horizontal separators. + /*! + * + * \param[in] input A binary image. + * \param[in] line_length The minimum line length. + * + * \return A binary image were separators are set to 'True'. + * + * \sa primitive::remove::separators + */ template <typename I> mln_concrete(I) - lines_v_pattern(const Image& input, unsigned length, unsigned delta); + separators(const Image& input, unsigned line_length); + # ifndef MLN_INCLUDE_ONLY @@ -68,28 +69,21 @@ namespace scribo template <typename I> mln_concrete(I) - lines_v_pattern(const Image& input, unsigned length, unsigned delta) + separators(const Image& input_, unsigned line_length) { - mln_precondition(length % 2 == 1); - -// bool win_def[1][7] = { { 1, 0, 0, 0, 0, 0, 1 } }; - -// window2d win; -// convert::from_to(win_def, win); - - // FIXME: not generic. - window2d win; - mln_deduce(I, site, dpsite) - dp1(0, -delta), - dp2(0, delta); - win.insert(dp1); - win.insert(dp2); - - //FIXME: Add reconstruction instead of this arbitrary dilation. - win::vline2d vwin(length/2 + 2); -// win::vline2d vwin(length); - return morpho::dilation(lines_pattern(input, length, 0, win), vwin); -// return lines_pattern(input, length, 0, win); + trace::entering("scribo::primitive::extract::separators"); + + const I& input = exact(input_); + mlc_is(mln_value(I), bool)::check(); + mln_precondition(input.is_valid()); + + mln_concrete(I) + hlines = extract::lines_h_pattern(input, line_length, 3), + vlines = extract::lines_v_pattern(input, line_length, 3); + hlines += vlines; + + trace::exiting("scribo::primitive::extract::separators"); + return hlines; } @@ -101,6 +95,4 @@ namespace scribo } // end of namespace scribo - -#endif // ! SCRIBO_PRIMITIVE_EXTRACT_LINES_V_PATTERN_HH - +#endif // ! SCRIBO_PRIMITIVE_EXTRACT_SEPARATORS_HH diff --git a/milena/mln/world/inter_pixel/full2image.hh b/scribo/primitive/extract/vertical_separators.hh similarity index 53% copy from milena/mln/world/inter_pixel/full2image.hh copy to scribo/primitive/extract/vertical_separators.hh index db3bcf3..9a6ea39 100644 --- a/milena/mln/world/inter_pixel/full2image.hh +++ b/scribo/primitive/extract/vertical_separators.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,37 +23,44 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_WORLD_INTER_PIXEL_FULL2IMAGE_HH -# define MLN_WORLD_INTER_PIXEL_FULL2IMAGE_HH +#ifndef SCRIBO_PRIMITIVE_EXTRACT_VERTICAL_SEPARATORS_HH +# define SCRIBO_PRIMITIVE_EXTRACT_VERTICAL_SEPARATORS_HH /// \file /// -/// Convert an inter-pixel image to a classical image. +/// Extract vertical separators. # include <mln/core/concept/image.hh> -# include <mln/data/paste_without_localization.hh> -# include <mln/geom/nsites.hh> -# include <mln/world/inter_pixel/is_pixel.hh> +# include <mln/arith/plus.hh> +# include <scribo/primitive/extract/lines_v_pattern.hh> -namespace mln + +namespace scribo { - namespace world + namespace primitive { - namespace inter_pixel + namespace extract { - /// Convert an inter-pixel image to a classical image. - /// - /// \param[in] input An inter-pixel image. - /// - /// \return A classical image without inter-pixel data. - // + using namespace mln; + + /// \brief Extract vertical separators. + /*! + * + * \param[in] input A binary image. + * \param[in] line_length The minimum line length. + * + * \return A binary image were separators are set to 'True'. + * + * \sa primitive::remove::separators + */ template <typename I> mln_concrete(I) - full2image(const Image& input); + vertical_separators(const Image& input, unsigned line_length); + # ifndef MLN_INCLUDE_ONLY @@ -61,34 +68,28 @@ namespace mln template <typename I> mln_concrete(I) - full2image(const Image& input_) + vertical_separators(const Image& input_, unsigned line_length) { - trace::entering("world::inter_pixel::full2image"); - - mlc_is_a(mln_domain(I), Box)::check(); + trace::entering("scribo::primitive::extract::vertical_separators"); const I& input = exact(input_); + mlc_is(mln_value(I), bool)::check(); mln_precondition(input.is_valid()); - mln_domain(I) b(input.domain().pmin() / 2, - input.domain().pmax() / 2); - mln_concrete(I) output(b); - mln_assertion(geom::nsites(output) == geom::nsites(input | is_pixel())); + mln_concrete(I) + vlines = extract::lines_v_pattern(input, line_length, 3); - data::paste_without_localization(input | is_pixel(), output); - - trace::exiting("world::inter_pixel::full2image"); - return output; + trace::exiting("scribo::primitive::extract::vertical_separators"); + return vlines; } # endif // ! MLN_INCLUDE_ONLY + } // end of namespace scribo::primitive::extract - } // end of namespace mln::world::inter_pixel - - } // end of namespace mln::world + } // end of namespace scribo::primitive -} // end of namespace mln +} // end of namespace scribo -#endif // ! MLN_WORLD_INTER_PIXEL_FULL2IMAGE_HH +#endif // ! SCRIBO_PRIMITIVE_EXTRACT_VERTICAL_SEPARATORS_HH diff --git a/scribo/primitive/extract/lines_v_pattern.hh b/scribo/primitive/remove/separators.hh similarity index 50% copy from scribo/primitive/extract/lines_v_pattern.hh copy to scribo/primitive/remove/separators.hh index ccd21c5..9b45919 100644 --- a/scribo/primitive/extract/lines_v_pattern.hh +++ b/scribo/primitive/remove/separators.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,21 +23,22 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_PRIMITIVE_EXTRACT_LINES_V_PATTERN_HH -# define SCRIBO_PRIMITIVE_EXTRACT_LINES_V_PATTERN_HH +#ifndef SCRIBO_PRIMITIVE_REMOVE_SEPARATORS_HH +# define SCRIBO_PRIMITIVE_REMOVE_SEPARATORS_HH /// \file /// -/// Extract vertical lines matching a specific pattern. +/// Remove separators in a binary image. -#include <mln/core/concept/image.hh> -#include <mln/core/alias/window2d.hh> +# include <mln/core/concept/image.hh> -# include <mln/win/hline2d.hh> +# include <mln/core/routine/duplicate.hh> -# include <mln/morpho/dilation.hh> +# include <mln/core/image/dmorph/image_if.hh> +# include <mln/pw/all.hh> + +# include <mln/data/fill.hh> -# include <scribo/primitive/extract/lines_pattern.hh> namespace scribo { @@ -45,22 +46,26 @@ namespace scribo namespace primitive { - namespace extract + namespace remove { using namespace mln; - - /// Extract vertical lines matching a specific pattern. - /// - /// \param[in] input A binary image. - /// \param[in] length The minimum line length. - /// - /// \result An image of vertical lines. - // + /// \brief Remove separators in a binary image. + /*! + * + * \param[in] input A binary image. 'True' for objects, 'False' + * for the background. + * \param[in] separators A binary image of separators. + * + * \return \p input without separators. + * + * \sa primitive::extract::separators + */ template <typename I> mln_concrete(I) - lines_v_pattern(const Image& input, unsigned length, unsigned delta); + separators(const Image& input, const Image& separators); + # ifndef MLN_INCLUDE_ONLY @@ -68,39 +73,30 @@ namespace scribo template <typename I> mln_concrete(I) - lines_v_pattern(const Image& input, unsigned length, unsigned delta) + separators(const Image& input_, const Image& separators_) { - mln_precondition(length % 2 == 1); - -// bool win_def[1][7] = { { 1, 0, 0, 0, 0, 0, 1 } }; - -// window2d win; -// convert::from_to(win_def, win); - - // FIXME: not generic. - window2d win; - mln_deduce(I, site, dpsite) - dp1(0, -delta), - dp2(0, delta); - win.insert(dp1); - win.insert(dp2); - - //FIXME: Add reconstruction instead of this arbitrary dilation. - win::vline2d vwin(length/2 + 2); -// win::vline2d vwin(length); - return morpho::dilation(lines_pattern(input, length, 0, win), vwin); -// return lines_pattern(input, length, 0, win); - } + trace::entering("scribo::primitive::remove::separators"); + + const I& input = exact(input_); + const I& separators = exact(separators_); + mlc_is(mln_value(I), bool)::check(); + mln_precondition(input.is_valid()); + mln_precondition(separators.is_valid()); + mln_concrete(I) output = duplicate(input); + data::fill((output | (pw::value(separators) == pw::cst(true))).rw(), + false); + + trace::exiting("scribo::primitive::remove::separators"); + return output; + } # endif // ! MLN_INCLUDE_ONLY - } // end of namespace scribo::primitive::extract + } // end of namespace scribo::primitive::remove } // end of namespace scribo::primitive } // end of namespace scribo - -#endif // ! SCRIBO_PRIMITIVE_EXTRACT_LINES_V_PATTERN_HH - +#endif // ! SCRIBO_PRIMITIVE_REMOVE_SEPARATORS_HH -- 1.5.6.5

14 years

← Newer
1
2
3
4
5
6
7
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches April 2010