March 2013 - Olena-patches

olena-2.0-397-gf16ceed [ICDAR_13] Refactore and use of sauvola_ms instead of sauvola
by Anthony Seure 23 Mar '13

23 Mar '13

--- scribo/sandbox/icdar_13_table/src/new.cc | 93 +++++++++++++++++------------- 1 files changed, 53 insertions(+), 40 deletions(-) diff --git a/scribo/sandbox/icdar_13_table/src/new.cc b/scribo/sandbox/icdar_13_table/src/new.cc index 5370164..b13696e 100644 --- a/scribo/sandbox/icdar_13_table/src/new.cc +++ b/scribo/sandbox/icdar_13_table/src/new.cc @@ -27,6 +27,7 @@ // INCLUDES SCRIBO #include <scribo/binarization/sauvola.hh> +#include <scribo/binarization/sauvola_ms.hh> #include <scribo/core/component_set.hh> #include <scribo/core/line_set.hh> @@ -56,6 +57,29 @@ using namespace mln; +// Draw weighted boxes (red < orange < cyan < green) +// 1 link < 2 links < 3 links < 3+ links +template<typename T, typename L> +void draw_adjacency_boxes(const std::vector<short>& balance, + image2d<T>& ima, + const scribo::object_groups< image2d<L> >& groups) +{ + for (unsigned i = 0; i < balance.size(); ++i) + { + if (balance[i] == 1) + draw::box(ima, groups(i).bbox(), literal::red); + + if (balance[i] == 2) + draw::box(ima, groups(i).bbox(), literal::orange); + + if (balance[i] == 3) + draw::box(ima, groups(i).bbox(), literal::cyan); + + if (balance[i] > 3) + draw::box(ima, groups(i).bbox(), literal::green); + } +} + // Write image2d<bool> images void write_image(const image2d<bool>& ima, const char* name, @@ -226,7 +250,8 @@ void draw_links_lr(const scribo::object_groups< image2d<unsigned> >& groups, && (b1.pmin()[0] == b2.pmin()[0] || (b1.pmin()[0] < b2.pmin()[0] && b1.pmax()[0] > b2.pmin()[0]) || (b1.pmin()[0] > b2.pmin()[0] && b2.pmax()[0] > b1.pmin()[0])) // Boxes are aligned - && abs(p1[0] - p2[0]) < 10) // Reduced gap + && abs(p1[0] - p2[0]) < 10 // Reduced gap + && abs(p1[1] - p2[1]) > (b1.width() + b2.width()) / 4) // Consistent gap { unsigned k = 1; short separators = 0; @@ -277,7 +302,8 @@ void draw_links_rl(const scribo::object_groups< image2d<unsigned> >& groups, && (b1.pmin()[0] == b2.pmin()[0] || (b1.pmin()[0] < b2.pmin()[0] && b1.pmax()[0] > b2.pmin()[0]) || (b1.pmin()[0] > b2.pmin()[0] && b2.pmax()[0] > b1.pmin()[0])) // Boxes are aligned - && abs(p1[0] - p2[0]) < 10) // Reduced gap + && abs(p1[0] - p2[0]) < 10 // Reduced gap + && abs(p1[1] - p2[1]) > (b1.width() + b2.width()) / 4) // Consistent gap { unsigned k = 1; short separators = 0; @@ -311,34 +337,33 @@ int main(int argc, char** argv) { typedef value::label_16 V; typedef image2d<V> L; - - std::ostringstream path; - image2d<value::rgb8> original, ima_links, ima_groups, ima_valid; - image2d<value::int_u8> filtered; - image2d<bool> bin, reverse, reverse_selection, bin_merged, separators, bin_without_separators, whitespaces, comp, denoised; - scribo::component_set< image2d<unsigned> > components, rcomponents; - - unsigned dpi = 72; + typedef image2d<value::rgb8> I8; + typedef image2d<bool> IB; + typedef scribo::component_set< image2d<unsigned> > CS; // Loading and binarization XML* xml = new XML("final.xml", argv[1]); util::array< image2d<value::rgb8> > pdf; + unsigned dpi = 72; io::pdf::load(pdf, argv[1], dpi); + // Iterate over all pages for (unsigned page = 0; page < pdf.nelements(); ++page) { - original = pdf[page]; - filtered = data::transform(original, fun::v2v::rgb_to_luma<value::int_u8>()); - bin = scribo::binarization::sauvola(filtered, 81, 0.44); + I8 original = pdf[page]; + image2d<value::int_u8> filtered = data::transform(original, fun::v2v::rgb_to_luma<value::int_u8>()); + IB bin = scribo::binarization::sauvola(filtered, 81, 0.44); + //IB bin = scribo::binarization::sauvola_ms(filtered, 81, 2); // Reverse selection - reverse = logical::not_(bin); + IB reverse = logical::not_(bin); + IB reverse_selection; initialize(reverse_selection, reverse); data::fill(reverse_selection, false); unsigned nrcomponents; - rcomponents = scribo::primitive::extract::components(reverse, c8(), nrcomponents); + CS rcomponents = scribo::primitive::extract::components(reverse, c8(), nrcomponents); for (unsigned i = 1; i < rcomponents.nelements(); ++i) { @@ -352,8 +377,8 @@ int main(int argc, char** argv) reverse_selection = scribo::preprocessing::denoise_fg(reverse_selection, c8(), 4); // Find separators - bin_without_separators = duplicate(bin); - separators = separators; + IB bin_without_separators = duplicate(bin); + IB separators = separators; V nhlines, nvlines; unsigned min_width = 31; unsigned min_height = 71; @@ -366,14 +391,15 @@ int main(int argc, char** argv) data::fill((bin_without_separators | vlines(i).bbox()).rw(), false); // Denoise - denoised = scribo::preprocessing::denoise_fg(bin_without_separators, c8(), 4); + IB denoised = scribo::preprocessing::denoise_fg(bin_without_separators, c8(), 4); // Bin merged - bin_merged = logical::or_(denoised, reverse_selection); + IB bin_merged = logical::or_(denoised, reverse_selection); // Extract components unsigned ncomponents; - components = scribo::primitive::extract::components(bin_merged, c8(), ncomponents); + CS components = scribo::primitive::extract::components(bin_merged, c8(), ncomponents); + IB comp; initialize(comp, bin_merged); data::fill(comp, false); @@ -398,9 +424,11 @@ int main(int argc, char** argv) // Filter links scribo::object_links< image2d<unsigned> > hratio_filtered_links = scribo::filter::object_links_bbox_h_ratio(merged_links, 2.5f); - ima_links = data::convert(value::rgb8(), bin_merged); - ima_groups = data::convert(value::rgb8(), bin_merged); - ima_valid = data::convert(value::rgb8(), bin_merged); + IB tmp = logical::and_(bin_merged, comp); + + I8 ima_links = data::convert(value::rgb8(), tmp); + I8 ima_groups = data::convert(value::rgb8(), tmp); + I8 ima_valid = data::convert(value::rgb8(), tmp); // Write links for (unsigned l = 1; l < merged_links.nelements(); ++l) @@ -442,25 +470,10 @@ int main(int argc, char** argv) draw_links_bt(groups, ima_groups, balance, average_width, hlines); draw_links_lr(groups, ima_groups, balance, vlines); draw_links_rl(groups, ima_groups, balance, vlines); - - // Draw weighted boxes (red < orange < cyan < green) - // 1 link < 2 links < 3 links < 3+ links - for (unsigned i = 0; i < balance.size(); ++i) - { - if (balance[i] == 1) - draw::box(ima_valid, groups(i).bbox(), literal::red); - - if (balance[i] == 2) - draw::box(ima_valid, groups(i).bbox(), literal::orange); - - if (balance[i] == 3) - draw::box(ima_valid, groups(i).bbox(), literal::cyan); - - if (balance[i] > 3) - draw::box(ima_valid, groups(i).bbox(), literal::green); - } + draw_adjacency_boxes(balance, ima_valid, groups); // Write images and close XML + std::ostringstream path; unsigned number = 0; write_image(bin, "bin", page, number, path); -- 1.7.2.5

