June 2010 - Olena-patches

last-svn-commit-155-g6fb5356 Add new Makefiles in Scribo demo directories.
by Guillaume Lazzara 15 Jun '10

15 Jun '10

* Makefile.am, * demo/Makefile.am: Add new Makefiles. --- scribo/ChangeLog | 7 +++++++ scribo/Makefile.am | 2 +- scribo/{tests/toolchain => demo}/Makefile.am | 5 +---- 3 files changed, 9 insertions(+), 5 deletions(-) copy scribo/{tests/toolchain => demo}/Makefile.am (91%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index cb7d9b0..b276525 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2010-06-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Add new Makefiles in Scribo demo directories. + + * Makefile.am, + * demo/Makefile.am: Add new Makefiles. + +2010-06-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * primitive/extract/components.hh: Use labeling::value_and_compute. 2010-06-15 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/Makefile.am b/scribo/Makefile.am index 3fb05fd..ff8f5a0 100644 --- a/scribo/Makefile.am +++ b/scribo/Makefile.am @@ -16,7 +16,7 @@ ## Process this file through Automake to create Makefile.in. -SUBDIRS = tests src +SUBDIRS = demo tests src .PHONY: bin diff --git a/scribo/tests/toolchain/Makefile.am b/scribo/demo/Makefile.am similarity index 91% copy from scribo/tests/toolchain/Makefile.am copy to scribo/demo/Makefile.am index 826fb86..4db20cd 100644 --- a/scribo/tests/toolchain/Makefile.am +++ b/scribo/demo/Makefile.am @@ -13,11 +13,8 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# ## Process this file through Automake to create Makefile.in. -include $(top_srcdir)/scribo/tests/tests.mk +SUBDIRS = review viewer -SUBDIRS = \ - nepomuk \ No newline at end of file -- 1.5.6.5

1 0

branch exp/scribo-z updated: last-svn-commit-145-g5c627b0
by lazzara＠lrde.epita.fr 15 Jun '10

15 Jun '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/scribo-z has been updated via 5c627b019540ecc6dbf4cb21630354289adf6f6b (commit) via 85cda080414cc6e05d8ee49246a2171eb7f4fbae (commit) via e8373a069ad3b882f9a927c8d318643645069c1e (commit) via 4bf89fb72cfe41e98d7df23be2cc79bb37173c39 (commit) from a6a8d2a44d746824876f24c53af69f83036ddaf3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 5c627b0 primitive/extract/components.hh: Use labeling::value_and_compute. 85cda08 Introduce labeling::value_and_compute. e8373a0 Add a fast rotation tool. 4bf89fb Add a new routine to highlight text areas in an image. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 11 + milena/mln/canvas/labeling/video.hh | 8 +- milena/mln/labeling/value.hh | 16 +- milena/mln/labeling/value_and_compute.hh | 241 ++++++++++++++++++ scribo/ChangeLog | 22 ++ scribo/debug/highlight_text_area.hh | 255 ++++++++++++++++++++ scribo/primitive/extract/components.hh | 5 +- scribo/src/debug/Makefile.am | 15 +- .../subsample.cc => debug/highlight_text_area.cc} | 62 ++++-- scribo/src/preprocessing/Makefile.am | 10 + scribo/src/preprocessing/rotate_90.cc | 51 ++++ scribo/src/text_in_picture.cc | 53 +---- 12 files changed, 674 insertions(+), 75 deletions(-) create mode 100644 milena/mln/labeling/value_and_compute.hh create mode 100644 scribo/debug/highlight_text_area.hh copy scribo/src/{preprocessing/subsample.cc => debug/highlight_text_area.cc} (57%) create mode 100644 scribo/src/preprocessing/rotate_90.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-145-g5c627b0 primitive/extract/components.hh: Use labeling::value_and_compute.
by Guillaume Lazzara 15 Jun '10

15 Jun '10

--- scribo/ChangeLog | 4 ++++ scribo/primitive/extract/components.hh | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 95fa4d2..cb7d9b0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-06-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * primitive/extract/components.hh: Use labeling::value_and_compute. + +2010-06-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a fast rotation tool. * scribo/src/preprocessing/Makefile.am, diff --git a/scribo/primitive/extract/components.hh b/scribo/primitive/extract/components.hh index aac54e6..4994d4b 100644 --- a/scribo/primitive/extract/components.hh +++ b/scribo/primitive/extract/components.hh @@ -38,7 +38,7 @@ # include <mln/accu/center.hh> # include <mln/accu/pair.hh> -# include <mln/labeling/blobs_and_compute.hh> +# include <mln/labeling/value_and_compute.hh> # include <mln/labeling/compute.hh> # include <mln/util/array.hh> @@ -124,7 +124,8 @@ namespace scribo mln::util::couple<L, mln::util::couple<mln::util::array<mln_result(pair_accu_t)>, mln::util::array<pair_accu_t> > > - results = labeling::blobs_and_compute(input, nbh, ncomponents, + + results = labeling::value_and_compute(input, true, nbh, ncomponents, pair_accu_t()); component_set<L> -- 1.5.6.5

1 0

last-svn-commit-144-g85cda08 Introduce labeling::value_and_compute.
by Guillaume Lazzara 15 Jun '10

15 Jun '10

* mln/canvas/labeling/video.hh: Call more functor members. * mln/labeling/value.hh: Provide new members to the functor. * mln/labeling/value_and_compute.hh: New functor computing attributes while labeling. --- milena/ChangeLog | 11 ++ milena/mln/canvas/labeling/video.hh | 8 +- milena/mln/labeling/value.hh | 16 ++- milena/mln/labeling/value_and_compute.hh | 241 ++++++++++++++++++++++++++++++ 4 files changed, 270 insertions(+), 6 deletions(-) create mode 100644 milena/mln/labeling/value_and_compute.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 98e20b3..15a34bc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2010-06-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Introduce labeling::value_and_compute. + + * mln/canvas/labeling/video.hh: Call more functor members. + + * mln/labeling/value.hh: Provide new members to the functor. + + * mln/labeling/value_and_compute.hh: New functor computing + attributes while labeling. + 2010-05-18 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/io/magick/load.hh: set minimum resolution for PDF files to diff --git a/milena/mln/canvas/labeling/video.hh b/milena/mln/canvas/labeling/video.hh index 31afda4..b46e930 100644 --- a/milena/mln/canvas/labeling/video.hh +++ b/milena/mln/canvas/labeling/video.hh @@ -162,14 +162,20 @@ namespace mln return output; } output.element(p) = ++nlabels; + f.set_new_label_(p, nlabels); } } else - output.element(p) = output.element(parent.element(p)); + { + L lbl = output.element(parent.element(p)); + output.element(p) = lbl; + f.set_label_(p, lbl); + } } status = true; } + f.finalize(); trace::exiting("canvas::impl::video_fastest"); return output; } diff --git a/milena/mln/labeling/value.hh b/milena/mln/labeling/value.hh index 5a16ca4..7e1608c 100644 --- a/milena/mln/labeling/value.hh +++ b/milena/mln/labeling/value.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -73,7 +73,7 @@ namespace mln L& nlabels) { mln_precondition(exact(input).is_valid()); - // mln_precondition(exact(nbh).is_valid()); + mln_precondition(exact(nbh).is_valid()); (void) input; (void) val; @@ -90,7 +90,7 @@ namespace mln // Generic functor. - template <typename I> + template <typename I, typename L> struct value_functor { typedef mln_psite(I) P; @@ -108,9 +108,12 @@ namespace mln bool handles(const P& p) const { return input(p) == val; } bool equiv(const P& n, const P&) const { return input(n) == val; } bool labels(const P&) const { return true; } - void do_no_union(const P&, const P&) {} + void do_no_union(const P&, const P&) {} void init_attr(const P&) {} void merge_attr(const P&, const P&) {} + void set_new_label(const P& p, const L& l){} + void set_label(const P& p, const L& l) {} + void finalize() {} // Fastest implementation @@ -121,6 +124,9 @@ namespace mln void do_no_union_(unsigned, unsigned) {} void init_attr_(unsigned) {} void merge_attr_(unsigned, unsigned) {} + void set_new_label_(unsigned, const L&) {} + void set_label_(unsigned, const L&) {} + void finalize_() {} // end of Requirements. @@ -148,7 +154,7 @@ namespace mln internal::value_tests(input, val, nbh, nlabels); mln_ch_value(I, L) output; - impl::value_functor f(input, val); + impl::value_functor<I,L> f(input, val); output = canvas::labeling::video(input, nbh, nlabels, f); trace::exiting("labeling::value"); diff --git a/milena/mln/labeling/value_and_compute.hh b/milena/mln/labeling/value_and_compute.hh new file mode 100644 index 0000000..d93fce9 --- /dev/null +++ b/milena/mln/labeling/value_and_compute.hh @@ -0,0 +1,241 @@ +// 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 MLN_LABELING_VALUE_AND_COMPUTE_HH +# define MLN_LABELING_VALUE_AND_COMPUTE_HH + +/// \file +/// +/// Connected component labeling of image sites at a given value. + +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/canvas/labeling/video.hh> +# include <mln/data/fill.hh> + + + +namespace mln +{ + + namespace labeling + { + + /// \brief Connected component labeling of the image sites at a given + /// value. + /// + /// \param[in] input The input image. + /// \param[in] val The value to consider. + /// \param[in] nbh The connectivity of components. + /// \param[out] nlabels The number of labels. + /// \return The label image. + // + template <typename I, typename N, typename L, typename A> + util::couple<mln_ch_value(I,L), + util::couple<util::array<mln_result(A)>, + util::array<A> > > + value_and_compute(const Image& input, const mln_value(I)& val, + const Neighborhood<N>& nbh, L& nlabels, + const Accumulator<A>& accu); + + +# ifndef MLN_INCLUDE_ONLY + + + // Tests. + + namespace internal + { + + template <typename I, typename N, typename L, typename A> + void + value_and_compute_tests(const Image& input, const mln_value(I)& val, + const Neighborhood<N>& nbh, L& nlabels, + const Accumulator<A>& accu) + { + mln_precondition(exact(input).is_valid()); + mln_precondition(exact(nbh).is_valid()); + + (void) accu; + (void) input; + (void) val; + (void) nbh; + (void) nlabels; + } + + } // end of namespace mln::labeling::internal + + + + namespace impl + { + + // Generic functor. + + template <typename I, typename L, typename A> + struct value_and_compute_functor + { + typedef mln_psite(I) P; + + util::array<mln_result(A)> result_; + util::array<A> accus_; + + const I& input; + const mln_value(I)& val; + + typedef mln_result(A) accu_result; + typedef mln_argument(A) accu_argument; + typedef util::couple<util::array<accu_result>, + util::array<A> > result; + + + // Requirements from mln::canvas::labeling. + + typedef mln_domain(I) S; + + // Generic implementation + + void init() {} + bool handles(const P& p) const { return input(p) == val; } + bool equiv(const P& n, const P&) const { return input(n) == val; } + bool labels(const P&) const { return true; } + void do_no_union(const P&, const P&) {} + void init_attr(const P&) {} + void merge_attr(const P&, const P&) {} + void set_new_label(const P& p, const L& l) + { + accus_.append(A()); + process__(accu_argument(), p, l); + } + void set_label(const P& p, const L& l) { process__(accu_argument(), p, l); }; + void finalize() { convert::from_to(accus_, result_); } + + + + // Fastest implementation + + void init_() { accus_.append(A()); } + bool handles_(unsigned p) const { return input.element(p) == val; } + bool equiv_(unsigned n, unsigned) const { return input.element(n) == val; } + bool labels_(unsigned) const { return true; } + void do_no_union_(unsigned, unsigned) {} + void init_attr_(unsigned) {} + void merge_attr_(unsigned, unsigned) {} + void set_new_label_(unsigned p, const L& l) + { + accus_.append(A()); + process__(accu_argument(), p, l); + }; + void set_label_(unsigned p, const L& l) { process__(accu_argument(), p, l); }; + void finalize_() { convert::from_to(accus_, result_); } + + // end of Requirements. + + + + value_and_compute_functor(const Image& input_, const mln_value(I)& val) + : input(exact(input_)), + val(val) + { + } + + + private: + inline + void process__(const unsigned&, unsigned p, const L& l) + { + accus_[l].take(p); + } + + inline + void process__(const mln_psite(I)&, unsigned p, const L& l) + { + accus_[l].take(input.point_at_index(p)); + } + + + inline + void process__(const mln_psite(I)&, const mln_site(I)& p, const L& l) + { + accus_[l].take(p); + } + + inline + void process__(const mln_value(I)&, const mln_site(I)&, const L& l) + { + accus_[l].take(l); + } + + template <typename V> + inline + void process__(const V&, const mln_site(I)&, const L& l) + { + mlc_abort(V)::check(); + } + + + }; + + } // end of namespace mln::labeling::impl + + + + + // Facade. + + template <typename I, typename N, typename L, typename A> + util::couple<mln_ch_value(I,L), + util::couple<util::array<mln_result(A)>, + util::array<A> > > + value_and_compute(const Image& input, const mln_value(I)& val, + const Neighborhood<N>& nbh, L& nlabels, + const Accumulator<A>& accu) + { + trace::entering("labeling::value_and_compute"); + + internal::value_and_compute_tests(input, val, nbh, nlabels, accu); + + typedef mln_ch_value(I,L) out_t; + typedef impl::value_and_compute_functor<I, L, A> func_t; + func_t f(input, val); + out_t output = canvas::labeling::video(input, nbh, nlabels, f); + + util::couple<out_t, typename func_t::result> + result = make::couple(output, + make::couple(f.result_, f.accus_)); + + + trace::exiting("labeling::value_and_compute"); + return result; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::labeling + +} // end of namespace mln + + +#endif // ! MLN_LABELING_VALUE_AND_COMPUTE_HH -- 1.5.6.5

1 0

last-svn-commit-143-ge8373a0 Add a fast rotation tool.
by Guillaume Lazzara 15 Jun '10

15 Jun '10

* scribo/src/preprocessing/Makefile.am, * scribo/src/preprocessing/rotate_90.cc: New. --- scribo/ChangeLog | 7 ++++ scribo/src/preprocessing/Makefile.am | 10 ++++++ scribo/src/preprocessing/rotate_90.cc | 51 +++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 0 deletions(-) create mode 100644 scribo/src/preprocessing/rotate_90.cc diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 355b467..95fa4d2 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2010-06-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a fast rotation tool. + + * scribo/src/preprocessing/Makefile.am, + * scribo/src/preprocessing/rotate_90.cc: New. + +2010-06-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new routine to highlight text areas in an image. * debug/highlight_text_area.hh: New. diff --git a/scribo/src/preprocessing/Makefile.am b/scribo/src/preprocessing/Makefile.am index d080c96..6096d8f 100644 --- a/scribo/src/preprocessing/Makefile.am +++ b/scribo/src/preprocessing/Makefile.am @@ -37,6 +37,16 @@ unskew_SOURCES = unskew.cc if HAVE_MAGICKXX + bin_PROGRAMS += rotate_90 + rotate_90_SOURCES = rotate_90.cc + rotate_90_CPPFLAGS = $(AM_CPPFLAGS) \ + $(TESSERACT_CPPFLAGS) \ + `Magick++-config --cppflags` + + rotate_90_LDFLAGS = $(AM_LDFLAGS) \ + $(TESSERACT_LDFLAGS) \ + -lpthread `Magick++-config --libs` + bin_PROGRAMS += to_pgm to_pgm_SOURCES = to_pgm.cc to_pgm_CPPFLAGS = $(AM_CPPFLAGS) \ diff --git a/scribo/src/preprocessing/rotate_90.cc b/scribo/src/preprocessing/rotate_90.cc new file mode 100644 index 0000000..3c4e84f --- /dev/null +++ b/scribo/src/preprocessing/rotate_90.cc @@ -0,0 +1,51 @@ +#include <mln/core/image/image2d.hh> +#include <mln/value/rgb8.hh> +#include <mln/io/magick/load.hh> +#include <mln/io/ppm/save.hh> + +#include <mln/util/timer.hh> + +#include <scribo/debug/usage.hh> +#include <scribo/preprocessing/rotate_90.hh> + + +const char *args_desc[][2] = +{ + { "input.*", "An image." }, + { "output.ppm", "A rotated image." }, + { "positive", "if set to 1, performs a +90 rotation; -90 otherwise. (default: 0)" }, + {0, 0} +}; + + + +int main(int argc, char *argv[]) +{ + using namespace mln; + + if (argc != 3 && argc != 4) + return scribo::debug::usage(argv, + "Fast +90/-90 rotation", + "input.* output.ppm", + args_desc); + + + typedef image2d<value::rgb8> I; + I ima; + io::magick::load(ima, argv[1]); + + bool positive = false; + + if (argc >= 4) + positive = (atoi(argv[3]) != 0); + + + mln::util::timer t; + t.start(); + image2d<value::rgb8> out = scribo::preprocessing::rotate_90(ima, positive); + t.stop(); + + std::cout << t << std::endl; + + io::ppm::save(out, argv[2]); +} -- 1.5.6.5

1 0

last-svn-commit-142-g4bf89fb Add a new routine to highlight text areas in an image.
by Guillaume Lazzara 15 Jun '10

15 Jun '10

* scribo/debug/highlight_text_area.hh: New. * scribo/src/debug/Makefile.am, * scribo/src/debug/highlight_text_area.cc: New tool. * scribo/src/text_in_picture.cc: Make use of this new routine. --- scribo/ChangeLog | 11 + scribo/debug/highlight_text_area.hh | 255 ++++++++++++++++++++ scribo/src/debug/Makefile.am | 15 +- .../subsample.cc => debug/highlight_text_area.cc} | 62 ++++-- scribo/src/text_in_picture.cc | 53 +---- 5 files changed, 329 insertions(+), 67 deletions(-) create mode 100644 scribo/debug/highlight_text_area.hh copy scribo/src/{preprocessing/subsample.cc => debug/highlight_text_area.cc} (57%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f91986a..355b467 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,14 @@ +2010-06-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a new routine to highlight text areas in an image. + + * debug/highlight_text_area.hh: New. + + * src/debug/Makefile.am, + * src/debug/highlight_text_area.cc: New tool. + + * src/text_in_picture.cc: Make use of this new routine. + 2010-06-03 Guillaume Lazzara <z(a)lrde.epita.fr> * src/README: New. diff --git a/scribo/debug/highlight_text_area.hh b/scribo/debug/highlight_text_area.hh new file mode 100644 index 0000000..5ab15b9 --- /dev/null +++ b/scribo/debug/highlight_text_area.hh @@ -0,0 +1,255 @@ +// 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_DEBUG_HIGHLIGHT_TEXT_AREA_HH +# define SCRIBO_DEBUG_HIGHLIGHT_TEXT_AREA_HH + +/// \file +/// +/// Darken an image and highlight the text areas. + +# include <mln/core/concept/image.hh> +# include <mln/core/concept/function.hh> + +# include <mln/draw/box.hh> + +# include <mln/data/fill.hh> +# include <mln/data/transform.hh> + +# include <mln/literal/colors.hh> + +# include <mln/value/rgb8.hh> + +# include <scribo/core/component_set.hh> +# include <scribo/core/line_set.hh> + + +namespace scribo +{ + + namespace debug + { + + using namespace mln; + + /*! \brief Darken an image and highlight valid lines. + + \param[in] input An image. + \param[in] bbox An array of text area bounding boxes. + + \return a color image with highlighted text areas. + + */ + template <typename I> + mln_ch_value(I, value::rgb8) + highlight_text_area(const Image& input_, + const mln::util::array<box<mln_site(I)> >& bbox); + + + /*! \brief Darken an image and highlight valid lines. + + \param[in] input An image. + \param[in] lines A line set. + + \return a color image with highlighted text areas. + + */ + template <typename I, typename L> + mln_ch_value(I, value::rgb8) + highlight_text_area(const Image& input_, + const line_set<L>& lines); + + /*! \brief Darken an image and highlight valid lines. + + This overload is useful if you do know that all the components + are text. + + \param[in] input An image. + \param[in] components A component set. + + \return a color image with highlighted text areas. + + */ + template <typename I, typename L> + mln_ch_value(I, value::rgb8) + highlight_text_area(const Image& input_, + const scribo::component_set<L>& components); + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + template <typename M, typename R> + struct mask_non_text + : Function_v2v<mask_non_text<M, R> >, + private mlc_is(mln_value(M), bool)::check_t + { + typedef R result; + + mask_non_text(const Image<M>& mask) + : mask_(exact(mask)), p_(mask_) + { + p_.start(); + } + + result operator()(const result& v) const + { + bool b = p_.val(); + p_.next(); + if (!b) + return v / 2; + else + return v; + + } + + M mask_; + mutable mln_pixter(M) p_; + }; + + } // end of namespace scribo::debug::internal + + + + template <typename I> + mln_ch_value(I, value::rgb8) + highlight_text_area(const Image& input_, + const mln::util::array<box<mln_site(I)> >& bbox) + { + trace::entering("scribo::debug::highlight_text_area"); + + const I& input = exact(input_); + + mln_precondition(input.is_valid()); + mlc_is(mln_value(I), value::rgb8)::check(); + + typedef mln_ch_value(I, bool) mask_t; + mask_t mask; + initialize(mask, input); + data::fill(mask, false); + + for_all_elements(i, bbox) + data::fill((mask | bbox(i)).rw(), true); + + internal::mask_non_text<mask_t, mln_value(I)> f(mask); + mln_concrete(I) output = data::transform(input, f); + + for_all_elements(i, bbox) + mln::draw::box(output, bbox(i), literal::red); + + trace::exiting("scribo::debug::highlight_text_area"); + return output; + } + + + template <typename I, typename L> + mln_ch_value(I, value::rgb8) + highlight_text_area(const Image& input_, + const line_set<L>& lines) + { + trace::entering("scribo::debug::highlight_text_area"); + + const I& input = exact(input_); + + mln_precondition(input.is_valid()); + mlc_is(mln_value(I), value::rgb8)::check(); + + typedef mln_ch_value(I, bool) mask_t; + mask_t mask; + initialize(mask, input); + data::fill(mask, false); + + for_all_lines(i, lines) + { + if (! lines(i).is_valid() + || lines(i).tag() != line::None + || lines(i).type() != line::Text) + continue; + + data::fill((mask | lines(i).bbox()).rw(), true); + } + + internal::mask_non_text<mask_t, mln_value(I)> f(mask); + mln_concrete(I) output = data::transform(input, f); + + for_all_lines(i, lines) + { + if (! lines(i).is_valid() + || lines(i).tag() != line::None + || lines(i).type() != line::Text) + continue; + + mln::draw::box(output, lines(i).bbox(), literal::red); + } + + trace::exiting("scribo::debug::highlight_text_area"); + return output; + } + + + template <typename I, typename L> + mln_ch_value(I, value::rgb8) + highlight_text_area(const Image& input_, + const scribo::component_set<L>& components) + { + trace::entering("scribo::debug::highlight_text_area"); + + const I& input = exact(input_); + + mln_precondition(input.is_valid()); + mlc_is(mln_value(I), value::rgb8)::check(); + + typedef mln_ch_value(I, bool) mask_t; + mask_t mask; + initialize(mask, input); + data::fill(mask, false); + + for_all_comps(i, components) + if (components(i).is_valid()) + data::fill((mask | components(i).bbox()).rw(), true); + + internal::mask_non_text<mask_t, mln_value(I)> f(mask); + mln_ch_value(I, value::rgb8) output = data::transform(input, f); + + for_all_comps(i, components) + if (components(i).is_valid()) + mln::draw::box(output, components(i).bbox(), literal::red); + + trace::exiting("scribo::debug::highlight_text_area"); + return output; + } + + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace scribo::debug + +} // end of namespace scribo + + +#endif // ! SCRIBO_DEBUG_HIGHLIGHT_TEXT_AREA_HH diff --git a/scribo/src/debug/Makefile.am b/scribo/src/debug/Makefile.am index bb55bfb..6055ed6 100644 --- a/scribo/src/debug/Makefile.am +++ b/scribo/src/debug/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +# (LRDE). # # This file is part of Olena. # @@ -74,3 +75,15 @@ show_objects_large_small_SOURCES = show_objects_large_small.cc show_objects_small_SOURCES = show_objects_small.cc show_objects_thick_SOURCES = show_objects_thick.cc show_objects_thin_SOURCES = show_objects_thin.cc + + +if HAVE_MAGICKXX + + bin_PROGRAMS += highlight_text_area + highlight_text_area_SOURCES = highlight_text_area.cc + highlight_text_area_CPPFLAGS = $(AM_CPPFLAGS) \ + `Magick++-config --cppflags` + highlight_text_area_LDFLAGS = $(AM_LDFLAGS) \ + -lpthread `Magick++-config --libs` + +endif HAVE_MAGICKXX \ No newline at end of file diff --git a/scribo/src/preprocessing/subsample.cc b/scribo/src/debug/highlight_text_area.cc similarity index 57% copy from scribo/src/preprocessing/subsample.cc copy to scribo/src/debug/highlight_text_area.cc index fde31e0..817effa 100644 --- a/scribo/src/preprocessing/subsample.cc +++ b/scribo/src/debug/highlight_text_area.cc @@ -23,23 +23,26 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#include <mln/core/image/image2d.hh> -#include <mln/core/alias/neighb2d.hh> -#include <mln/io/magick/load.hh> -#include <mln/io/ppm/save.hh> -#include <mln/subsampling/antialiased.hh> +# include <iostream> +# include <fstream> -#include <mln/value/rgb8.hh> - -#include <scribo/debug/usage.hh> +# include <mln/core/image/image2d.hh> +# include <mln/util/array.hh> +# include <mln/core/alias/box2d.hh> +# include <mln/make/box2d.hh> +# include <mln/io/ppm/save.hh> +# include <mln/io/magick/load.hh> +# include <mln/value/rgb8.hh> +# include <scribo/debug/highlight_text_area.hh> +# include <scribo/debug/usage.hh> const char *args_desc[][2] = { { "input.*", "An image." }, - { "ratio", "Scale ratio." }, - { "output.ppm", "A color image." }, + { "ocr_text.txt", "OCR result which must contain text boxes coordinates." }, + { "output.ppm", "A color image with highlighted text areas." }, {0, 0} }; @@ -50,18 +53,45 @@ int main(int argc, char *argv[]) if (argc != 4) return scribo::debug::usage(argv, - "Subsample.", - "input.* ratio output.ppm", + "Highlight text areas in an image.", + "input.* ocr_text.txt output.ppm", args_desc); trace::entering("main"); - typedef image2d<value::rgb8> I; - I input; + image2d<value::rgb8> input; io::magick::load(input, argv[1]); - unsigned ratio = atoi(argv[2]); - io::ppm::save(mln::subsampling::antialiased(input, ratio), argv[3]); + + mln::util::array<box2d> bbox; + + std::ifstream file(argv[2]); + if (! file) + { + std::cerr << "error: file '" << argv[2] + << "' not found!"; + abort(); + } + + + while (! file.eof()) + { + int + pmin_row, pmin_col, + pmax_row, pmax_col; + + file >> pmin_row; + file >> pmin_col; + file >> pmax_row; + file >> pmax_col; + + std::string txt; + getline (file, txt); + + bbox.append(mln::make::box2d(pmin_row, pmin_col, pmax_row, pmax_col)); + } + + io::ppm::save(scribo::debug::highlight_text_area(input, bbox), argv[3]); trace::exiting("main"); } diff --git a/scribo/src/text_in_picture.cc b/scribo/src/text_in_picture.cc index 8ad4697..c47786c 100644 --- a/scribo/src/text_in_picture.cc +++ b/scribo/src/text_in_picture.cc @@ -86,6 +86,8 @@ #include <scribo/filter/object_groups_small.hh> #include <scribo/filter/object_groups_v_thickness.hh> +#include <scribo/debug/highlight_text_area.hh> + #include <scribo/debug/decision_image.hh> #include <scribo/debug/save_bboxes_image.hh> #include <scribo/debug/save_linked_bboxes_image.hh> @@ -153,55 +155,6 @@ namespace mln }; - struct mask_non_text : Function_v2v<mask_non_text> - { - typedef value::rgb8 result; - typedef image2d<bool> I; - - mask_non_text(const image2d<bool>& mask) - : mask_(mask), p_(mask_) - { - p_.start(); - } - - result operator()(const result& v) const - { - bool b = p_.val(); - p_.next(); - if (!b) - return v / 2; - else - return v; - - } - - I mask_; - mutable mln_pixter_(I) p_; - }; - - - template <typename I, typename L> - mln_concrete(I) - compute_highlight_image(const I& input_rgb, - const scribo::component_set<L>& components) - { - mln_ch_value(I, bool) mask; - initialize(mask, input_rgb); - data::fill(mask, false); - - for_all_comps(i, components) - if (components(i).is_valid()) - data::fill((mask | components(i).bbox()).rw(), true); - - mask_non_text f(mask); - mln_concrete(I) output = data::transform(input_rgb, f); - - for_all_comps(i, components) - if (components(i).is_valid()) - mln::draw::box(output, components(i).bbox(), literal::red); - - return output; - } template <typename I, typename L> mln_concrete(I) @@ -684,7 +637,7 @@ Common usage: ./text_in_photo_fast input.ppm output.ppm 1 1 1 1 1", comps.nelements()), argv[2]); - io::ppm::save(compute_highlight_image(input_rgb, comps), + io::ppm::save(scribo::debug::highlight_text_area(input_rgb, comps), out_base_dir + "_input_with_bboxes.ppm"); io::ppm::save(compute_text_image(input_rgb, comps), out_base_dir + "_out_text.ppm"); -- 1.5.6.5

1 0

last-svn-commit-188-gc68caaf Actually use the maximal curvature in mesh-complex-max-curv-segm.
by Roland Levillain 14 Jun '10

14 Jun '10

* apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc: Here. --- milena/ChangeLog | 6 ++++++ .../mesh-segm-skel/mesh-complex-max-curv-segm.cc | 11 +++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8d0f1be..1fe8399 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2010-06-14 Roland Levillain <roland(a)lrde.epita.fr> + Actually use the maximal curvature in mesh-complex-max-curv-segm. + + * apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc: Here. + +2010-06-14 Roland Levillain <roland(a)lrde.epita.fr> + Improve the precision of some mesh-segm-skel apps. * apps/mesh-segm-skel/mesh-complex-segm.cc, diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc index 1f43381..a7a741a 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc @@ -91,14 +91,17 @@ int main(int argc, char* argv[]) mln::p_n_faces_fwd_piter<D, G> v(float_ima.domain(), 0); for_all(v) { + // FIXME: The program should allow the user to choose the kind + // of measure (curvature). +#if 0 float h = (curv.first(v) + curv.second(v)) / 2; // Pseudo-inverse curvature. float h_inv = 1 / pi * (atan(-h) + pi / 2); float_ima(v) = h_inv; - // FIXME: The program should allow the user to choose the kind - // of measure. -// input(v) = mln::math::max(mln::math::sqr(curv.first(v)), -// mln::math::sqr(curv.second(v))); +#endif + // Max curvature. + float_ima(v) = mln::math::max(mln::math::sqr(curv.first(v)), + mln::math::sqr(curv.second(v))); } // Values on edges. -- 1.5.6.5

1 0

last-svn-commit-188-gf36081f Actually use the maximal curvature in mesh-complex-max-curv-segm.
by Roland Levillain 14 Jun '10

14 Jun '10

* apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc: Here. --- milena/ChangeLog | 6 ++++++ .../mesh-segm-skel/mesh-complex-max-curv-segm.cc | 11 +++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 00afa02..923f16b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2010-06-14 Roland Levillain <roland(a)lrde.epita.fr> + Actually use the maximal curvature in mesh-complex-max-curv-segm. + + * apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc: Here. + +2010-06-14 Roland Levillain <roland(a)lrde.epita.fr> + Improve the precision of some mesh-segm-skel apps. * apps/mesh-segm-skel/mesh-complex-segm.cc, diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc index 1f43381..a7a741a 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc @@ -91,14 +91,17 @@ int main(int argc, char* argv[]) mln::p_n_faces_fwd_piter<D, G> v(float_ima.domain(), 0); for_all(v) { + // FIXME: The program should allow the user to choose the kind + // of measure (curvature). +#if 0 float h = (curv.first(v) + curv.second(v)) / 2; // Pseudo-inverse curvature. float h_inv = 1 / pi * (atan(-h) + pi / 2); float_ima(v) = h_inv; - // FIXME: The program should allow the user to choose the kind - // of measure. -// input(v) = mln::math::max(mln::math::sqr(curv.first(v)), -// mln::math::sqr(curv.second(v))); +#endif + // Max curvature. + float_ima(v) = mln::math::max(mln::math::sqr(curv.first(v)), + mln::math::sqr(curv.second(v))); } // Values on edges. -- 1.5.6.5

1 0

last-svn-commit-184-g300322e Actually use the maximal curvature in mesh-complex-max-curv-segm.
by Roland Levillain 14 Jun '10

14 Jun '10

* apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc: Here. --- milena/ChangeLog | 6 ++++++ .../mesh-segm-skel/mesh-complex-max-curv-segm.cc | 11 +++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2ce43e0..fb7dcff 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2010-06-14 Roland Levillain <roland(a)lrde.epita.fr> + Actually use the maximal curvature in mesh-complex-max-curv-segm. + + * apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc: Here. + +2010-06-14 Roland Levillain <roland(a)lrde.epita.fr> + Improve the precision of some mesh-segm-skel apps. * apps/mesh-segm-skel/mesh-complex-segm.cc, diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc index 1f43381..a7a741a 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc @@ -91,14 +91,17 @@ int main(int argc, char* argv[]) mln::p_n_faces_fwd_piter<D, G> v(float_ima.domain(), 0); for_all(v) { + // FIXME: The program should allow the user to choose the kind + // of measure (curvature). +#if 0 float h = (curv.first(v) + curv.second(v)) / 2; // Pseudo-inverse curvature. float h_inv = 1 / pi * (atan(-h) + pi / 2); float_ima(v) = h_inv; - // FIXME: The program should allow the user to choose the kind - // of measure. -// input(v) = mln::math::max(mln::math::sqr(curv.first(v)), -// mln::math::sqr(curv.second(v))); +#endif + // Max curvature. + float_ima(v) = mln::math::max(mln::math::sqr(curv.first(v)), + mln::math::sqr(curv.second(v))); } // Values on edges. -- 1.5.6.5

1 0

last-svn-commit-187-gca0ba34 Improve the precision of some mesh-segm-skel apps.
by Roland Levillain 14 Jun '10

14 Jun '10

* apps/mesh-segm-skel/mesh-complex-segm.cc, * apps/mesh-segm-skel/mesh-complex-skel.cc, * apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc, * apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc: Convert the floating point value input to an unsigned integer image to avoid precision errors due to float comparisons. --- milena/ChangeLog | 11 ++++ .../mesh-segm-skel/mesh-complex-max-curv-segm.cc | 39 ++++++++---- .../mesh-segm-skel/mesh-complex-max-curv-skel.cc | 61 +++++++++++++------- milena/apps/mesh-segm-skel/mesh-complex-segm.cc | 24 ++++++-- milena/apps/mesh-segm-skel/mesh-complex-skel.cc | 41 ++++++++++--- 5 files changed, 127 insertions(+), 49 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 009db1b..8d0f1be 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2010-06-14 Roland Levillain <roland(a)lrde.epita.fr> + Improve the precision of some mesh-segm-skel apps. + + * apps/mesh-segm-skel/mesh-complex-segm.cc, + * apps/mesh-segm-skel/mesh-complex-skel.cc, + * apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc, + * apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc: + Convert the floating point value input to an unsigned integer + image to avoid precision errors due to float comparisons. + +2010-06-14 Roland Levillain <roland(a)lrde.epita.fr> + New application: mesh-complex-max-curv-skel. * apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc: New. diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc index 477ccdf..1f43381 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc @@ -75,25 +75,26 @@ int main(int argc, char* argv[]) `----------------*/ // Image type. - typedef mln::float_2complex_image3df ima_t; + typedef mln::float_2complex_image3df float_ima_t; // Dimension of the image (and therefore of the complex). - static const unsigned D = ima_t::dim; + static const unsigned D = float_ima_t::dim; // Geometry of the image. - typedef mln_geom_(ima_t) G; + typedef mln_geom_(float_ima_t) G; mln::bin_2complex_image3df bin_input; mln::io::off::load(bin_input, input_filename); - std::pair<ima_t, ima_t> curv = mln::geom::mesh_curvature(bin_input.domain()); + std::pair<float_ima_t, float_ima_t> curv = + mln::geom::mesh_curvature(bin_input.domain()); // Compute the pseudo_inverse curvature at each vertex. - ima_t input(bin_input.domain()); - mln::p_n_faces_fwd_piter<D, G> v(input.domain(), 0); + float_ima_t float_ima(bin_input.domain()); + mln::p_n_faces_fwd_piter<D, G> v(float_ima.domain(), 0); for_all(v) { float h = (curv.first(v) + curv.second(v)) / 2; // Pseudo-inverse curvature. float h_inv = 1 / pi * (atan(-h) + pi / 2); - input(v) = h_inv; + float_ima(v) = h_inv; // FIXME: The program should allow the user to choose the kind // of measure. // input(v) = mln::math::max(mln::math::sqr(curv.first(v)), @@ -101,7 +102,7 @@ int main(int argc, char* argv[]) } // Values on edges. - mln::p_n_faces_fwd_piter<D, G> e(input.domain(), 1); + mln::p_n_faces_fwd_piter<D, G> e(float_ima.domain(), 1); typedef mln::complex_lower_neighborhood<D, G> adj_vertices_nbh_t; adj_vertices_nbh_t adj_vertices_nbh; mln_niter_(adj_vertices_nbh_t) adj_v(adj_vertices_nbh, e); @@ -113,14 +114,26 @@ int main(int argc, char* argv[]) // Iterate on vertices (0-faces). for_all(adj_v) { - s += input(adj_v); + s += float_ima(adj_v); ++n; } - input(e) = s / n; + float_ima(e) = s / n; // An edge should be adjacent to exactly two vertices. mln_invariant(n <= 2); } + // Convert the float image into an unsigned image because some + // algorithms do not handle float images well. + /* FIXME: This is bad: float images should be handled as-is. At + least, we should use a decent conversion, using an optimal affine + transformation (stretching/shrinking) or any other kind of + interpolation. */ + typedef mln::unsigned_2complex_image3df ima_t; + ima_t ima(float_ima.domain()); + mln_piter_(ima_t) p(float_ima.domain()); + for_all(p) + ima(p) = 1000 * float_ima(p); + /*-----------------. | Simplification. | `-----------------*/ @@ -131,7 +144,7 @@ int main(int argc, char* argv[]) adj_edges_nbh_t; adj_edges_nbh_t adj_edges_nbh; - ima_t closed_input = mln::morpho::closing::area(input, adj_edges_nbh, lambda); + ima_t closed_ima = mln::morpho::closing::area(ima, adj_edges_nbh, lambda); /*------. | WST. | @@ -141,7 +154,7 @@ int main(int argc, char* argv[]) not constrained the domain of the image to 1-faces only. It would be great if we could use something like this: - closed_input | mln::p_faces<1, D, G>(closed_input.domain()) + closed_ima | mln::p_faces<1, D, G>(closed_ima.domain()) as input of the WST. */ @@ -150,7 +163,7 @@ int main(int argc, char* argv[]) wst_val_t nbasins; typedef mln::unsigned_2complex_image3df wst_ima_t; wst_ima_t wshed = - mln::morpho::meyer_wst(closed_input, adj_edges_nbh, nbasins); + mln::morpho::meyer_wst(closed_ima, adj_edges_nbh, nbasins); std::cout << "nbasins = " << nbasins << std::endl; // Label polygons (i.e., propagate labels from edges to polygons). diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc index 6265a25..a174dd6 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc @@ -75,37 +75,38 @@ main(int argc, char* argv[]) | Complex image. | `----------------*/ - // Image type. - typedef mln::float_2complex_image3df ima_t; + // Curvature image type. + typedef mln::float_2complex_image3df float_ima_t; // Dimension of the image (and therefore of the complex). - static const unsigned D = ima_t::dim; + static const unsigned D = float_ima_t::dim; // Geometry of the image. - typedef mln_geom_(ima_t) G; + typedef mln_geom_(float_ima_t) G; mln::bin_2complex_image3df bin_input; mln::io::off::load(bin_input, input_filename); - std::pair<ima_t, ima_t> curv = mln::geom::mesh_curvature(bin_input.domain()); + std::pair<float_ima_t, float_ima_t> curv = + mln::geom::mesh_curvature(bin_input.domain()); // Compute the pseudo_inverse curvature at each vertex. - ima_t input(bin_input.domain()); - mln::p_n_faces_fwd_piter<D, G> v(input.domain(), 0); + float_ima_t float_ima(bin_input.domain()); + mln::p_n_faces_fwd_piter<D, G> v(float_ima.domain(), 0); for_all(v) { // FIXME: The program should allow the user to choose the kind - // of measure. + // of measure (curvature). #if 0 float h = (curv.first(v) + curv.second(v)) / 2; // Pseudo-inverse curvature. float h_inv = 1 / pi * (atan(-h) + pi / 2); - input(v) = h_inv; + float_ima(v) = h_inv; #endif // Max curvature. - input(v) = mln::math::max(mln::math::sqr(curv.first(v)), - mln::math::sqr(curv.second(v))); + float_ima(v) = mln::math::max(mln::math::sqr(curv.first(v)), + mln::math::sqr(curv.second(v))); } // Values on triangles. - mln::p_n_faces_fwd_piter<D, G> t(input.domain(), 2); + mln::p_n_faces_fwd_piter<D, G> t(float_ima.domain(), 2); // For each triangle (2-face) T, iterate on the the set of vertices // (0-faces) transitively adjacent to T. typedef mln::complex_m_face_neighborhood<D, G> adj_vertices_nbh_t; @@ -123,21 +124,34 @@ main(int argc, char* argv[]) // Iterate on vertices (0-faces). for_all(adj_v) { - s += input(adj_v); + s += float_ima(adj_v); ++n; } - input(t) = s / n; + float_ima(t) = s / n; // A triangle should be adjacent to exactly two vertices. mln_invariant(n <= 3); } + // Convert the float image into an unsigned image because some + // algorithms do not handle float images well. + /* FIXME: This is bad: float images should be handled as-is. At + least, we should use a decent conversion, using an optimal affine + transformation (stretching/shrinking) or any other kind of + interpolation. */ + typedef mln::unsigned_2complex_image3df ima_t; + ima_t ima(float_ima.domain()); + // Process only triangles, as edges and vertices are set afterwards + // (see FIXME below). + for_all(t) + ima(t) = 1000 * float_ima(t); + /* FIXME: Workaround: Set maximal values on vertices and edges to exclude them from the set of minimal values. */ for_all(v) - input(v) = mln_max(float); - mln::p_n_faces_fwd_piter<D, G> e(input.domain(), 1); + ima(v) = mln_max(mln_value_(ima_t)); + mln::p_n_faces_fwd_piter<D, G> e(float_ima.domain(), 1); for_all(e) - input(e) = mln_max(float); + ima(e) = mln_max(mln_value_(ima_t)); /*-----------------. | Simplification. | @@ -147,7 +161,7 @@ main(int argc, char* argv[]) typedef mln::complex_lower_dim_connected_n_face_neighborhood<D, G> nbh_t; nbh_t nbh; - ima_t closed_input = mln::morpho::closing::area(input, nbh, lambda); + ima_t closed_ima = mln::morpho::closing::area(ima, nbh, lambda); /*---------------. | Local minima. | @@ -161,7 +175,7 @@ main(int argc, char* argv[]) to 2-faces. */ typedef mln_ch_value_(ima_t, label_t) label_ima_t; label_ima_t minima = - mln::labeling::regional_minima(closed_input, nbh, nminima); + mln::labeling::regional_minima(closed_ima, nbh, nminima); typedef mln::complex_higher_neighborhood<D, G> higher_nbh_t; higher_nbh_t higher_nbh; @@ -201,7 +215,7 @@ main(int argc, char* argv[]) for_all(adj_e) if (minima(adj_e) == mln::literal::zero) { - // If V is adjcent to a non-minimal triangle, then it must + // If V is adjacent to a non-minimal triangle, then it must // not belong to a minima. ref_adj_minimum = mln::literal::zero; break; @@ -223,6 +237,13 @@ main(int argc, char* argv[]) | Initial binary image. | `-----------------------*/ + /* Careful: creating ``holes'' in the surface obviously changes its + topology, but it may also split a single connected component in + two or more components, resulting in a disconnected skeleton. We + may want to improve this step either by forbidding any splitting, + or by incrementally ``digging'' a regional minima as long as no + splitting occurs. */ + typedef mln_ch_value_(ima_t, bool) bin_ima_t; bin_ima_t surface(minima.domain()); mln::data::fill(surface, true); diff --git a/milena/apps/mesh-segm-skel/mesh-complex-segm.cc b/milena/apps/mesh-segm-skel/mesh-complex-segm.cc index 8d349fe..655a46c 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-segm.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-segm.cc @@ -66,15 +66,27 @@ int main(int argc, char* argv[]) | Complex image. | `----------------*/ - // Image type. - typedef mln::float_2complex_image3df ima_t; + // Input type. + typedef mln::float_2complex_image3df float_input_t; // Dimension of the image (and therefore of the complex). - static const unsigned D = ima_t::dim; + static const unsigned D = float_input_t::dim; // Geometry of the image. - typedef mln_geom_(ima_t) G; - - ima_t input; - mln::io::off::load(input, input_filename); + typedef mln_geom_(float_input_t) G; + + float_input_t float_input; + mln::io::off::load(float_input, input_filename); + + // Convert the float image into an unsigned image because some + // algorithms do not handle float images well. + /* FIXME: This is bad: float images should be handled as-is. At + least, we should use a decent conversion, using an optimal affine + transformation (stretching/shrinking) or any other kind of + interpolation. */ + typedef mln::unsigned_2complex_image3df ima_t; + ima_t input(float_input.domain()); + mln_piter_(ima_t) p(input.domain()); + for_all(p) + input(p) = 1000 * float_input(p); // Values on edges. mln::p_n_faces_fwd_piter<D, G> e(input.domain(), 1); diff --git a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc index b7e1f1f..5cd97b4 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc @@ -72,23 +72,37 @@ main(int argc, char* argv[]) `----------------*/ // Image type. - typedef mln::float_2complex_image3df ima_t; + typedef mln::float_2complex_image3df float_input_t; // Dimension of the image (and therefore of the complex). - static const unsigned D = ima_t::dim; + static const unsigned D = float_input_t::dim; // Geometry of the image. - typedef mln_geom_(ima_t) G; - - ima_t input; - mln::io::off::load(input, input_filename); + typedef mln_geom_(float_input_t) G; + + float_input_t float_input; + mln::io::off::load(float_input, input_filename); + + // Convert the float image into an unsigned image because some + // algorithms do not handle float images well. + /* FIXME: This is bad: float images should be handled as-is. At + least, we should use a decent conversion, using an optimal affine + transformation (stretching/shrinking) or any other kind of + interpolation. */ + typedef mln::unsigned_2complex_image3df ima_t; + ima_t input(float_input.domain()); + // Process only triangles, as edges and vertices are set afterwards + // (see FIXME below). + mln::p_n_faces_fwd_piter<D, G> t(input.domain(), 2); + for_all(t) + input(t) = 1000 * float_input(t); /* FIXME: Workaround: Set maximal values on vertices and edges to exclude them from the set of minimal values. */ mln::p_n_faces_fwd_piter<D, G> v(input.domain(), 0); for_all(v) - input(v) = mln_max(float); + input(v) = mln_max(mln_value_(ima_t)); mln::p_n_faces_fwd_piter<D, G> e(input.domain(), 1); for_all(e) - input(e) = mln_max(float); + input(e) = mln_max(mln_value_(ima_t)); /*-----------------. | Simplification. | @@ -126,7 +140,7 @@ main(int argc, char* argv[]) for_all(adj_t) if (minima(adj_t) == mln::literal::zero) { - // If E is adjcent to a non-minimal triangle, then it must + // If E is adjacent to a non-minimal triangle, then it must // not belong to a minima. ref_adj_minimum = mln::literal::zero; break; @@ -152,7 +166,7 @@ main(int argc, char* argv[]) for_all(adj_e) if (minima(adj_e) == mln::literal::zero) { - // If V is adjcent to a non-minimal triangle, then it must + // If V is adjacent to a non-minimal triangle, then it must // not belong to a minima. ref_adj_minimum = mln::literal::zero; break; @@ -174,6 +188,13 @@ main(int argc, char* argv[]) | Initial binary image. | `-----------------------*/ + /* Careful: creating ``holes'' in the surface obviously changes its + topology, but it may also split a single connected component in + two or more components, resulting in a disconnected skeleton. We + may want to improve this step either by forbidding any splitting, + or by incrementally ``digging'' a regional minima as long as no + splitting occurs. */ + typedef mln_ch_value_(ima_t, bool) bin_ima_t; bin_ima_t surface(minima.domain()); mln::data::fill(surface, true); -- 1.5.6.5

1 0