- Olena-patches

branch fix-swilena-deps-tracking deleted: last-svn-commit-524-g7924629
by git＠lrde.epita.fr 28 Oct '10

28 Oct '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 fix-swilena-deps-tracking has been deleted was 7924629f9a5ed75553a8fa6cee857bf59b634c0f ----------------------------------------------------------------------- 7924629f9a5ed75553a8fa6cee857bf59b634c0f Fix Swilena's dependency tracking. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-544-g6668394 Change return value for background in filtering functions.
by Guillaume Lazzara 28 Oct '10

28 Oct '10

* scribo/filter/objects_h_thick.hh, * scribo/filter/objects_h_thin.hh, * scribo/filter/objects_size_ratio.hh, * scribo/filter/objects_small.hh, * scribo/filter/objects_thick.hh, * scribo/filter/objects_thin.hh, * scribo/filter/objects_v_thick.hh, * scribo/filter/objects_v_thin.hh: Here. * scribo/fun/v2b/objects_large_filter.hh, * scribo/fun/v2b/objects_small_filter.hh: Here. Count the non filtered objects. --- scribo/ChangeLog | 17 +++++++++++++++++ scribo/scribo/filter/objects_h_thick.hh | 2 +- scribo/scribo/filter/objects_h_thin.hh | 2 +- scribo/scribo/filter/objects_size_ratio.hh | 2 +- scribo/scribo/filter/objects_small.hh | 3 ++- scribo/scribo/filter/objects_thick.hh | 2 +- scribo/scribo/filter/objects_thin.hh | 2 +- scribo/scribo/filter/objects_v_thick.hh | 2 +- scribo/scribo/filter/objects_v_thin.hh | 2 +- scribo/scribo/fun/v2b/objects_large_filter.hh | 10 +++++++++- scribo/scribo/fun/v2b/objects_small_filter.hh | 15 ++++++++++++--- 11 files changed, 47 insertions(+), 12 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index bb3b4aa..5660dc5 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,22 @@ 2010-08-31 Guillaume Lazzara <z(a)lrde.epita.fr> + Change return value for background in filtering functions. + + * scribo/filter/objects_h_thick.hh, + * scribo/filter/objects_h_thin.hh, + * scribo/filter/objects_size_ratio.hh, + * scribo/filter/objects_small.hh, + * scribo/filter/objects_thick.hh, + * scribo/filter/objects_thin.hh, + * scribo/filter/objects_v_thick.hh, + * scribo/filter/objects_v_thin.hh: Here. + + * scribo/fun/v2b/objects_large_filter.hh, + * scribo/fun/v2b/objects_small_filter.hh: Here. Count the non + filtered objects. + +2010-08-31 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/toolchain/text_in_doc_preprocess.hh: Add a new overload. 2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/filter/objects_h_thick.hh b/scribo/scribo/filter/objects_h_thick.hh index 9422798..86dc8dc 100644 --- a/scribo/scribo/filter/objects_h_thick.hh +++ b/scribo/scribo/filter/objects_h_thick.hh @@ -126,7 +126,7 @@ namespace scribo bool operator()(const mln_value(L)& l) const { if (l == literal::zero) - return true; + return false; return comps_(l).bbox().height() > min_thickness_; } diff --git a/scribo/scribo/filter/objects_h_thin.hh b/scribo/scribo/filter/objects_h_thin.hh index 56c6ab7..43bcdfc 100644 --- a/scribo/scribo/filter/objects_h_thin.hh +++ b/scribo/scribo/filter/objects_h_thin.hh @@ -128,7 +128,7 @@ namespace scribo bool operator()(const mln_value(L)& l) const { if (l == literal::zero) - return true; + return false; return comps_(l).bbox().ncols() > min_thinness_; } diff --git a/scribo/scribo/filter/objects_size_ratio.hh b/scribo/scribo/filter/objects_size_ratio.hh index 55de80d..6edb35f 100644 --- a/scribo/scribo/filter/objects_size_ratio.hh +++ b/scribo/scribo/filter/objects_size_ratio.hh @@ -80,7 +80,7 @@ namespace scribo bool operator()(const mln_value(L)& l) const { if (l == literal::zero) - return true; + return false; return (comps_(l).bbox().height() / static_cast<float>(comps_(l).bbox().width())) >= min_size_ratio_; } diff --git a/scribo/scribo/filter/objects_small.hh b/scribo/scribo/filter/objects_small.hh index ba9a50c..1520f7d 100644 --- a/scribo/scribo/filter/objects_small.hh +++ b/scribo/scribo/filter/objects_small.hh @@ -94,7 +94,7 @@ namespace scribo mln_concrete(I) components_small(const Image& input_, const Neighborhood<N>& nbh_, - const V& label_type, + V& nlabels, unsigned min_size) { trace::entering("scribo::filter::components_small"); @@ -115,6 +115,7 @@ namespace scribo func_t fv2b(lbl, min_size); mln_concrete(I) output = mln::data::transform(lbl.labeled_image(), fv2b); + nlabels = fv2b.nlabels_; trace::exiting("scribo::filter::components_small"); return output; diff --git a/scribo/scribo/filter/objects_thick.hh b/scribo/scribo/filter/objects_thick.hh index 485092a..faf13e7 100644 --- a/scribo/scribo/filter/objects_thick.hh +++ b/scribo/scribo/filter/objects_thick.hh @@ -111,7 +111,7 @@ namespace scribo bool operator()(const mln_value(L)& l) const { if (l == literal::zero) - return true; + return false; return components_(l).bbox().nrows() < max_thickness_ && components_(l).bbox().ncols() < max_thickness_; } diff --git a/scribo/scribo/filter/objects_thin.hh b/scribo/scribo/filter/objects_thin.hh index e8591d9..f58d0db 100644 --- a/scribo/scribo/filter/objects_thin.hh +++ b/scribo/scribo/filter/objects_thin.hh @@ -113,7 +113,7 @@ namespace scribo bool operator()(const mln_value(L)& l) const { if (l == literal::zero) - return true; + return false; return components_(l).bbox().nrows() > min_thickness_ && components_(l).bbox().ncols() > min_thickness_; } diff --git a/scribo/scribo/filter/objects_v_thick.hh b/scribo/scribo/filter/objects_v_thick.hh index 7b25d87..1db00cb 100644 --- a/scribo/scribo/filter/objects_v_thick.hh +++ b/scribo/scribo/filter/objects_v_thick.hh @@ -126,7 +126,7 @@ namespace scribo bool operator()(const mln_value(L)& l) const { if (l == literal::zero) - return true; + return false; return comps_(l).bbox().nrows() > min_thickness_; } diff --git a/scribo/scribo/filter/objects_v_thin.hh b/scribo/scribo/filter/objects_v_thin.hh index 52e10af..de11cec 100644 --- a/scribo/scribo/filter/objects_v_thin.hh +++ b/scribo/scribo/filter/objects_v_thin.hh @@ -129,7 +129,7 @@ namespace scribo bool operator()(const mln_value(L)& l) const { if (l == literal::zero) - return true; + return false; return comps_.bbox(l).nrows() > min_thinness_; } diff --git a/scribo/scribo/fun/v2b/objects_large_filter.hh b/scribo/scribo/fun/v2b/objects_large_filter.hh index 1707c9c..91da10d 100644 --- a/scribo/scribo/fun/v2b/objects_large_filter.hh +++ b/scribo/scribo/fun/v2b/objects_large_filter.hh @@ -86,6 +86,9 @@ namespace scribo /// The component set to filter. const component_set<L> components_; + + /// The number of labels remaining after filtering. + mln_value(L) nlabels_; }; @@ -111,8 +114,13 @@ namespace scribo components_large_filter<L>::operator()(const mln_value(L)& l) const { if (l == literal::zero) + return false; + if (components_.info(l).card() <= max_size_) + { + ++nlabels_; return true; - return components_.info(l).card() <= max_size_; + } + return false; } diff --git a/scribo/scribo/fun/v2b/objects_small_filter.hh b/scribo/scribo/fun/v2b/objects_small_filter.hh index 8e0ae8a..86d9287 100644 --- a/scribo/scribo/fun/v2b/objects_small_filter.hh +++ b/scribo/scribo/fun/v2b/objects_small_filter.hh @@ -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. // @@ -86,6 +87,9 @@ namespace scribo /// The component set to filter. const component_set<L> components_; + + /// The number of labels remaining after filtering. + mln_value(L) nlabels_; }; @@ -99,7 +103,7 @@ namespace scribo components_small_filter<L>::components_small_filter( const component_set<L>& components, unsigned min_size) - : min_size_(min_size), components_(components) + : min_size_(min_size), components_(components), nlabels_(0) { } @@ -111,8 +115,13 @@ namespace scribo components_small_filter<L>::operator()(const mln_value(L)& l) const { if (l == literal::zero) + return false; + if (components_.info(l).card() >= min_size_) + { + ++nlabels_; return true; - return components_.info(l).card() >= min_size_; + } + return false; } -- 1.5.6.5

1 0

last-svn-commit-543-ga280e6b scribo/toolchain/text_in_doc_preprocess.hh: Add a new overload.
by Guillaume Lazzara 28 Oct '10

28 Oct '10

--- scribo/ChangeLog | 4 ++ scribo/scribo/toolchain/text_in_doc_preprocess.hh | 32 ++++++++++++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4c98593..bb3b4aa 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2010-08-31 Guillaume Lazzara <z(a)lrde.epita.fr> + + * scribo/toolchain/text_in_doc_preprocess.hh: Add a new overload. + 2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> Rename examples. diff --git a/scribo/scribo/toolchain/text_in_doc_preprocess.hh b/scribo/scribo/toolchain/text_in_doc_preprocess.hh index cff99f7..d7757ff 100644 --- a/scribo/scribo/toolchain/text_in_doc_preprocess.hh +++ b/scribo/scribo/toolchain/text_in_doc_preprocess.hh @@ -76,6 +76,22 @@ namespace scribo mln_ch_value(I,bool) text_in_doc_preprocess(const Image& input, unsigned lambda); + /*! \brief Preprocess a document before looking for its content. + + \param[in] input An image. + \param[in] lambda Parameter to the background removal. + \param[in,out] fg The foreground layer of \p input. + + If lambda is set to '0' no background removal is + performed. Otherwise, a background removal is performed with the + given \p lambda value. + + */ + template <typename I> + mln_ch_value(I,bool) + text_in_doc_preprocess(const Image& input, unsigned lambda, + Image& fg); + # ifndef MLN_INCLUDE_ONLY @@ -84,8 +100,6 @@ namespace scribo mln_ch_value(I,bool) text_in_doc_preprocess(const Image& input_, bool enable_fg_bg) { - trace::entering("scribo::toolchain::text_in_doc_preprocess"); - const I& input = exact(input_); mln_precondition(input.is_valid()); @@ -95,18 +109,27 @@ namespace scribo mln_ch_value(I,bool) output = text_in_doc_preprocess(input, lambda); - trace::exiting("scribo::toolchain::text_in_doc_preprocess"); return output; } + template <typename I> + mln_ch_value(I,bool) + text_in_doc_preprocess(const Image& input, unsigned lambda) + { + I tmp; + return text_in_doc_preprocess(input, lambda, tmp); + } + template <typename I> mln_ch_value(I,bool) - text_in_doc_preprocess(const Image& input_, unsigned lambda) + text_in_doc_preprocess(const Image& input_, unsigned lambda, + Image& fg_) { trace::entering("scribo::toolchain::text_in_doc_preprocess"); const I& input = exact(input_); + I& fg = exact(fg_); mln_precondition(input.is_valid()); mln_concrete(I) input_rgb = input; @@ -116,6 +139,7 @@ namespace scribo { std::cout << "Extracting foreground..." << std::endl; input_rgb = preprocessing::split_bg_fg(input, lambda, 32).second(); + fg = input_rgb; } // Convert to Gray level image. -- 1.5.6.5

1 0

last-svn-commit-541-ge03994d Rename examples.
by Guillaume Lazzara 28 Oct '10

28 Oct '10

* src/binarization/Makefile.am: Rename targets. * src/binarization/fg_sauvola_ms.cc, * src/binarization/ppm_fg_sauvola_ms.cc: Rename as... * src/binarization/ppm_sauvola_ms_fg.cc, * src/binarization/sauvola_ms_fg.cc: ...this. --- scribo/ChangeLog | 12 ++++++++++++ scribo/src/binarization/Makefile.am | 12 ++++++------ .../{ppm_fg_sauvola_ms.cc => ppm_sauvola_ms_fg.cc} | 0 .../{fg_sauvola_ms.cc => sauvola_ms_fg.cc} | 0 4 files changed, 18 insertions(+), 6 deletions(-) rename scribo/src/binarization/{ppm_fg_sauvola_ms.cc => ppm_sauvola_ms_fg.cc} (100%) rename scribo/src/binarization/{fg_sauvola_ms.cc => sauvola_ms_fg.cc} (100%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 3ea2773..4c98593 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,17 @@ 2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Rename examples. + + * src/binarization/Makefile.am: Rename targets. + + * src/binarization/fg_sauvola_ms.cc, + * src/binarization/ppm_fg_sauvola_ms.cc: Rename as... + + * src/binarization/ppm_sauvola_ms_fg.cc, + * src/binarization/sauvola_ms_fg.cc: ...this. + +2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + * headers.mk: Regen. 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/src/binarization/Makefile.am b/scribo/src/binarization/Makefile.am index 277125a..c86b70a 100644 --- a/scribo/src/binarization/Makefile.am +++ b/scribo/src/binarization/Makefile.am @@ -22,7 +22,7 @@ bin_PROGRAMS = \ pgm_sauvola \ pgm_sauvola_ms \ ppm_sauvola \ - ppm_fg_sauvola_ms \ + ppm_sauvola_ms_fg \ ppm_sauvola_ms \ ppm_sauvola_ms_split @@ -31,24 +31,24 @@ pgm_global_threshold_auto_SOURCES = pgm_global_threshold_auto.cc pgm_sauvola_SOURCES = pgm_sauvola.cc pgm_sauvola_ms_SOURCES = pgm_sauvola_ms.cc ppm_sauvola_SOURCES = ppm_sauvola.cc -ppm_fg_sauvola_ms_SOURCES = ppm_fg_sauvola_ms.cc +ppm_sauvola_ms_fg_SOURCES = ppm_sauvola_ms_fg.cc ppm_sauvola_ms_SOURCES = ppm_sauvola_ms.cc ppm_sauvola_ms_split_SOURCES = ppm_sauvola_ms_split.cc if HAVE_MAGICKXX bin_PROGRAMS += \ - fg_sauvola_ms \ + sauvola_ms_fg \ sauvola \ sauvola_debug \ sauvola_ms \ sauvola_ms_debug \ sauvola_ms_split - fg_sauvola_ms_SOURCES = fg_sauvola_ms.cc - fg_sauvola_ms_CPPFLAGS = $(AM_CPPFLAGS) \ + sauvola_ms_fg_SOURCES = sauvola_ms_fg.cc + sauvola_ms_fg_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) - fg_sauvola_ms_LDFLAGS = $(AM_LDFLAGS) \ + sauvola_ms_fg_LDFLAGS = $(AM_LDFLAGS) \ $(MAGICKXX_LDFLAGS) sauvola_SOURCES = sauvola.cc diff --git a/scribo/src/binarization/ppm_fg_sauvola_ms.cc b/scribo/src/binarization/ppm_sauvola_ms_fg.cc similarity index 100% rename from scribo/src/binarization/ppm_fg_sauvola_ms.cc rename to scribo/src/binarization/ppm_sauvola_ms_fg.cc diff --git a/scribo/src/binarization/fg_sauvola_ms.cc b/scribo/src/binarization/sauvola_ms_fg.cc similarity index 100% rename from scribo/src/binarization/fg_sauvola_ms.cc rename to scribo/src/binarization/sauvola_ms_fg.cc -- 1.5.6.5

1 0

last-svn-commit-542-g4cf994e mln/labeling/compute.hh: Add a missing overload in dispatch.
by Guillaume Lazzara 28 Oct '10

28 Oct '10

--- milena/ChangeLog | 4 ++++ milena/mln/labeling/compute.hh | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7dccad8..191c165 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/labeling/compute.hh: Add a missing overload in dispatch. + 2010-09-22 Guillaume Lazzara <z(a)lrde.epita.fr> * milena/mln/core/image/vmorph/fun_image.hh: Fix an invalid diff --git a/milena/mln/labeling/compute.hh b/milena/mln/labeling/compute.hh index 5e5c5f0..a9dc791 100644 --- a/milena/mln/labeling/compute.hh +++ b/milena/mln/labeling/compute.hh @@ -530,6 +530,20 @@ namespace mln template <typename A, typename I, typename L> inline util::array<mln_result(A)> + compute_dispatch(mln::trait::image::value_storage::any, + mln::trait::image::value_storage::any, + const Accumulator<A>& a, + const Image& input, + const Image<L>& label, + const mln_value(L)& nlabels) + { + return impl::generic::compute(a, input, label, nlabels); + } + + + template <typename A, typename I, typename L> + inline + util::array<mln_result(A)> compute_dispatch(mln::trait::image::value_storage::one_block, mln::trait::image::value_storage::one_block, const Accumulator<A>& a, -- 1.5.6.5

1 0

last-svn-commit-538-gf3d71b3 Fix namespace ambiguities.
by Guillaume Lazzara 28 Oct '10

28 Oct '10

* scribo/binarization/sauvola_ms.hh, * scribo/binarization/sauvola_threshold_image.hh, * scribo/preprocessing/deskew.hh, * scribo/subsampling/integral_single_image.hh: Add mln:: prefix. --- scribo/ChangeLog | 9 ++++++ scribo/scribo/binarization/sauvola_ms.hh | 28 ++++++++++--------- .../scribo/binarization/sauvola_threshold_image.hh | 6 +++- scribo/scribo/preprocessing/deskew.hh | 7 +++-- scribo/scribo/subsampling/integral_single_image.hh | 7 +++- 5 files changed, 37 insertions(+), 20 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 9faaf10..5fe30ab 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,12 @@ +2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix namespace ambiguities. + + * scribo/binarization/sauvola_ms.hh, + * scribo/binarization/sauvola_threshold_image.hh, + * scribo/preprocessing/deskew.hh, + * scribo/subsampling/integral_single_image.hh: Add mln:: prefix. + 2010-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/filter/object_links_bbox_w_ratio.hh: Rename arguments. diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index f63a9a1..c526e69 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -755,25 +755,27 @@ namespace scribo { util::array<util::couple<unsigned, unsigned> > n(n_scales + 2); - n(1) = make::couple(ima.nrows(), ima.ncols()); - n(2) = make::couple(sub(n(1).first(), s), - sub(n(1).second(), s)); + n(1) = mln::make::couple(ima.nrows(), ima.ncols()); + n(2) = mln::make::couple(sub(n(1).first(), s), + sub(n(1).second(), s)); for (unsigned i = 3; i <= n_scales + 1; ++i) - n(i) = make::couple(sub(n(i - 1).first(), 2), - sub(n(i - 1).second(), 2)); + n(i) = mln::make::couple(sub(n(i - 1).first(), 2), + sub(n(i - 1).second(), 2)); util::array<util::couple<mln_domain(I), unsigned> > out(n.size()); - out(0) = make::couple(make::box2d(1,1), 1u); - out(1) = make::couple(make::box2d(ima.nrows(), ima.ncols()), 2u); - out(n_scales + 1) = make::couple(make::box2d(n(n_scales + 1).first(), - n(n_scales + 1).second()), - 1u); + out(0) = mln::make::couple(mln::make::box2d(1,1), 1u); + out(1) = mln::make::couple(mln::make::box2d(ima.nrows(), + ima.ncols()), 2u); + out(n_scales + 1) = mln::make::couple( + mln::make::box2d(n(n_scales + 1).first(), + n(n_scales + 1).second()), 1u); for (unsigned i = n_scales; i > 1; --i) - out(i) = make::couple(make::box2d(2 * out(i + 1).first().nrows(), - 2 * out(i + 1).first().ncols()), - 2 * out(i + 1).second()); + out(i) = mln::make::couple( + mln::make::box2d(2 * out(i + 1).first().nrows(), + 2 * out(i + 1).first().ncols()), + 2 * out(i + 1).second()); out(1).second() = std::max(out(2).first().ncols() * s - ima.ncols(), out(2).first().nrows() * s - ima.nrows()); diff --git a/scribo/scribo/binarization/sauvola_threshold_image.hh b/scribo/scribo/binarization/sauvola_threshold_image.hh index beaf06e..bdb032c 100644 --- a/scribo/scribo/binarization/sauvola_threshold_image.hh +++ b/scribo/scribo/binarization/sauvola_threshold_image.hh @@ -432,8 +432,10 @@ namespace scribo mln_concrete(I) output; initialize(output, input); - const def::coord nrows = static_cast<def::coord>(input.nrows()); - const def::coord ncols = static_cast<def::coord>(input.ncols()); + const mln::def::coord + nrows = static_cast<mln::def::coord>(input.nrows()), + ncols = static_cast<mln::def::coord>(input.ncols()); + for(def::coord row = 0; row < nrows; ++row) for(def::coord col = 0; col < ncols; ++col) diff --git a/scribo/scribo/preprocessing/deskew.hh b/scribo/scribo/preprocessing/deskew.hh index 9b86ff7..234ffd6 100644 --- a/scribo/scribo/preprocessing/deskew.hh +++ b/scribo/scribo/preprocessing/deskew.hh @@ -227,7 +227,8 @@ namespace scribo double rho_index = (0.5 + (rho / hough.mrho() + 0.5) * hough.mrhoi()); - ++(opt::at(hough.acc(), static_cast<def::coord>(rho_index), i)); + ++(opt::at(hough.acc(), + static_cast<mln::def::coord>(rho_index), i)); } } @@ -420,8 +421,8 @@ namespace scribo output = geom::rotate(input_gl, - angle, //mln_max(mln_value(I)), extend(input_gl, mln_max(mln_value(I))), - make::box2d(input_gl.nrows(), - input_gl.ncols())); + mln::make::box2d(input_gl.nrows(), + input_gl.ncols())); trace::exiting("scribo::preprocessing::deskew"); return output; diff --git a/scribo/scribo/subsampling/integral_single_image.hh b/scribo/scribo/subsampling/integral_single_image.hh index fc0c8dd..b9c7a59 100644 --- a/scribo/scribo/subsampling/integral_single_image.hh +++ b/scribo/scribo/subsampling/integral_single_image.hh @@ -32,6 +32,8 @@ /// Both subsampling and integral image computation. #include <mln/core/concept/image.hh> +#include <mln/core/concept/box.hh> +#include <mln/make/box2d.hh> #include <mln/metal/equal.hh> #include <mln/extension/fill.hh> #include <mln/debug/println.hh> @@ -440,8 +442,9 @@ namespace scribo mln_precondition(input.domain().pmin() == literal::origin); mln_precondition(scale > 1); - box<mln_site(I)> b = make::box2d((input.nrows() + scale - 1) / scale, - (input.ncols() + scale - 1) / scale); + box<mln_site(I)> + b = mln::make::box2d((input.nrows() + scale - 1) / scale, + (input.ncols() + scale - 1) / scale); mln_concrete(I) output; output = integral(input_, scale, integral_sum_sum_2, b, mln::border::thickness); -- 1.5.6.5

1 0

last-svn-commit-539-gab11b69 Add a preprocessing toolchain.
by Guillaume Lazzara 28 Oct '10

28 Oct '10

* scribo/toolchain/text_in_doc_preprocess.hh: New. * src/text_in_doc_preprocess.cc: Make use of this new toolchain. --- scribo/ChangeLog | 8 + scribo/scribo/toolchain/text_in_doc_preprocess.hh | 152 +++++++++++++++++++++ scribo/src/text_in_doc_preprocess.cc | 39 ++---- 3 files changed, 170 insertions(+), 29 deletions(-) create mode 100644 scribo/scribo/toolchain/text_in_doc_preprocess.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 5fe30ab..45ebaaf 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a preprocessing toolchain. + + * scribo/toolchain/text_in_doc_preprocess.hh: New. + + * src/text_in_doc_preprocess.cc: Make use of this new toolchain. + +2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix namespace ambiguities. * scribo/binarization/sauvola_ms.hh, diff --git a/scribo/scribo/toolchain/text_in_doc_preprocess.hh b/scribo/scribo/toolchain/text_in_doc_preprocess.hh new file mode 100644 index 0000000..cff99f7 --- /dev/null +++ b/scribo/scribo/toolchain/text_in_doc_preprocess.hh @@ -0,0 +1,152 @@ +// 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_TOOLCHAIN_TEXT_IN_DOC_PREPROCESS_HH +# define SCRIBO_TOOLCHAIN_TEXT_IN_DOC_PREPROCESS_HH + +/// \file +/// +/// \brief Preprocess a document before looking for its content. + + +#include <mln/core/concept/image.hh> +#include <mln/logical/not.hh> + +#include <scribo/binarization/sauvola_ms.hh> + +#include <scribo/preprocessing/split_bg_fg.hh> +#include <scribo/preprocessing/deskew.hh> + + +namespace scribo +{ + + namespace toolchain + { + + using namespace mln; + + /*! \brief Preprocess a document before looking for its content. + + \param[in] input An image. + \param[in] enable_fg_bg Enable/Disable background removal. + + If \p enable_fg_bg is set to 'True' then a background removal is + performed. Its parameter lambda is automatically set according + to the input image size. + + */ + template <typename I> + mln_ch_value(I,bool) + text_in_doc_preprocess(const Image& input, bool enable_fg_bg); + + /*! \brief Preprocess a document before looking for its content. + + \param[in] input An image. + \param[in] lambda Parameter to the background removal. + + If lambda is set to '0' no background removal is + performed. Otherwise, a background removal is performed with the + given \p lambda value. + + */ + template <typename I> + mln_ch_value(I,bool) + text_in_doc_preprocess(const Image& input, unsigned lambda); + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename I> + mln_ch_value(I,bool) + text_in_doc_preprocess(const Image& input_, bool enable_fg_bg) + { + trace::entering("scribo::toolchain::text_in_doc_preprocess"); + + const I& input = exact(input_); + mln_precondition(input.is_valid()); + + unsigned lambda = 0; + if (enable_fg_bg) + lambda = 1.2 * (input.nrows() + input.ncols()); + + mln_ch_value(I,bool) output = text_in_doc_preprocess(input, lambda); + + trace::exiting("scribo::toolchain::text_in_doc_preprocess"); + return output; + } + + + template <typename I> + mln_ch_value(I,bool) + text_in_doc_preprocess(const Image& input_, unsigned lambda) + { + trace::entering("scribo::toolchain::text_in_doc_preprocess"); + + const I& input = exact(input_); + mln_precondition(input.is_valid()); + + mln_concrete(I) input_rgb = input; + + // Extract foreground + if (lambda != 0) + { + std::cout << "Extracting foreground..." << std::endl; + input_rgb = preprocessing::split_bg_fg(input, lambda, 32).second(); + } + + // Convert to Gray level image. + mln_ch_value(I,value::int_u8) + input_gl = data::transform(input_rgb, + mln::fun::v2v::rgb_to_int_u<8>()); + + + // Deskewing + std::cout << "Deskew if needed..." << std::endl; + input_gl = preprocessing::deskew(input_gl); + + // Binarize foreground to use it in the processing chain. + std::cout << "Binarizing foreground..." << std::endl; + mln_ch_value(I,bool) + input_bin = scribo::binarization::sauvola_ms(input_gl, 101, 3); + + logical::not_inplace(input_bin); + + trace::exiting("scribo::toolchain::text_in_doc_preprocess"); + return input_bin; + } + + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace scribo::toolchain + +} // end of namespace scribo + + +#endif // SCRIBO_TOOLCHAIN_TEXT_IN_DOC_PREPROCESS_HH + diff --git a/scribo/src/text_in_doc_preprocess.cc b/scribo/src/text_in_doc_preprocess.cc index fdbb018..b731272 100644 --- a/scribo/src/text_in_doc_preprocess.cc +++ b/scribo/src/text_in_doc_preprocess.cc @@ -34,17 +34,9 @@ #include <mln/value/rgb8.hh> -#include <mln/logical/not.hh> - -#include <scribo/binarization/sauvola_ms.hh> - #include <scribo/debug/usage.hh> -#include <scribo/preprocessing/split_bg_fg.hh> -#include <scribo/preprocessing/deskew.hh> - - -#include <mln/io/pgm/all.hh> +#include <scribo/toolchain/text_in_doc_preprocess.hh> const char *args_desc[][2] = @@ -74,28 +66,17 @@ int main(int argc, char* argv[]) unsigned lambda; if (argc == 5) lambda = atoi(argv[4]); - else - lambda = 1.2 * (input_rgb.nrows() + input_rgb.ncols()); - - // Extract foreground - if (argc >= 4 && atoi(argv[3]) == 1) - { - std::cout << "Extracting foreground..." << std::endl; - input_rgb = preprocessing::split_bg_fg(input_rgb, lambda, 32).second(); - } - // Convert to Gray level image. - image2d<value::int_u8> - input_gl = data::transform(input_rgb, mln::fun::v2v::rgb_to_int_u<8>()); + bool remove_bg = false; + if (argc >= 4) + remove_bg = (atoi(argv[3]) == 1); + image2d<bool> output; - // Deskewing - std::cout << "Deskew if needed..." << std::endl; - input_gl = preprocessing::deskew(input_gl); - - // Binarize foreground to use it in the processing chain. - std::cout << "Binarizing foreground..." << std::endl; - image2d<bool> input_bin = scribo::binarization::sauvola_ms(input_gl, 101, 3); + if (argc == 5 && remove_bg) + output = toolchain::text_in_doc_preprocess(input_rgb, lambda); + else + output = toolchain::text_in_doc_preprocess(input_rgb, remove_bg); - mln::io::pbm::save(input_bin, argv[2]); + mln::io::pbm::save(output, argv[2]); } -- 1.5.6.5

1 0

last-svn-commit-540-gfb411cc headers.mk: Regen.
by Guillaume Lazzara 28 Oct '10

28 Oct '10

--- scribo/ChangeLog | 4 ++++ scribo/headers.mk | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 45ebaaf..3ea2773 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + * headers.mk: Regen. + 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> Add a preprocessing toolchain. diff --git a/scribo/headers.mk b/scribo/headers.mk index 231742b..f421f92 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -196,6 +196,7 @@ scribo/text/merging.hh \ scribo/text/recognition.hh \ scribo/toolchain/nepomuk/text_extraction.hh \ scribo/toolchain/text_in_doc.hh \ +scribo/toolchain/text_in_doc_preprocess.hh \ scribo/upsampling/bs2x.hh \ scribo/upsampling/eagle.hh -- 1.5.6.5

1 0

last-svn-commit-536-g2a61065 milena/mln/core/image/vmorph/fun_image.hh: Fix an invalid function call.
by Guillaume Lazzara 28 Oct '10

28 Oct '10

--- milena/ChangeLog | 5 +++++ milena/mln/core/image/vmorph/fun_image.hh | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f9b40f9..7dccad8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2010-09-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + * milena/mln/core/image/vmorph/fun_image.hh: Fix an invalid + function call. + 2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> * headers.mk, tests/unit_test/unit-tests.mk: Regen. diff --git a/milena/mln/core/image/vmorph/fun_image.hh b/milena/mln/core/image/vmorph/fun_image.hh index 3934725..30ac44e 100644 --- a/milena/mln/core/image/vmorph/fun_image.hh +++ b/milena/mln/core/image/vmorph/fun_image.hh @@ -132,8 +132,6 @@ namespace mln /// Mutable access is for reading only. mln_result(F) operator()(const mln_psite(I)& p); // lvalue operator()(const mln_psite(I)& p); De-activated for 1.0 - - F f; }; @@ -211,7 +209,7 @@ namespace mln fun_image<F,I>::operator()(const mln_psite(I)& p) const { mln_precondition(this->data_->ima_.has(p)); - return f( this->data_->ima_(p) ); + return this->data_->f_( this->data_->ima_(p) ); } template <typename F, typename I> @@ -220,7 +218,7 @@ namespace mln fun_image<F,I>::operator()(const mln_psite(I)& p) { mln_precondition(this->data_->ima_.has(p)); - return f( this->data_->ima_(p) ); + return this->data_->f_( this->data_->ima_(p) ); // return mln::value::shell<F, I>( this->data_->ima_, p ); De-activated for 1.0 } -- 1.5.6.5

1 0

branch exp/next-build-ok updated: last-svn-commit-547-gbcad23e
by lazzara＠lrde.epita.fr 28 Oct '10

28 Oct '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/next-build-ok has been updated via bcad23e451dd1e759c7d0af2f8706e6e9279f2b6 (commit) via e313ea201d38347de8f94b7fc0add27ff112b098 (commit) via 8022d3d0347ebe0cecd98e7d243210ab0880bd81 (commit) via 66683946f29dd1fc11eb79c8f18829cbc0bed2a8 (commit) via a280e6bd70b2bade36e7085e021e91f7ab3bcb60 (commit) via 4cf994ed4b1388b89e8b2c14005a6b6f79c9bd04 (commit) via e03994db0862f5a246ac8ea4cbe22f3a6af7e478 (commit) via fb411ccc6182ca371d0d10228e94ba952ca0affe (commit) via ab11b69bf3320e80d970a92c8cdaf3f0450c0d17 (commit) via f3d71b3837ab87c355b4cc467aede2ee62e6ee4b (commit) via bef5b90d379e533ee10ba14bf5988b67e5824720 (commit) via 2a6106514287e253fe76fb95b7b9a56bdc399faf (commit) from 2eafecb020b1a4666eb9eeab739f82570ae5adbe (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 ----------------------------------------------------------------- bcad23e Small fixes in Scribo e313ea2 Add tests for objects filtering routines. 8022d3d Fix objects filtering routines. 6668394 Change return value for background in filtering functions. a280e6b scribo/toolchain/text_in_doc_preprocess.hh: Add a new overload. 4cf994e mln/labeling/compute.hh: Add a missing overload in dispatch. e03994d Rename examples. fb411cc headers.mk: Regen. ab11b69 Add a preprocessing toolchain. f3d71b3 Fix namespace ambiguities. bef5b90 scribo/filter/object_links_bbox_w_ratio.hh: Rename arguments. 2a61065 milena/mln/core/image/vmorph/fun_image.hh: Fix an invalid function call. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 9 + milena/mln/core/image/vmorph/fun_image.hh | 6 +- milena/mln/labeling/compute.hh | 14 ++ scribo/ChangeLog | 96 +++++++++++ scribo/headers.mk | 1 + scribo/scribo/binarization/global_threshold.hh | 5 + .../scribo/binarization/global_threshold_auto.hh | 2 +- scribo/scribo/binarization/sauvola_ms.hh | 28 ++-- .../scribo/binarization/sauvola_threshold_image.hh | 6 +- scribo/scribo/filter/object_links_bbox_w_ratio.hh | 8 +- scribo/scribo/filter/objects_h_thick.hh | 2 +- scribo/scribo/filter/objects_h_thin.hh | 2 +- scribo/scribo/filter/objects_large.hh | 46 +++++ scribo/scribo/filter/objects_size_ratio.hh | 2 +- scribo/scribo/filter/objects_small.hh | 10 +- scribo/scribo/filter/objects_thick.hh | 2 +- scribo/scribo/filter/objects_thin.hh | 2 +- scribo/scribo/filter/objects_v_thick.hh | 2 +- scribo/scribo/filter/objects_v_thin.hh | 2 +- scribo/scribo/fun/v2b/objects_large_filter.hh | 21 ++- scribo/scribo/fun/v2b/objects_small_filter.hh | 28 +++- scribo/scribo/preprocessing/deskew.hh | 9 +- scribo/scribo/subsampling/integral_single_image.hh | 7 +- scribo/scribo/toolchain/text_in_doc_preprocess.hh | 176 ++++++++++++++++++++ scribo/src/binarization/Makefile.am | 12 +- .../{ppm_fg_sauvola_ms.cc => ppm_sauvola_ms_fg.cc} | 0 .../{fg_sauvola_ms.cc => sauvola_ms_fg.cc} | 0 scribo/src/preprocessing/preprocess.cc | 9 +- scribo/src/text_in_doc_preprocess.cc | 39 +---- scribo/tests/filter/Makefile.am | 9 +- ...all_and_large_bboxes.cc => components_large.cc} | 49 ++++-- ...all_and_large_bboxes.cc => components_small.cc} | 48 ++++-- 32 files changed, 526 insertions(+), 126 deletions(-) create mode 100644 scribo/scribo/toolchain/text_in_doc_preprocess.hh rename scribo/src/binarization/{ppm_fg_sauvola_ms.cc => ppm_sauvola_ms_fg.cc} (100%) rename scribo/src/binarization/{fg_sauvola_ms.cc => sauvola_ms_fg.cc} (100%) copy scribo/tests/filter/{small_and_large_bboxes.cc => components_large.cc} (68%) rename scribo/tests/filter/{small_and_large_bboxes.cc => components_small.cc} (69%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0