1 0

olena-2.0-426-g81bdc8a scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh: Fix an invalid forward declaration.
by Guillaume Lazzara 22 Mar '13

22 Mar '13

--- scribo/ChangeLog | 5 +++++ .../with_single_left_link_dmax_ratio_aligned.hh | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 97b0179..137da91 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2013-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh: + Fix an invalid forward declaration. + +2013-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes. * scribo/binarization/internal/global_max_stddev_functor.hh: diff --git a/scribo/scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh b/scribo/scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh index f4e802e..df07415 100644 --- a/scribo/scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh +++ b/scribo/scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -65,8 +65,8 @@ namespace scribo /*! \brief Link objects with their left neighbor if exists. \param[in] components A component set. - \param[in] dmax_ratio Size ratio defining the maximum lookup - distance. + \param[in] dmax_f A function defining the maximum lookup + distance. \param[in] min_angle Minimum difference allowed for alignement angle. \param[in] max_angle Maximum difference allowed for @@ -83,17 +83,18 @@ namespace scribo where w is the bounding box width and h the bounding box height. */ - template <typename L> + template <typename L, typename F> inline object_links<L> with_single_left_link_dmax_ratio_aligned( const component_set<L>& components, - float dmax_ratio, + const DMax_Functor<F>& dmax_f, float min_angle, float max_angle, anchor::Type anchor); /// \overload /// anchor is set to MassCenter. + /// dmax_f functor is set to internal::dmax_default. // template <typename L> inline -- 1.7.2.5

1 0

olena-2.0-425-gb375ab3 doc/Makefile.am: Fix EXTRA_DIST.
by Guillaume Lazzara 22 Mar '13

22 Mar '13

--- milena/ChangeLog | 4 ++++ milena/doc/Makefile.am | 25 +++++++++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c23b608..114d5d4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/Makefile.am: Fix EXTRA_DIST. + +2013-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/unit_test/unit-tests.mk: Regen. 2013-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 55ce81e..f7ad598 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -695,14 +695,23 @@ regen-am: EXTRA_DIST += \ $(DATA_html_dirs) \ $(DOXYFILE).in \ - groups/accu.dox \ - groups/graph.dox \ - groups/images.dox \ - groups/main.dox \ - groups/neighb.dox \ - groups/site_set.dox \ - groups/util.dox \ - groups/win.dox \ + mln/win/win.dox \ + mln/main.dox \ + mln/morpho/morpho.dox \ + mln/canvas/canvas.dox \ + mln/data/data.dox \ + mln/util/graph.dox \ + mln/util/util.dox \ + mln/io/io.dox \ + mln/accu/accu.dox \ + mln/core/image/morphers.dox \ + mln/core/image/identity_morpher.dox \ + mln/core/image/images.dox \ + mln/core/image/domain_morpher.dox \ + mln/core/image/value_morpher.dox \ + mln/core/image/concrete.dox \ + mln/core/neighb.dox \ + mln/core/site_set/site_set.dox \ img/small-enlarged.png \ img/small.png \ doxyfuns.sty \ -- 1.7.2.5

1 0

branch sandbox/anthony updated: olena-2.0-396-gd276a4c
by git＠lrde.epita.fr 22 Mar '13

22 Mar '13

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 sandbox/anthony has been updated via d276a4c40057677a7e0871dcc50ec004b068b620 (commit) via d481951ecd322ef4f015005880317ceaeeedc6c9 (commit) via a1e60f081c8f3a3e97adb1eef3cf7dabcd3568ae (commit) via adcbc825ba7d148d83609a3b90eebd5ce71529ee (commit) via f4c521e33b83c9b37a974fa25959af95713f6d7f (commit) from 5991f6ae98c5808deb04d4c611ff86b5fb846c3f (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 ----------------------------------------------------------------- d276a4c [ICDAR_13] Validate links of boxes based on separators d481951 [ICDAR_13] Check old version XML output with GUI Annotator a1e60f0 [ICDAR_13] Update XML output + Add XML reference adcbc82 [ICDAR_13] Externalize XML handler f4c521e [ICDAR] Externalize some functions ----------------------------------------------------------------------- Summary of changes: scribo/sandbox/icdar_13_table/Makefile | 7 +- scribo/sandbox/icdar_13_table/TODO | 3 +- .../originals/competition-entry-region-model.xsd | 45 +++ scribo/sandbox/icdar_13_table/src/main.cc | 9 +- scribo/sandbox/icdar_13_table/src/new.cc | 386 ++++++++++++++------ scribo/sandbox/icdar_13_table/src/xml.cc | 48 +++ scribo/sandbox/icdar_13_table/src/xml.hh | 29 ++ 7 files changed, 400 insertions(+), 127 deletions(-) create mode 100644 scribo/sandbox/icdar_13_table/originals/competition-entry-region-model.xsd create mode 100644 scribo/sandbox/icdar_13_table/src/xml.cc create mode 100644 scribo/sandbox/icdar_13_table/src/xml.hh hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-396-gd276a4c [ICDAR_13] Validate links of boxes based on separators
by Anthony Seure 22 Mar '13

22 Mar '13

--- scribo/sandbox/icdar_13_table/src/new.cc | 123 +++++++++++++++++++++++++----- 1 files changed, 102 insertions(+), 21 deletions(-) diff --git a/scribo/sandbox/icdar_13_table/src/new.cc b/scribo/sandbox/icdar_13_table/src/new.cc index 9f05030..5370164 100644 --- a/scribo/sandbox/icdar_13_table/src/new.cc +++ b/scribo/sandbox/icdar_13_table/src/new.cc @@ -87,10 +87,12 @@ void write_image(const image2d<value::rgb8>& ima, } // Draw vertical links from top to bottom (red) +template<typename L> void draw_links_tb(const scribo::object_groups< image2d<unsigned> >& groups, image2d<value::rgb8>& ima_groups, std::vector<short>& balance, - unsigned average_width) + unsigned average_width, + const scribo::component_set<L>& hlines) { for (unsigned i = 1; i <= groups.nelements(); ++i) { @@ -116,9 +118,27 @@ void draw_links_tb(const scribo::object_groups< image2d<unsigned> >& groups, && (unsigned) abs(p1[0] - p2[0]) < 3 * max_height // Reduced gap && (unsigned) abs(p1[1] - p2[1]) < 20) // Vertical proximity { - draw::line(ima_groups, p1, p2, literal::red); - balance[i] += 1; - break; + unsigned k = 1; + short separators = 0; + + while (k <= hlines.nelements() && separators < 2) + { + const box2d& s = hlines(k).bbox(); + + if (s.pmin()[1] <= b1.pmin()[1] && s.pmax()[1] >= b1.pmax()[1] + && s.pmin()[0] > b1.pmax()[0] + && s.pmax()[0] < b2.pmin()[0]) + ++separators; + + ++k; + } + + if (separators < 2) + { + draw::line(ima_groups, p1, p2, literal::red); + balance[i] += 1; + break; + } } } } @@ -126,10 +146,12 @@ void draw_links_tb(const scribo::object_groups< image2d<unsigned> >& groups, } // Draw vertical links from bottom to top (red) +template<typename L> void draw_links_bt(const scribo::object_groups< image2d<unsigned> >& groups, image2d<value::rgb8>& ima_groups, std::vector<short>& balance, - unsigned average_width) + unsigned average_width, + const scribo::component_set<L>& hlines) { for (unsigned i = groups.nelements(); i > 0; --i) { @@ -155,9 +177,27 @@ void draw_links_bt(const scribo::object_groups< image2d<unsigned> >& groups, && (unsigned) abs(p1[0] - p2[0]) < 3 * max_height // Reduced gap && (unsigned) abs(p1[1] - p2[1]) < 20) // Vertical proximity { - draw::line(ima_groups, p1, p2, literal::red); - balance[i] += 1; - break; + unsigned k = 1; + short separators = 0; + + while (k <= hlines.nelements() && separators < 2) + { + const box2d& s = hlines(k).bbox(); + + if (s.pmin()[1] <= b1.pmin()[1] && s.pmax()[1] >= b1.pmax()[1] + && s.pmax()[0] < b1.pmin()[0] + && s.pmin()[0] > b2.pmax()[0]) + ++separators; + + ++k; + } + + if (separators < 2) + { + draw::line(ima_groups, p1, p2, literal::red); + balance[i] += 1; + break; + } } } } @@ -165,9 +205,11 @@ void draw_links_bt(const scribo::object_groups< image2d<unsigned> >& groups, } // Draw horizontal links from left to right (green) +template<typename L> void draw_links_lr(const scribo::object_groups< image2d<unsigned> >& groups, image2d<value::rgb8>& ima_groups, - std::vector<short>& balance) + std::vector<short>& balance, + const scribo::component_set<L>& vlines) { for (unsigned i = 1; i <= groups.nelements(); ++i) { @@ -186,9 +228,27 @@ void draw_links_lr(const scribo::object_groups< image2d<unsigned> >& groups, || (b1.pmin()[0] > b2.pmin()[0] && b2.pmax()[0] > b1.pmin()[0])) // Boxes are aligned && abs(p1[0] - p2[0]) < 10) // Reduced gap { - draw::line(ima_groups, p1, p2, literal::green); - balance[i] += 1; - break; + unsigned k = 1; + short separators = 0; + + while (k <= vlines.nelements() && separators < 2) + { + const box2d& s = vlines(k).bbox(); + + if (s.pmin()[0] <= b1.pmin()[0] && s.pmax()[0] >= b1.pmax()[0] + && s.pmin()[1] > b1.pmax()[1] + && s.pmax()[1] < b2.pmin()[1]) + ++separators; + + ++k; + } + + if (separators < 2) + { + draw::line(ima_groups, p1, p2, literal::green); + balance[i] += 1; + break; + } } } } @@ -196,9 +256,11 @@ void draw_links_lr(const scribo::object_groups< image2d<unsigned> >& groups, } // Draw horizontal links from right to left (green) +template<typename L> void draw_links_rl(const scribo::object_groups< image2d<unsigned> >& groups, image2d<value::rgb8>& ima_groups, - std::vector<short>& balance) + std::vector<short>& balance, + const scribo::component_set<L>& vlines) { for (unsigned i = groups.nelements(); i > 0; --i) { @@ -217,9 +279,27 @@ void draw_links_rl(const scribo::object_groups< image2d<unsigned> >& groups, || (b1.pmin()[0] > b2.pmin()[0] && b2.pmax()[0] > b1.pmin()[0])) // Boxes are aligned && abs(p1[0] - p2[0]) < 10) // Reduced gap { - draw::line(ima_groups, p1, p2, literal::green); - balance[i] += 1; - break; + unsigned k = 1; + short separators = 0; + + while (k <= vlines.nelements() && separators < 2) + { + const box2d& s = vlines(k).bbox(); + + if (s.pmin()[0] <= b1.pmin()[0] && s.pmax()[0] >= b1.pmax()[0] + && s.pmax()[1] < b1.pmin()[1] + && s.pmin()[1] > b2.pmax()[1]) + ++separators; + + ++k; + } + + if (separators < 2) + { + draw::line(ima_groups, p1, p2, literal::green); + balance[i] += 1; + break; + } } } } @@ -358,12 +438,13 @@ int main(int argc, char** argv) std::vector<short> balance(groups.nelements(), 0); // Draw and count links - draw_links_tb(groups, ima_groups, balance, average_width); - draw_links_bt(groups, ima_groups, balance, average_width); - draw_links_lr(groups, ima_groups, balance); - draw_links_rl(groups, ima_groups, balance); + draw_links_tb(groups, ima_groups, balance, average_width, hlines); + draw_links_bt(groups, ima_groups, balance, average_width, hlines); + draw_links_lr(groups, ima_groups, balance, vlines); + draw_links_rl(groups, ima_groups, balance, vlines); - // Draw weighted boxes (red < orange < cyan < green) (useless ?) + // Draw weighted boxes (red < orange < cyan < green) + // 1 link < 2 links < 3 links < 3+ links for (unsigned i = 0; i < balance.size(); ++i) { if (balance[i] == 1) -- 1.7.2.5

1 0

olena-2.0-424-g4938c8d Small fixes.
by Guillaume Lazzara 22 Mar '13

22 Mar '13

* scribo/binarization/internal/global_max_stddev_functor.hh: Remove reference to mln namespace. * headers.mk, * scribo/tests/unit_test/unit-tests.mk: Regen. --- scribo/ChangeLog | 10 ++++++++++ scribo/headers.mk | 1 + .../internal/global_max_stddev_functor.hh | 6 ++---- scribo/tests/unit_test/unit-tests.mk | 1 + 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index bc93c4f..97b0179 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -2,6 +2,16 @@ Small fixes. + * scribo/binarization/internal/global_max_stddev_functor.hh: + Remove reference to mln namespace. + + * headers.mk, + * scribo/tests/unit_test/unit-tests.mk: Regen. + +2013-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + Small fixes. + * scribo/binarization/all.hh: Add missing includes. * scribo/binarization/internal/niblack_threshold_functor.hh, diff --git a/scribo/headers.mk b/scribo/headers.mk index 10aaa60..e360703 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -5,6 +5,7 @@ scribo/all.hh \ scribo/binarization/all.hh \ scribo/binarization/global_threshold.hh \ scribo/binarization/global_threshold_auto.hh \ +scribo/binarization/internal/global_max_stddev_functor.hh \ scribo/binarization/internal/local_threshold_core.hh \ scribo/binarization/internal/local_threshold_debug.hh \ scribo/binarization/internal/niblack_formula.hh \ diff --git a/scribo/scribo/binarization/internal/global_max_stddev_functor.hh b/scribo/scribo/binarization/internal/global_max_stddev_functor.hh index e10b77d..de6e91b 100644 --- a/scribo/scribo/binarization/internal/global_max_stddev_functor.hh +++ b/scribo/scribo/binarization/internal/global_max_stddev_functor.hh @@ -28,7 +28,8 @@ /// \file /// -/// +/// \brief Functor computing the maximum standard deviation during an +/// integral image browsing. namespace scribo @@ -37,9 +38,6 @@ namespace scribo namespace binarization { - using namespace mln; - - namespace internal { diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index ec86dde..0484b75 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -186,6 +186,7 @@ scribo_all \ scribo_binarization_all \ scribo_binarization_global_threshold \ scribo_binarization_global_threshold_auto \ +scribo_binarization_internal_global_max_stddev_functor \ scribo_binarization_internal_local_threshold_core \ scribo_binarization_internal_local_threshold_debug \ scribo_binarization_internal_niblack_formula \ -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-424-g275b60f
by git＠lrde.epita.fr 22 Mar '13

22 Mar '13

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 unstable/scribo has been updated via 275b60f548221f4df2457804b2211065d45fec13 (commit) from 1a432a30f9344628f2082772d29ac4b8f03a0cd3 (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 ----------------------------------------------------------------- 275b60f Small fixes. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 9 +++++++++ scribo/headers.mk | 1 + .../internal/global_max_stddev_functor.hh | 6 ++---- scribo/tests/unit_test/unit-tests.mk | 1 + 4 files changed, 13 insertions(+), 4 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-424-g275b60f Small fixes.
by Guillaume Lazzara 22 Mar '13

22 Mar '13

* scribo/binarization/internal/global_max_stddev_functor.hh: Remove reference to mln namespace. * headers.mk, * scribo/tests/unit_test/unit-tests.mk: Regen. --- scribo/ChangeLog | 9 +++++++++ scribo/headers.mk | 1 + .../internal/global_max_stddev_functor.hh | 6 ++---- scribo/tests/unit_test/unit-tests.mk | 1 + 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index bc93c4f..2434924 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -2,6 +2,15 @@ Small fixes. + * scribo/binarization/internal/global_max_stddev_functor.hh: + Remove reference to mln namespace. + + * headers.mk: Regen. + +2013-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + Small fixes. + * scribo/binarization/all.hh: Add missing includes. * scribo/binarization/internal/niblack_threshold_functor.hh, diff --git a/scribo/headers.mk b/scribo/headers.mk index 10aaa60..e360703 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -5,6 +5,7 @@ scribo/all.hh \ scribo/binarization/all.hh \ scribo/binarization/global_threshold.hh \ scribo/binarization/global_threshold_auto.hh \ +scribo/binarization/internal/global_max_stddev_functor.hh \ scribo/binarization/internal/local_threshold_core.hh \ scribo/binarization/internal/local_threshold_debug.hh \ scribo/binarization/internal/niblack_formula.hh \ diff --git a/scribo/scribo/binarization/internal/global_max_stddev_functor.hh b/scribo/scribo/binarization/internal/global_max_stddev_functor.hh index e10b77d..de6e91b 100644 --- a/scribo/scribo/binarization/internal/global_max_stddev_functor.hh +++ b/scribo/scribo/binarization/internal/global_max_stddev_functor.hh @@ -28,7 +28,8 @@ /// \file /// -/// +/// \brief Functor computing the maximum standard deviation during an +/// integral image browsing. namespace scribo @@ -37,9 +38,6 @@ namespace scribo namespace binarization { - using namespace mln; - - namespace internal { diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index ec86dde..0484b75 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -186,6 +186,7 @@ scribo_all \ scribo_binarization_all \ scribo_binarization_global_threshold \ scribo_binarization_global_threshold_auto \ +scribo_binarization_internal_global_max_stddev_functor \ scribo_binarization_internal_local_threshold_core \ scribo_binarization_internal_local_threshold_debug \ scribo_binarization_internal_niblack_formula \ -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-423-g1a432a3
by git＠lrde.epita.fr 22 Mar '13

22 Mar '13

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 unstable/scribo has been updated via 1a432a30f9344628f2082772d29ac4b8f03a0cd3 (commit) via 27abe98ff8779d1e01e11c55f740b079f69b3c35 (commit) from e5b58eb213b3a88a2be6934e9e8f1e3e55d8bd64 (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 ----------------------------------------------------------------- 1a432a3 Small fixes. 27abe98 Share a functor used in Wolf's binarization. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 19 ++++ scribo/scribo/binarization/all.hh | 6 ++ ...olf_formula.hh => global_max_stddev_functor.hh} | 89 ++++++++++++-------- .../internal/niblack_threshold_functor.hh | 6 +- .../internal/sauvola_threshold_functor.hh | 8 +- scribo/scribo/binarization/wolf.hh | 38 +-------- scribo/scribo/binarization/wolf_fast.hh | 38 +-------- 7 files changed, 89 insertions(+), 115 deletions(-) copy scribo/scribo/binarization/internal/{wolf_formula.hh => global_max_stddev_functor.hh} (54%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-423-g1a432a3 Small fixes.
by Guillaume Lazzara 22 Mar '13

22 Mar '13

* scribo/binarization/all.hh: Add missing includes. * scribo/binarization/internal/niblack_threshold_functor.hh, * scribo/binarization/internal/sauvola_threshold_functor.hh: Add input image as attribute. --- scribo/ChangeLog | 10 ++++++++++ scribo/scribo/binarization/all.hh | 6 ++++++ .../internal/niblack_threshold_functor.hh | 6 ++++-- .../internal/sauvola_threshold_functor.hh | 8 +++++--- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1fd80aa..bc93c4f 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2013-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes. + + * scribo/binarization/all.hh: Add missing includes. + + * scribo/binarization/internal/niblack_threshold_functor.hh, + * scribo/binarization/internal/sauvola_threshold_functor.hh: Add + input image as attribute. + +2013-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + Share a functor used in Wolf's binarization. * scribo/binarization/internal/global_max_stddev_functor.hh: New. diff --git a/scribo/scribo/binarization/all.hh b/scribo/scribo/binarization/all.hh index d05f996..ef45487 100644 --- a/scribo/scribo/binarization/all.hh +++ b/scribo/scribo/binarization/all.hh @@ -51,14 +51,20 @@ namespace scribo # include <scribo/binarization/local_threshold.hh> # include <scribo/binarization/niblack.hh> +# include <scribo/binarization/niblack_fast.hh> +# include <scribo/binarization/niblack_threshold.hh> # include <scribo/binarization/otsu.hh> +# include <scribo/binarization/otsu_threshold.hh> # include <scribo/binarization/sauvola.hh> # include <scribo/binarization/sauvola_ms.hh> # include <scribo/binarization/sauvola_ms_split.hh> # include <scribo/binarization/sauvola_threshold.hh> +# include <scribo/binarization/singh.hh> + # include <scribo/binarization/wolf.hh> +# include <scribo/binarization/wolf_fast.hh> #endif // ! SCRIBO_BINARIZATION_ALL_HH diff --git a/scribo/scribo/binarization/internal/niblack_threshold_functor.hh b/scribo/scribo/binarization/internal/niblack_threshold_functor.hh index d26d733..621ccd8 100644 --- a/scribo/scribo/binarization/internal/niblack_threshold_functor.hh +++ b/scribo/scribo/binarization/internal/niblack_threshold_functor.hh @@ -77,6 +77,7 @@ namespace scribo typedef mln_concrete(I) th_t; th_t output; + mln_concrete(I) input; mln_value(I)* po; @@ -94,9 +95,10 @@ namespace scribo template <typename I> niblack_threshold_functor::niblack_threshold_functor(const Image& input_, double K) - : K_(K) + : input(input_), + K_(K) { - mln_precondition(exact(input).is_valid()); + mln_precondition(exact(input_).is_valid()); mln_precondition(K > 0.); } diff --git a/scribo/scribo/binarization/internal/sauvola_threshold_functor.hh b/scribo/scribo/binarization/internal/sauvola_threshold_functor.hh index 19b7bf3..bea9d14 100644 --- a/scribo/scribo/binarization/internal/sauvola_threshold_functor.hh +++ b/scribo/scribo/binarization/internal/sauvola_threshold_functor.hh @@ -66,7 +66,7 @@ namespace scribo sauvola_threshold_functor(const Image& input, double K, double R); - init(); + void init(); // Run every 4 pixels. void exec(double mean, double stddev); @@ -77,6 +77,7 @@ namespace scribo typedef mln_concrete(I) th_t; th_t output; + mln_concrete(I) input; mln_value(I)* po; @@ -93,9 +94,10 @@ namespace scribo #ifndef MLN_INCLUDE_ONLY template <typename I> - sauvola_threshold_functor::sauvola_threshold_functor(const Image& input_, + sauvola_threshold_functor::sauvola_threshold_functor(const Image& input, double K, double R) - : K_(K), + : input(input), + K_(K), R_(R) { mln_precondition(exact(input).is_valid()); -- 1.7.2.5

1 0