August 2012 - Olena-patches

olena-2.0-110-gf6ef68f Add a default verbose mode in debug::logger.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

* scribo/debug/logger.hh: Here. --- scribo/ChangeLog | 6 ++++++ scribo/scribo/debug/logger.hh | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f70d0cc..61e6c7e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,11 @@ 2012-05-11 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a default verbose mode in debug::logger. + + * scribo/debug/logger.hh: Here. + +2012-05-11 Guillaume Lazzara <z(a)lrde.epita.fr> + Make use of logger features. * scribo/binarization/internal/local_threshold_core.hh, diff --git a/scribo/scribo/debug/logger.hh b/scribo/scribo/debug/logger.hh index 5822cf3..cac2770 100644 --- a/scribo/scribo/debug/logger.hh +++ b/scribo/scribo/debug/logger.hh @@ -101,6 +101,13 @@ namespace scribo bool is_verbose() const; bool is_at_verbose_mode(VerboseMode mode) const; + /// The default verbose mode used while logging with + /// #operator<<. + bool set_default_verbose_mode(VerboseMode mode); + VerboseMode default_verbose_mode() const; + + /// Set the current verbose mode, filtering the debug output + /// logged through this object. bool set_verbose_mode(VerboseMode mode); VerboseMode verbose_mode() const; @@ -194,6 +201,7 @@ namespace scribo Level level_; VerboseMode verbose_mode_; + VerboseMode default_verbose_mode_; std::string verbose_prefix_; std::ostream& stream_; @@ -234,6 +242,7 @@ namespace scribo logger_::logger_() : level_(None), verbose_mode_(Mute), + default_verbose_mode_(Low), stream_(std::cerr), verbose_prefix_("LOG: ") { @@ -267,6 +276,27 @@ namespace scribo inline bool + logger_::set_default_verbose_mode(VerboseMode mode) + { + if (mode != Invalid) + { + default_verbose_mode_ = mode; + return true; + } + return false; + } + + + inline + VerboseMode + logger_::default_verbose_mode() const + { + return default_verbose_mode_; + } + + + inline + bool logger_::set_verbose_mode(VerboseMode mode) { if (mode != Invalid) @@ -475,7 +505,7 @@ namespace scribo logger_& logger_::operator<<(const V& v) { - if (verbose_mode_ >= Low) + if (verbose_mode_ >= default_verbose_mode_) stream_ << v; return *this; } @@ -484,7 +514,7 @@ namespace scribo logger_& logger_::operator<<(std::ostream& (*f)(std::ostream&)) { - if (verbose_mode_ >= Low) + if (verbose_mode_ >= default_verbose_mode_) f(stream_); return *this; } -- 1.7.2.5

1 0

olena-2.0-109-g75b5aa1 Make use of logger features.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

* scribo/binarization/internal/local_threshold_core.hh, * scribo/binarization/internal/sauvola_formula.hh, * scribo/binarization/sauvola_ms.hh: Make use of operator<< with debug::logger. --- scribo/ChangeLog | 9 ++++ .../binarization/internal/local_threshold_core.hh | 16 +++---- .../binarization/internal/sauvola_formula.hh | 18 +-------- scribo/scribo/binarization/sauvola_ms.hh | 40 +++++++++----------- 4 files changed, 36 insertions(+), 47 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 114ec97..f70d0cc 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,12 @@ +2012-05-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + Make use of logger features. + + * scribo/binarization/internal/local_threshold_core.hh, + * scribo/binarization/internal/sauvola_formula.hh, + * scribo/binarization/sauvola_ms.hh: Make use of operator<< with + debug::logger. + 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> * src/binarization/sauvola_ms.cc: Fix options handling. diff --git a/scribo/scribo/binarization/internal/local_threshold_core.hh b/scribo/scribo/binarization/internal/local_threshold_core.hh index 7979da3..7589499 100644 --- a/scribo/scribo/binarization/internal/local_threshold_core.hh +++ b/scribo/scribo/binarization/internal/local_threshold_core.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -51,7 +52,6 @@ # include <mln/debug/filename.hh> # endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG -# include <mln/util/timer.hh> namespace scribo { @@ -122,8 +122,7 @@ namespace scribo trace::entering("scribo::binarization::internal::impl::generic::local_threshold_core"); mln_precondition(exact(input).is_valid()); - mln::util::timer t; - t.start(); + scribo::debug::logger().start_local_time_logging(); // Make sure the image sizes are a multiple of 3 in each // dimension. (browsing while binarizing relies on that @@ -140,8 +139,7 @@ namespace scribo sub_domains[2].first(), sub_domains[2].second()); - t.stop(); - std::cout << "image integrale - " << t << std::endl; + scribo::debug::logger().stop_local_time_logging("image integrale -"); # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG initialize(internal::debug_mean, input); @@ -152,7 +150,7 @@ namespace scribo initialize(internal::debug_alphacond, input); # endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG - t.restart(); + scribo::debug::logger().start_local_time_logging(); window_size /= 3; if (window_size % 2) @@ -162,8 +160,8 @@ namespace scribo scribo::canvas::integral_browsing(integral, 1, window_size, window_size, 3, f); - t.stop(); - std::cout << "Binarization - " << t << std::endl; + + scribo::debug::logger().stop_local_time_logging("Binarization -"); trace::exiting("scribo::binarization::internal::impl::generic::local_threshold_core"); } diff --git a/scribo/scribo/binarization/internal/sauvola_formula.hh b/scribo/scribo/binarization/internal/sauvola_formula.hh index a06d6f9..005c034 100644 --- a/scribo/scribo/binarization/internal/sauvola_formula.hh +++ b/scribo/scribo/binarization/internal/sauvola_formula.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -48,8 +49,6 @@ #include <mln/core/alias/point2d.hh> -// extern mln::image2d<bool> skewness_pbm; - namespace scribo { @@ -89,25 +88,12 @@ namespace scribo # ifndef MLN_INCLUDE_ONLY - // bool b; - // double skewness_; - inline double sauvola_formula::operator()(const double m_x_y, const double s_x_y, const double K, const double R) const { - // if (b) - // std::cout << skewness_ << " - " << (K * -1 * skewness_) << std::endl; - // volatile double new_t = ((skewness_ < 0) ? -skewness_ : 1 * m_x_y * (1.0 + K * ((s_x_y / R) - 1.0))); - // volatile double old_t = (m_x_y * (1.0 + K * ((s_x_y / R) - 1.0))); - // if (skewness_ > 0) - // if (new_t != old_t) - // std::cout << skewness_ << " - " << new_t << " vs " << old_t << std::endl; - // if (skewness_pbm(p)) return m_x_y * (1.0 + K * ((s_x_y / R) - 1.0)); - // else - // return (255 - m_x_y) * (1.0 + K * ((s_x_y / R) - 1.0)); } inline diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index 3d04629..b1e8144 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -78,7 +78,6 @@ # include <mln/accu/math/count.hh> # endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG -# include <mln/util/timer.hh> namespace scribo { @@ -838,8 +837,7 @@ namespace scribo typedef image2d<mln::util::couple<double,double> > integral_t; // integral_t integral_sum_sum_2; - mln::util::timer t; - t.start(); + scribo::debug::logger().start_local_time_logging(); // Subsampling from scale 1 to 2. { @@ -852,9 +850,8 @@ namespace scribo sub_ima.append(fi.sub); } - t.stop(); - std::cout << "1. subsampling and integral - " << t << std::endl; - t.restart(); + scribo::debug::logger().stop_local_time_logging("1. subsampling and integral -"); + scribo::debug::logger().start_local_time_logging(); // Subsampling to scale 3 and 4. // @@ -865,9 +862,8 @@ namespace scribo sub_domains[i].first(), sub_domains[i].second())); - t.stop(); - std::cout << "2. More subsampling - " << t << std::endl; - t.restart(); + scribo::debug::logger().stop_local_time_logging("2. More subsampling -"); + scribo::debug::logger().start_local_time_logging(); // Compute threshold images. image2d<int_u8> e_2; @@ -951,9 +947,8 @@ namespace scribo K); } - t.stop(); - std::cout << "3. Multi-scale processing - " << t << std::endl; - t.restart(); + scribo::debug::logger().stop_local_time_logging("3. Multi-scale processing -"); + scribo::debug::logger().start_local_time_logging(); # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG @@ -965,9 +960,8 @@ namespace scribo // Propagate scale values. e_2 = transform::influence_zone_geodesic(e_2, c8()); - t.stop(); - std::cout << "4. Influence Zone on Scale image - " << t << std::endl; - t.restart(); + scribo::debug::logger().stop_local_time_logging("4. Influence Zone on Scale image -"); + scribo::debug::logger().start_local_time_logging(); # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG @@ -980,10 +974,13 @@ namespace scribo mln::util::array<unsigned> count = labeling::compute(accu::meta::math::count(), e_2, 4); unsigned npixels = e_2.domain().nsites(); - std::cout << "Scale ratios: 2 (" << count[2] / (float)npixels * 100 - << ") - 3 (" << count[3] / (float)npixels * 100 - << ") - 4 (" << count[4] / (float)npixels * 100 << ")" - << std::endl; + scribo::debug::logger() << "Scale ratios: 2 (" + << count[2] / (float)npixels * 100 + << ") - 3 (" + << count[3] / (float)npixels * 100 + << ") - 4 (" + << count[4] / (float)npixels * 100 << ")" + << std::endl; if (internal::scale_proba_output) io::dump::save(internal::debug_scale_proba, @@ -994,9 +991,8 @@ namespace scribo image2d<bool> output = internal::multi_scale_binarization(input_1, e_2, t_ima, s); - t.stop(); - std::cout << "5. Final binarization - " << t << std::endl; - t.restart(); + scribo::debug::logger().stop_local_time_logging("5. Final binarization -"); + scribo::debug::logger().start_local_time_logging(); trace::exiting("scribo::binarization::sauvola_ms"); return output; -- 1.7.2.5

1 0

branch papers/IJDAR/sauvola_ms deleted: olena-2.0-118-g0cd712a
by git＠lrde.epita.fr 23 Aug '12

23 Aug '12

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 papers/IJDAR/sauvola_ms has been deleted was 0cd712af56c473412a3065c7f03385b626f00224 ----------------------------------------------------------------------- 0cd712af56c473412a3065c7f03385b626f00224 Add Singh algorithm. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch papers/lazzara.12.ijdar created: olena-2.0-128-g9a4c370
by git＠lrde.epita.fr 23 Aug '12

23 Aug '12

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 papers/lazzara.12.ijdar has been created at 9a4c370d70d77e55335f0edd439ba05ed1b48cc2 (commit) - Log ----------------------------------------------------------------- 9a4c370 tests/unit_test/unit-tests.mk: Regen. 2259dac tests/unit_test/unit-tests.mk: Regen. 82e9a80 Add Singh algorithm. c0d74f7 Make the area value depends on the first scale ratio. 73e6122 Fix invalid default options. 9e462d2 Provide original algorithms without approximations. 7c295e9 scribo/binarization/all.hh: Add more includes. ae6ece0 scribo/binarization/otsu.hh: Fix namespace ambiguities. 83730f3 mln/fun/x2x/rotation.hh: Remove alpha and axis attributes. cb5fd5a mln/registration/icp.hh: Cleanup some debug. e3a68da mln/geom/rotate.hh: Add support for n-D images. 3e10eb3 mln/algebra/mat.hh: Add implementations for 4x4 matrices. d9daf6a New routines to get bottom left and top right sites. d9deb1a Improve conversion between algebra::h_mat and algebra::quat. 2622f3b Rely on Argument-Dependent Lookup (ADL) in from_to_ overloads. fa8caca demos/graph/region_adjacency_graph.cc: Add program arguments. 0489364 Small fixes in Scribo. db78cd2 Add a better support for different k values in Sauvola Multiscale. f6ef68f Add a default verbose mode in debug::logger. 75b5aa1 Make use of logger features. 21b5c2a src/binarization/sauvola_ms.cc: Fix options handling. 31d6726 Fix call to sauvola_ms. 56f4535 Make use of new logger features. 63becd7 Cleanup Kim's binarization. cd9f3d8 Make integral browsing canvas robust to large windows. 5cb4a2b Several small fixes. 1e63053 mln/core/internal/image_base.hh: Improve documentation. 0438f42 Improve documentation. af5fd92 src/binarization/kim.cc: Remove debug and useless steps. d4afa3d src/binarization/kim.cc: New binarization algorithm. 7e6b2a1 Introduce a verbose mode. 44961f4 Improve Sauvola. e5f272e Add Wolf's binarization algorithm. c2ba610 New tools. d9cc1c4 Add more debug. 6e6efc3 scribo/binarization/sauvola_ms.hh: Change area thresholds. 67384e8 scribo/binarization/sauvola_ms.hh: More fixes in debug. fb0ed41 scribo/binarization/internal/sauvola_ms_functor.hh: Use C8 neighborhood for labeling. 50b0efa scribo/binarization/sauvola_ms.hh: More fixes in debug. 83ee60c Fix warning in Otsu related files. 4218334 Fix and improve sauvola_ms debug. 31b45b4 Fix invalid line offset due to input image size. b76254b Fix binarization tests. a0a8f63 Revamp *_threshold functions. 0e2a2c0 Refactor local threshold binarization algorithms. a839009 sauvola_fast.cc: Cleanup and add some debug. d1a7a06 sauvola_fast.cc: Use subscaled integral image. ec1cc0b sauvola_fast.cc: Fix bugs. Stable version. b1d52c9 sauvola_fast.cc: New implementation. a8f83ef z/sauvola_ms_rv/dump_color_sign.cc: New. 664d9d7 Add test images. e375d14 z/sauvola_ms_rv/skewness/skewness2.cc: Retrieve skewness debug image. a987daa scribo/binarization/sauvola_threshold.hh: Add some debug. b09fb77 z/sauvola_ms_rv/skewness/skewness2.cc: Fix calls to sauvola. 9be09ea Compute Sauvola on documents with light text and dark background. 241d1ff Add new tools. a07c8c6 Rename skewness directory and share code between implementations. d984d2d z/skewness/skewness2.cc: New. b90f28d mln/data/compute_in_window.hh: Fix warnings. 9a65533 z/skewness/skewness.cc: New. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-108-g21b5c2a src/binarization/sauvola_ms.cc: Fix options handling.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

--- scribo/ChangeLog | 4 +++ scribo/src/binarization/sauvola_ms.cc | 34 +++++++++++++++++--------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 50431e3..114ec97 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/binarization/sauvola_ms.cc: Fix options handling. + +2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix call to sauvola_ms. * scribo/binarization/sauvola_ms.hh, diff --git a/scribo/src/binarization/sauvola_ms.cc b/scribo/src/binarization/sauvola_ms.cc index c5ab3e4..685337c 100644 --- a/scribo/src/binarization/sauvola_ms.cc +++ b/scribo/src/binarization/sauvola_ms.cc @@ -60,12 +60,12 @@ static const scribo::debug::opt_data opt_desc[] = // name, description, arguments, check args function, number of args, default arg { "debug-prefix", "Enable debug image outputs. Prefix image name with that " "given prefix.", "<prefix>", 0, 1, 0 }, - { "k", "Sauvola's formulae parameter. Set it globally for all scales.", + { "all-k", "Sauvola's formulae parameter. Set it globally for all scales.", "<value>", 0, 1, "0.34" }, - { "k2", "Sauvola's formulae parameter", "<value>", 0, 1, "0.20" }, - { "k3", "Sauvola's formulae parameter", "<value>", 0, 1, "0.30" }, - { "k4", "Sauvola's formulae parameter", "<value>", 0, 1, "0.50" }, + { "k2", "Force Sauvola's formulae parameter value for scale 2", "<value>", 0, 1, 0 }, + { "k3", "Force Sauvola's formulae parameter value for scale 3", "<value>", 0, 1, 0 }, + { "k4", "Force Sauvola's formulae parameter value for scale 4", "<value>", 0, 1, 0 }, { "s", "First subsampling ratio. Possible values: 2 or 3.", "ratio", @@ -107,24 +107,26 @@ int main(int argc, char *argv[]) unsigned w_1 = atoi(options.opt_value("win-size").c_str()); // First subsampling scale. unsigned s = atoi(options.opt_value("s").c_str()); - double k = atof(options.opt_value("k").c_str()); - if (options.is_set("k")) - { - binarization::internal::k2 = k; - binarization::internal::k3 = k; - binarization::internal::k4 = k; - } - else - { + // Setting k parameter. + double k = atof(options.opt_value("all-k").c_str()); + binarization::internal::k2 = k; + binarization::internal::k3 = k; + binarization::internal::k4 = k; + + // Override k parameter for specific scales. + if (options.is_set("k2")) binarization::internal::k2 = atof(options.opt_value("k2").c_str()); + if (options.is_set("k3")) binarization::internal::k3 = atof(options.opt_value("k3").c_str()); + if (options.is_set("k4")) binarization::internal::k4 = atof(options.opt_value("k4").c_str()); - } scribo::debug::logger() << "Using w_1=" << w_1 << " - s=" << s - << " - k=" << k << std::endl; - + << " - k2=" << binarization::internal::k2 + << " - k3=" << binarization::internal::k3 + << " - k4=" << binarization::internal::k4 + << std::endl; // Load -- 1.7.2.5

1 0

olena-2.0-107-g31d6726 Fix call to sauvola_ms.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

* scribo/binarization/sauvola_ms.hh, * scribo/binarization/sauvola_ms_split.hh: Here. --- scribo/ChangeLog | 7 +++++++ scribo/scribo/binarization/sauvola_ms.hh | 4 ++-- scribo/scribo/binarization/sauvola_ms_split.hh | 6 +++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 521ad29..50431e3 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix call to sauvola_ms. + + * scribo/binarization/sauvola_ms.hh, + * scribo/binarization/sauvola_ms_split.hh: Here. + +2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + Make use of new logger features. * src/binarization/global_threshold.cc, diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index 5f0f963..3d04629 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -1047,7 +1047,7 @@ namespace scribo integral_t integral_sum_sum_2; mln_ch_value(I,bool) - output = sauvola_ms(exact(input_1_), w_1, s, K, integral_sum_sum_2); + output = sauvola_ms(input_1_, w_1, s, K, integral_sum_sum_2); trace::exiting("scribo::binarization::sauvola_ms"); return output; diff --git a/scribo/scribo/binarization/sauvola_ms_split.hh b/scribo/scribo/binarization/sauvola_ms_split.hh index cbef524..ff16a4e 100644 --- a/scribo/scribo/binarization/sauvola_ms_split.hh +++ b/scribo/scribo/binarization/sauvola_ms_split.hh @@ -107,9 +107,9 @@ namespace scribo bin_t r_b, g_b, b_b; - r_b = impl::generic::sauvola_ms(r_i, w_1, s, K); - g_b = impl::generic::sauvola_ms(g_i, w_1, s, K); - b_b = impl::generic::sauvola_ms(b_i, w_1, s, K); + r_b = sauvola_ms(r_i, w_1, s, K); + g_b = sauvola_ms(g_i, w_1, s, K); + b_b = sauvola_ms(b_i, w_1, s, K); border::resize(r_b, input_1.border()); border::resize(g_b, input_1.border()); -- 1.7.2.5

1 0

olena-2.0-106-g56f4535 Make use of new logger features.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

* src/binarization/global_threshold.cc, * src/binarization/kim.cc, * src/binarization/niblack.cc, * src/binarization/otsu.cc, * src/binarization/sauvola.cc, * src/binarization/sauvola_ms.cc, * src/binarization/sauvola_ms_debug.cc, * src/binarization/sauvola_ms_fg.cc, * src/binarization/sauvola_ms_split.cc, * src/binarization/wolf.cc: Make use of operator<<. --- scribo/ChangeLog | 15 +++++++++++++++ scribo/src/binarization/global_threshold.cc | 10 +++++----- scribo/src/binarization/kim.cc | 13 +++++-------- scribo/src/binarization/niblack.cc | 10 +++++----- scribo/src/binarization/otsu.cc | 9 ++++----- scribo/src/binarization/sauvola.cc | 18 ++++++------------ scribo/src/binarization/sauvola_ms.cc | 21 ++++++++------------- scribo/src/binarization/sauvola_ms_debug.cc | 20 +++++++------------- scribo/src/binarization/sauvola_ms_fg.cc | 11 +++++------ scribo/src/binarization/sauvola_ms_split.cc | 15 ++++++--------- scribo/src/binarization/wolf.cc | 9 ++++----- 11 files changed, 70 insertions(+), 81 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index fc9ff14..521ad29 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,20 @@ 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + Make use of new logger features. + + * src/binarization/global_threshold.cc, + * src/binarization/kim.cc, + * src/binarization/niblack.cc, + * src/binarization/otsu.cc, + * src/binarization/sauvola.cc, + * src/binarization/sauvola_ms.cc, + * src/binarization/sauvola_ms_debug.cc, + * src/binarization/sauvola_ms_fg.cc, + * src/binarization/sauvola_ms_split.cc, + * src/binarization/wolf.cc: Make use of operator<<. + +2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + Cleanup Kim's binarization. * src/binarization/kim.cc: Move code... diff --git a/scribo/src/binarization/global_threshold.cc b/scribo/src/binarization/global_threshold.cc index 276ec2e..eaf11c7 100644 --- a/scribo/src/binarization/global_threshold.cc +++ b/scribo/src/binarization/global_threshold.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -57,7 +58,8 @@ static const scribo::debug::opt_data opt_desc[] = // name, description, arguments, check args function, number of args, default arg { "debug-prefix", "Enable debug image outputs. Prefix image name with that " "given prefix.", "<prefix>", 0, 1, 0 }, - { "verbose", "Enable verbose mode", 0, 0, 0, 0 }, + { "verbose", "Enable verbose mode (mute, time, low, medium, full)", + "<mode>", scribo::debug::check_verbose_mode, 1, "mute" }, {0, 0, 0, 0, 0, 0} }; @@ -83,11 +85,9 @@ int main(int argc, char *argv[]) trace::entering("main"); - bool verbose = options.is_set("verbose"); unsigned threshold = atoi(options.arg("threshold_value")); - if (verbose) - std::cout << "Using threshold=" << threshold << std::endl; + scribo::debug::logger() << "Using threshold=" << threshold << std::endl; image2d<value::rgb8> input; io::magick::load(input, options.arg("input.*")); diff --git a/scribo/src/binarization/kim.cc b/scribo/src/binarization/kim.cc index 9f9c38f..0a064d8 100644 --- a/scribo/src/binarization/kim.cc +++ b/scribo/src/binarization/kim.cc @@ -59,7 +59,8 @@ static const scribo::debug::opt_data opt_desc[] = { "debug-prefix", "Enable debug image outputs. Prefix image name with that " "given prefix.", "<prefix>", 0, 1, 0 }, { "k", "Sauvola's formulae parameter", "<value>", 0, 1, "0.34" }, - { "verbose", "Enable verbose mode", 0, 0, 0, 0 }, + { "verbose", "Enable verbose mode (mute, time, low, medium, full)", + "<mode>", scribo::debug::check_verbose_mode, 1, "mute" }, { "win-size", "Window size at scale 1", "<size>", 0, 1, "101" }, {0, 0, 0, 0, 0, 0} }; @@ -90,13 +91,9 @@ int main(int argc, char *argv[]) unsigned w_1 = atoi(options.opt_value("win-size").c_str()); double k = atof(options.opt_value("k").c_str()); - if (options.is_set("verbose")) - { - scribo::debug::logger().set_verbose_mode( - scribo::debug::txt_to_verbose_mode(options.opt_value("verbose"))); - scribo::debug::logger().log(Low, std::string("Using w_1=") + w_1 - + std::string(" - k=") + k); - } + scribo::debug::logger() << "Using w_1=" << w_1 + << " - k=" << k << std::endl; + // Load image2d<value::rgb8> input_1; diff --git a/scribo/src/binarization/niblack.cc b/scribo/src/binarization/niblack.cc index 58074fc..7c14c45 100644 --- a/scribo/src/binarization/niblack.cc +++ b/scribo/src/binarization/niblack.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -59,7 +60,8 @@ static const scribo::debug::opt_data opt_desc[] = { "debug-prefix", "Enable debug image outputs. Prefix image name with that " "given prefix.", "<prefix>", 0, 1, 0 }, { "k", "Niblack's formulae parameter", "<value>", 0, 1, "-0.2" }, - { "verbose", "Enable verbose mode", 0, 0, 0, 0 }, + { "verbose", "Enable verbose mode (mute, time, low, medium, full)", + "<mode>", scribo::debug::check_verbose_mode, 1, "mute" }, { "win-size", "Window size", "<size>", 0, 1, "101" }, {0, 0, 0, 0, 0, 0} }; @@ -86,12 +88,10 @@ int main(int argc, char *argv[]) trace::entering("main"); - bool verbose = options.is_set("verbose"); unsigned w = atoi(options.opt_value("win-size").c_str()); double k = atof(options.opt_value("k").c_str()); - if (verbose) - std::cout << "Using w=" << w << " and k=" << k << std::endl; + scribo::debug::logger() << "Using w=" << w << " and k=" << k << std::endl; image2d<value::rgb8> input; io::magick::load(input, options.arg("input.*")); diff --git a/scribo/src/binarization/otsu.cc b/scribo/src/binarization/otsu.cc index eb60973..dcdae1d 100644 --- a/scribo/src/binarization/otsu.cc +++ b/scribo/src/binarization/otsu.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -60,7 +61,8 @@ static const scribo::debug::opt_data opt_desc[] = // name, description, arguments, check args function, number of args, default arg { "debug-prefix", "Enable debug image outputs. Prefix image name with that " "given prefix.", "<prefix>", 0, 1, 0 }, - { "verbose", "Enable verbose mode", 0, 0, 0, 0 }, + { "verbose", "Enable verbose mode (mute, time, low, medium, full)", + "<mode>", scribo::debug::check_verbose_mode, 1, "mute" }, {0, 0, 0, 0, 0, 0} }; @@ -86,9 +88,6 @@ int main(int argc, char *argv[]) trace::entering("main"); - bool verbose = options.is_set("verbose"); - (void) verbose; - image2d<value::rgb8> input; io::magick::load(input, options.arg("input.*")); diff --git a/scribo/src/binarization/sauvola.cc b/scribo/src/binarization/sauvola.cc index 6ea224c..3549585 100644 --- a/scribo/src/binarization/sauvola.cc +++ b/scribo/src/binarization/sauvola.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -58,7 +58,8 @@ static const scribo::debug::opt_data opt_desc[] = { "debug-prefix", "Enable debug image outputs. Prefix image name with that " "given prefix.", "<prefix>", 0, 1, 0 }, { "k", "Sauvola's formulae parameter", "<value>", 0, 1, "0.34" }, - { "verbose", "Enable verbose mode", 0, 0, 0, 0 }, + { "verbose", "Enable verbose mode (mute, time, low, medium, full)", + "<mode>", scribo::debug::check_verbose_mode, 1, "mute" }, { "win-size", "Window size", "<size>", 0, 1, "101" }, {0, 0, 0, 0, 0, 0} }; @@ -85,12 +86,10 @@ int main(int argc, char *argv[]) trace::entering("main"); - bool verbose = options.is_set("verbose"); unsigned w = atoi(options.opt_value("win-size").c_str()); double k = atof(options.opt_value("k").c_str()); - if (verbose) - std::cout << "Using w=" << w << " and k=" << k << std::endl; + scribo::debug::logger() << "Using w=" << w << " and k=" << k << std::endl; image2d<value::rgb8> input; io::magick::load(input, options.arg("input.*")); @@ -99,17 +98,12 @@ int main(int argc, char *argv[]) image2d<value::int_u8> input_1_gl = data::transform(input, mln::fun::v2v::rgb_to_luma<value::int_u8>()); - mln::util::timer t; - t.start(); + scribo::debug::logger().start_local_time_logging(); // Binarize image2d<bool> out = scribo::binarization::sauvola(input_1_gl, w, k); - if (verbose) - { - t.stop(); - std::cout << "binarized in " << t << "s" << std::endl; - } + scribo::debug::logger().stop_local_time_logging("Binarized in"); io::pbm::save(out, options.arg("output.pbm")); diff --git a/scribo/src/binarization/sauvola_ms.cc b/scribo/src/binarization/sauvola_ms.cc index d07de72..c5ab3e4 100644 --- a/scribo/src/binarization/sauvola_ms.cc +++ b/scribo/src/binarization/sauvola_ms.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -70,7 +70,8 @@ static const scribo::debug::opt_data opt_desc[] = { "s", "First subsampling ratio. Possible values: 2 or 3.", "ratio", scribo::debug::check_sauvola_first_subsampling, 1, "3" }, - { "verbose", "Enable verbose mode", 0, 0, 0, 0 }, + { "verbose", "Enable verbose mode (mute, time, low, medium, full)", + "<mode>", scribo::debug::check_verbose_mode, 1, "mute" }, { "win-size", "Window size at scale 1", "<size>", 0, 1, "101" }, {0, 0, 0, 0, 0, 0} }; @@ -102,7 +103,6 @@ int main(int argc, char *argv[]) trace::entering("main"); - bool verbose = options.is_set("verbose"); // Window size unsigned w_1 = atoi(options.opt_value("win-size").c_str()); // First subsampling scale. @@ -122,9 +122,8 @@ int main(int argc, char *argv[]) binarization::internal::k4 = atof(options.opt_value("k4").c_str()); } - if (verbose) - std::cout << "Using w_1=" << w_1 << " - s=" << s - << " - k=" << k << std::endl; + scribo::debug::logger() << "Using w_1=" << w_1 << " - s=" << s + << " - k=" << k << std::endl; @@ -137,18 +136,14 @@ int main(int argc, char *argv[]) input_1_gl = data::transform(input_1, mln::fun::v2v::rgb_to_luma<value::int_u8>()); - mln::util::timer t; - t.start(); + + scribo::debug::logger().start_local_time_logging(); // Binarize image2d<bool> output = scribo::binarization::sauvola_ms(input_1_gl, w_1, s, k); - if (verbose) - { - t.stop(); - std::cout << "binarized in " << t << "s" << std::endl; - } + scribo::debug::logger().stop_local_time_logging("Binarized in"); io::pbm::save(output, options.arg("output.pbm")); } diff --git a/scribo/src/binarization/sauvola_ms_debug.cc b/scribo/src/binarization/sauvola_ms_debug.cc index d89e9f4..251f0e8 100644 --- a/scribo/src/binarization/sauvola_ms_debug.cc +++ b/scribo/src/binarization/sauvola_ms_debug.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -72,7 +72,8 @@ static const scribo::debug::opt_data opt_desc[] = { "s", "First subsampling ratio. Possible values: 2 or 3.", "ratio", scribo::debug::check_sauvola_first_subsampling, 1, "3" }, - { "verbose", "Enable verbose mode", 0, 0, 0, 0 }, + { "verbose", "Enable verbose mode (mute, time, low, medium, full)", + "<mode>", scribo::debug::check_verbose_mode, 1, "mute" }, { "win-size", "Window size at scale 1", "<size>", 0, 1, "101" }, {0, 0, 0, 0, 0, 0} }; @@ -131,7 +132,6 @@ int main(int argc, char *argv[]) trace::entering("main"); - bool verbose = options.is_set("verbose"); // Window size unsigned w_1 = atoi(options.opt_value("win-size").c_str()); // First subsampling scale. @@ -142,9 +142,8 @@ int main(int argc, char *argv[]) binarization::internal::k3 = atof(options.opt_value("k3").c_str()); binarization::internal::k4 = atof(options.opt_value("k4").c_str()); - if (verbose) - std::cout << "Using w_1=" << w_1 << " - s=" << s - << " - k=" << k << std::endl; + scribo::debug::logger() << "Using w_1=" << w_1 << " - s=" << s + << " - k=" << k << std::endl; scribo::binarization::internal::scale_image_output = "scale_image.pgm"; scribo::binarization::internal::threshold_image_output = "threshold_image.pbm"; @@ -162,18 +161,13 @@ int main(int argc, char *argv[]) input_1_gl = data::transform(input_1, mln::fun::v2v::rgb_to_luma<value::int_u8>()); - mln::util::timer t; - t.start(); + scribo::debug::logger().start_local_time_logging(); // Binarize. image2d<bool> output = scribo::binarization::sauvola_ms(input_1_gl, w_1, s, k); - if (verbose) - { - t.stop(); - std::cout << "binarized in " << t << "s" << std::endl; - } + scribo::debug::logger().stop_local_time_logging("Binarized in"); # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG { diff --git a/scribo/src/binarization/sauvola_ms_fg.cc b/scribo/src/binarization/sauvola_ms_fg.cc index 83a48af..98206a8 100644 --- a/scribo/src/binarization/sauvola_ms_fg.cc +++ b/scribo/src/binarization/sauvola_ms_fg.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -65,7 +65,8 @@ static const scribo::debug::opt_data opt_desc[] = "useful if fg-extraction is enabled.", "<size>", 0, 1, "1024" }, { "s", "First subsampling ratio. Possible values: 2 or 3.", "ratio", scribo::debug::check_sauvola_first_subsampling, 1, "3" }, - { "verbose", "Enable verbose mode", 0, 0, 0, 0 }, + { "verbose", "Enable verbose mode (mute, time, low, medium, full)", + "<mode>", scribo::debug::check_verbose_mode, 1, "mute" }, { "win-size", "Window size at scale 1", "<size>", 0, 1, "101" }, {0, 0, 0, 0, 0, 0} }; @@ -92,7 +93,6 @@ int main(int argc, char *argv[]) trace::entering("main"); - bool verbose = options.is_set("verbose"); unsigned lambda = atoi(options.opt_value("lambda").c_str()); // Window size @@ -102,9 +102,8 @@ int main(int argc, char *argv[]) unsigned s = atoi(options.opt_value("s").c_str()); double k = atof(options.opt_value("k").c_str()); - if (verbose) - std::cout << "Using w_1=" << w_1 << " - s=" << s << " - k=" - << k << " - lambda=" << lambda << std::endl; + scribo::debug::logger() << "Using w_1=" << w_1 << " - s=" << s << " - k=" + << k << " - lambda=" << lambda << std::endl; Magick::InitializeMagick(0); diff --git a/scribo/src/binarization/sauvola_ms_split.cc b/scribo/src/binarization/sauvola_ms_split.cc index f71f734..f1cc490 100644 --- a/scribo/src/binarization/sauvola_ms_split.cc +++ b/scribo/src/binarization/sauvola_ms_split.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -67,7 +67,8 @@ static const scribo::debug::opt_data opt_desc[] = "<num>", scribo::debug::check_sauvola_split_ntrue, 1, "2" }, { "s", "First subsampling ratio. Possible values: 2 or 3.", "ratio", scribo::debug::check_sauvola_first_subsampling, 1, "3" }, - { "verbose", "Enable verbose mode", 0, 0, 0, 0 }, + { "verbose", "Enable verbose mode (mute, time, low, medium, full)", + "<mode>", scribo::debug::check_verbose_mode, 1, "mute" }, { "win-size", "Window size at scale 1", "<size>", 0, 1, "101" }, {0, 0, 0, 0, 0, 0} }; @@ -92,7 +93,6 @@ int main(int argc, char *argv[]) trace::entering("main"); - bool verbose = options.is_set("verbose"); // Window size unsigned w_1 = atoi(options.opt_value("win-size").c_str()); // Scale 1 @@ -105,11 +105,8 @@ int main(int argc, char *argv[]) binarization::internal::k3 = atof(options.opt_value("k3").c_str()); binarization::internal::k4 = atof(options.opt_value("k4").c_str()); - - if (verbose) - std::cout << "Using w_1=" << w_1 << " - s=" << s << " - k=" - << k << " - min_ntrue=" << min_ntrue << std::endl; - + scribo::debug::logger() << "Using w_1=" << w_1 << " - s=" << s << " - k=" + << k << " - min_ntrue=" << min_ntrue << std::endl; Magick::InitializeMagick(0); diff --git a/scribo/src/binarization/wolf.cc b/scribo/src/binarization/wolf.cc index c481e09..4495f64 100644 --- a/scribo/src/binarization/wolf.cc +++ b/scribo/src/binarization/wolf.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -58,7 +58,8 @@ static const scribo::debug::opt_data opt_desc[] = { "debug-prefix", "Enable debug image outputs. Prefix image name with that " "given prefix.", "<prefix>", 0, 1, 0 }, { "k", "Wolf's formulae parameter", "<value>", 0, 1, "0.34" }, - { "verbose", "Enable verbose mode", 0, 0, 0, 0 }, + { "verbose", "Enable verbose mode (mute, time, low, medium, full)", + "<mode>", scribo::debug::check_verbose_mode, 1, "mute" }, { "win-size", "Window size", "<size>", 0, 1, "101" }, {0, 0, 0, 0, 0, 0} }; @@ -85,12 +86,10 @@ int main(int argc, char *argv[]) trace::entering("main"); - bool verbose = options.is_set("verbose"); unsigned w = atoi(options.opt_value("win-size").c_str()); double k = atof(options.opt_value("k").c_str()); - if (verbose) - std::cout << "Using w=" << w << " and k=" << k << std::endl; + scribo::debug::logger() << "Using w=" << w << " and k=" << k << std::endl; image2d<value::rgb8> input; io::magick::load(input, options.arg("input.*")); -- 1.7.2.5

1 0

olena-2.0-105-g63becd7 Cleanup Kim's binarization.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

* src/binarization/kim.cc: Move code... * scribo/binarization/kim.hh: ... here. * tests/binarization/Makefile.am: Add new target. * tests/binarization/kim.cc, * tests/binarization/kim.ref.pbm, * tests/binarization/kim_weven_hodd.ref.pbm, * tests/binarization/kim_wodd_heven.ref.pbm, * tests/binarization/kim_wodd_hodd.ref.pbm: New. --- scribo/ChangeLog | 15 ++ scribo/scribo/binarization/kim.hh | 262 ++++++++++++++++++++++ scribo/src/binarization/kim.cc | 199 +--------------- scribo/tests/binarization/Makefile.am | 6 + scribo/tests/binarization/{sauvola.cc => kim.cc} | 18 +- scribo/tests/binarization/kim.ref.pbm | Bin 0 -> 32884 bytes scribo/tests/binarization/kim_weven_hodd.ref.pbm | Bin 0 -> 32820 bytes scribo/tests/binarization/kim_wodd_heven.ref.pbm | Bin 0 -> 32884 bytes scribo/tests/binarization/kim_wodd_hodd.ref.pbm | Bin 0 -> 32820 bytes 9 files changed, 304 insertions(+), 196 deletions(-) create mode 100644 scribo/scribo/binarization/kim.hh copy scribo/tests/binarization/{sauvola.cc => kim.cc} (77%) create mode 100644 scribo/tests/binarization/kim.ref.pbm create mode 100644 scribo/tests/binarization/kim_weven_hodd.ref.pbm create mode 100644 scribo/tests/binarization/kim_wodd_heven.ref.pbm create mode 100644 scribo/tests/binarization/kim_wodd_hodd.ref.pbm diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 5d67d59..fc9ff14 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,20 @@ 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + Cleanup Kim's binarization. + + * src/binarization/kim.cc: Move code... + * scribo/binarization/kim.hh: ... here. + + * tests/binarization/Makefile.am: Add new target. + + * tests/binarization/kim.cc, + * tests/binarization/kim.ref.pbm, + * tests/binarization/kim_weven_hodd.ref.pbm, + * tests/binarization/kim_wodd_heven.ref.pbm, + * tests/binarization/kim_wodd_hodd.ref.pbm: New. + +2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + Make integral browsing canvas robust to large windows. * scribo/binarization/sauvola_ms.hh: remove tests on window size. diff --git a/scribo/scribo/binarization/kim.hh b/scribo/scribo/binarization/kim.hh new file mode 100644 index 0000000..0d31a1d --- /dev/null +++ b/scribo/scribo/binarization/kim.hh @@ -0,0 +1,262 @@ +// Copyright (C) 2012 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_BINARIZATION_KIM_HH +# define SCRIBO_BINARIZATION_KIM_HH + +/// \file +/// +/// + +#include <cmath> +#include <map> +#include <scribo/binarization/sauvola.hh> +#include <scribo/util/integral_sum_sum2_functor.hh> +#include <scribo/text/extract_lines.hh> + +namespace scribo +{ + + namespace binarization + { + + using namespace mln; + + /*! \brief Kim's binarization + + This algorithms performs a first rough binarization on the input + (here we use Sauvola's method). Then text lines are roughly + detected by grouping connected components. For each text lines, + character thickness and x height is computed. Finally, each + lines is binarized again, using text features as parameters for + adjusting the final threshold. + + This algorithms considers that global and local statistics + should be used to compute a threshold in text areas. + + This is an improvement of Sauvola's method. + + \param[in] input A gray-level image. + \param[in] window_size the window size to be used for the first + binarization. + \param[in] k Sauvola's formula parameter. + + This implementation is based on the paper "Multi-Window + Binarization of Camera Image for Document Recognition", In-Jung + Kim, Proceedings of the 9th International Workshop on Frontiers + in Handwriting Recognition (IWFHR-9 2004) + */ + template <typename I> + mln_ch_value(I, bool) + kim(const Image& input, unsigned window_size, double k); + + /*! \overload + k is set to SCRIBO_DEFAULT_SAUVOLA_K. + */ + template <typename I> + mln_ch_value(I, bool) + kim(const Image& input, unsigned window_size); + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + double + compute_thres(const mln::image2d<mln::util::couple<double,double> >& integral_sum_sum_2, + int row, int col, unsigned win_size, + const scribo::binarization::internal::sauvola_formula& formula) + { + point2d + tl(row - win_size - 1, + col - win_size - 1), + br(row + win_size, + col + win_size); + + box2d b(tl, br); + b.crop_wrt(integral_sum_sum_2.domain()); + + point2d tr = b.pmax(); + tr.row() = b.pmin().row(); + point2d bl = b.pmin(); + bl.row() = b.pmax().row(); + + unsigned card_min = b.nsites() - b.height() - b.width() + 1; + + const mln::util::couple<double,double>& + D = integral_sum_sum_2(b.pmax()), + B = integral_sum_sum_2(tr), + C = integral_sum_sum_2(bl), + A = integral_sum_sum_2(b.pmin()); + + double sum = D.first() - B.first() - C.first() + A.first(); + double sum_2 = D.second() - B.second() - C.second() + A.second(); + double mean = sum / card_min; + + double num = (sum_2 - sum * sum / card_min); + double stddev; + if (num > 0) + stddev = std::sqrt(num / (card_min - 1)); + else + stddev = 0; + + return formula(mean, stddev); + } + + } // end of namespace scribo::binarization::internal + + + template <typename I> + mln_ch_value(I, bool) + kim(const Image& input_, unsigned window_size, double k) + { + trace::entering("scribo::binarization::kim"); + + const I& input = exact(input_); + + mln_precondition(input.is_valid()); + + // 1st simple binarization + image2d<bool> + output = scribo::binarization::sauvola(input, window_size, k); + + // Compute integral image + scribo::util::integral_sum_sum2_functor<mln_value(I),double> f_sum_sum2; + image2d<mln::util::couple<double,double> > + integral_sum_sum_2 = scribo::util::init_integral_image(input, 1, f_sum_sum2); + + // Find text lines + line_set<image2d<scribo::def::lbl_type> > + lines = scribo::text::extract_lines(output, c8()); + + typedef scribo::def::lbl_type V; + typedef image2d<V> L; + mln::util::array<unsigned> thickness(lines.nelements() + 1, 0); + const component_set<L>& comp_set = lines.components(); + const L& lbl = comp_set.labeled_image(); + + // Compute run-lengths histogram in order to compute character + // thickness for each line. + for_all_lines(i, lines) + { + if (!lines(i).is_textline()) + continue; + + std::map<unsigned, unsigned> histo; + int count = 0; + for (int l = lines(i).bbox().pmin().row(); l <= lines(i).bbox().pmax().row(); ++l) + { + const V* end_ptr = &lbl.at_(l, lines(i).bbox().pmax().col() + 1); + for (const V* run_ptr = &lbl.at_(l, lines(i).bbox().pmin().col()); run_ptr != end_ptr; ++run_ptr) + if (*run_ptr) + ++count; + else + if (count) + { + if (histo.find(count) != histo.end()) + histo[count]++; + else + histo.insert(std::make_pair(count, 1)); + count = 0; + } + } + + unsigned max = 0; + unsigned thick = 0; + for (std::map<unsigned, unsigned>::const_iterator it = histo.begin(); it != histo.end(); ++it) + if (it->second > max) + { + max = it->second; + thick = it->first; + } + + thickness(lines(i).id()) = thick; + } + + // Compute thresholds for each pixel of each line and binarize again! + for_all_lines(i, lines) + { + if (!lines(i).is_textline()) + continue; + + double + win_min = thickness(lines(i).id()), + win_max = lines(i).bbox().height();; + + mln_assertion(win_min != 0); + mln_assertion(win_max != 0); + + scribo::binarization::internal::sauvola_formula formula; + + double teta = 0.3; // Good results from 0.1 to 0.3 according + // to the paper. + for (int row = lines(i).bbox().pmin().row(); + row <= lines(i).bbox().pmax().row(); + ++row) + { + bool* out_ptr = &output.at_(row, lines(i).bbox().pmin().col()); + const mln_value(I)* in_ptr = &input.at_(row, lines(i).bbox().pmin().col()); + for (int col = lines(i).bbox().pmin().col(); + col <= lines(i).bbox().pmax().col(); + ++col) + { + // Min case + double T_min = compute_thres(integral_sum_sum_2, row, col, win_min, formula); + + // Max case + double T_max = compute_thres(integral_sum_sum_2, row, col, win_max, formula); + + // Final threshold + double T = teta * T_max + (1 - teta) * T_min; + + mln_assertion(T_min <= 255); + mln_assertion(T_max <= 255); + mln_assertion(T <= 255); + + *out_ptr++ = *in_ptr++ <= T; + } + } + } + + trace::exiting("scribo::binarization::kim"); + return output; + } + + + template <typename I> + mln_ch_value(I, bool) + kim(const Image& input, unsigned window_size) + { + return kim(input, window_size, SCRIBO_DEFAULT_SAUVOLA_K); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::binarization + +} // end of namespace scribo + +#endif // ! SCRIBO_BINARIZATION_KIM_HH diff --git a/scribo/src/binarization/kim.cc b/scribo/src/binarization/kim.cc index aa81f50..9f9c38f 100644 --- a/scribo/src/binarization/kim.cc +++ b/scribo/src/binarization/kim.cc @@ -28,26 +28,18 @@ #include <cmath> #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/io/magick/load.hh> -#include <mln/io/pbm/save.hh> +#include <mln/io/magick/all.hh> #include <mln/data/transform.hh> #include <mln/fun/v2v/rgb_to_luma.hh> - -#include <scribo/binarization/sauvola_ms.hh> +#include <scribo/binarization/kim.hh> #include <scribo/debug/option_parser.hh> #include <scribo/debug/logger.hh> -#include <scribo/util/integral_sum_sum2_functor.hh> - -#include <scribo/text/extract_lines.hh> -#include <scribo/debug/bboxes_enlarged_image.hh> -#include <algorithm> - static const scribo::debug::arg_data arg_desc[] = { { "input.*", "An image." }, - { "output.pbm", "A binary image." }, + { "output.*", "A binary image." }, {0, 0} }; @@ -67,59 +59,11 @@ static const scribo::debug::opt_data opt_desc[] = { "debug-prefix", "Enable debug image outputs. Prefix image name with that " "given prefix.", "<prefix>", 0, 1, 0 }, { "k", "Sauvola's formulae parameter", "<value>", 0, 1, "0.34" }, - { "s", "First subsampling ratio. Possible values: 2 or 3.", "ratio", - scribo::debug::check_sauvola_first_subsampling, 1, "3" }, { "verbose", "Enable verbose mode", 0, 0, 0, 0 }, { "win-size", "Window size at scale 1", "<size>", 0, 1, "101" }, {0, 0, 0, 0, 0, 0} }; - - - -double -compute_thres(const mln::image2d<mln::util::couple<double,double> >& integral_sum_sum_2, - int row, int col, unsigned win_size, - const scribo::binarization::internal::sauvola_formula& formula) -{ - point2d - tl(row - win_size - 1, - col - win_size - 1), - br(row + win_size, - col + win_size); - - box2d b(tl, br); - b.crop_wrt(integral_sum_sum_2.domain()); - - point2d tr = b.pmax(); - tr.row() = b.pmin().row(); - point2d bl = b.pmin(); - bl.row() = b.pmax().row(); - - unsigned card_min = b.nsites() - b.height() - b.width() + 1; - - const mln::util::couple<double,double>& - D = integral_sum_sum_2(b.pmax()), - B = integral_sum_sum_2(tr), - C = integral_sum_sum_2(bl), - A = integral_sum_sum_2(b.pmin()); - - double sum = D.first() - B.first() - C.first() + A.first(); - double sum_2 = D.second() - B.second() - C.second() + A.second(); - double mean = sum / card_min; - - double num = (sum_2 - sum * sum / card_min); - double stddev; - if (num > 0) - stddev = std::sqrt(num / (card_min - 1)); - else - stddev = 0; - - return formula(mean, stddev); -} - - - int main(int argc, char *argv[]) { using namespace mln; @@ -142,16 +86,17 @@ int main(int argc, char *argv[]) trace::entering("main"); - bool verbose = options.is_set("verbose"); // Window size unsigned w_1 = atoi(options.opt_value("win-size").c_str()); - // First subsampling scale. - unsigned s = atoi(options.opt_value("s").c_str()); double k = atof(options.opt_value("k").c_str()); - if (verbose) - std::cout << "Using w_1=" << w_1 << " - s=" << s - << " - k=" << k << std::endl; + if (options.is_set("verbose")) + { + scribo::debug::logger().set_verbose_mode( + scribo::debug::txt_to_verbose_mode(options.opt_value("verbose"))); + scribo::debug::logger().log(Low, std::string("Using w_1=") + w_1 + + std::string(" - k=") + k); + } // Load image2d<value::rgb8> input_1; @@ -165,128 +110,8 @@ int main(int argc, char *argv[]) input_1_gl = data::transform(input_1, mln::fun::v2v::rgb_to_luma<value::int_u8>()); - // 1st simple binarization image2d<bool> - output = scribo::binarization::sauvola_ms(input_1_gl, w_1, s, k); - - mln::util::timer lt; - lt.start(); - - // Compute integral image - scribo::util::integral_sum_sum2_functor<value::int_u8,double> f_sum_sum2; - image2d<mln::util::couple<double,double> > - integral_sum_sum_2 = scribo::util::init_integral_image(input_1_gl, 1, f_sum_sum2); - - lt.stop(); - std::cout << "integral image - " << lt << std::endl; - lt.start(); - - // Find text lines - line_set<image2d<scribo::def::lbl_type> > - lines = scribo::text::extract_lines(output, c8()); - - typedef scribo::def::lbl_type V; - typedef image2d<V> L; - mln::util::array<unsigned> thickness(lines.nelements() + 1, 0); - const component_set<L>& comp_set = lines.components(); - const L& lbl = comp_set.labeled_image(); - - lt.stop(); - std::cout << "Text line finding - " << lt << std::endl; - lt.start(); - - // Compute run-lengths histogram in order to compute character - // thickness for each line. - for_all_lines(i, lines) - { - if (!lines(i).is_textline()) - continue; - - std::map<unsigned, unsigned> histo; - int count = 0; - for (int l = lines(i).bbox().pmin().row(); l <= lines(i).bbox().pmax().row(); ++l) - { - const V* end_ptr = &lbl.at_(l, lines(i).bbox().pmax().col() + 1); - for (const V* run_ptr = &lbl.at_(l, lines(i).bbox().pmin().col()); run_ptr != end_ptr; ++run_ptr) - if (*run_ptr) - ++count; - else - if (count) - { - if (histo.find(count) != histo.end()) - histo[count]++; - else - histo.insert(std::make_pair(count, 1)); - count = 0; - } - } - - unsigned max = 0; - unsigned thick = 0; - for (std::map<unsigned, unsigned>::const_iterator it = histo.begin(); it != histo.end(); ++it) - if (it->second > max) - { - max = it->second; - thick = it->first; - } - - thickness(lines(i).id()) = thick; - } - - lt.stop(); - std::cout << "run-lengths histogram - " << lt << std::endl; - - lt.start(); - // Compute thresholds for each pixel of each line and binarize again! - for_all_lines(i, lines) - { - if (!lines(i).is_textline()) - continue; - - double - win_min = thickness(lines(i).id()), - win_max = lines(i).bbox().height();; - - mln_assertion(win_min != 0); - mln_assertion(win_max != 0); - - scribo::binarization::internal::sauvola_formula formula; - - for (int row = lines(i).bbox().pmin().row(); - row <= lines(i).bbox().pmax().row(); - ++row) - { - bool* out_ptr = &output.at_(row, lines(i).bbox().pmin().col()); - value::int_u8* in_ptr = &input_1_gl.at_(row, lines(i).bbox().pmin().col()); - for (int col = lines(i).bbox().pmin().col(); - col <= lines(i).bbox().pmax().col(); - ++col) - { - // Min case - double T_min = compute_thres(integral_sum_sum_2, row, col, win_min, formula); - - // Max case - double T_max = compute_thres(integral_sum_sum_2, row, col, win_max, formula); - - // Final threshold - double teta = 0.3; // Good results from 0.1 to 0.3 according - // to the paper. - double T = teta * T_max + (1 - teta) * T_min; - - mln_assertion(T_min <= 255); - mln_assertion(T_max <= 255); - mln_assertion(T <= 255); - - *out_ptr++ = *in_ptr++ <= T; - } - } - } - - lt.stop(); - std::cout << "Last binarization - " << lt << std::endl; - - t.stop(); - std::cout << "Total time = " << t << std::endl; + output = scribo::binarization::kim(input_1_gl, w_1, k); - io::pbm::save(output, options.arg("output.pbm")); + io::magick::save(output, options.arg("output.*")); } diff --git a/scribo/tests/binarization/Makefile.am b/scribo/tests/binarization/Makefile.am index bac5a24..714bf93 100644 --- a/scribo/tests/binarization/Makefile.am +++ b/scribo/tests/binarization/Makefile.am @@ -21,6 +21,10 @@ include $(top_srcdir)/scribo/tests/tests.mk EXTRA_DIST = \ + kim.res.pbm \ + kim_wodd_heven.ref.pbm \ + kim_weven_hodd.ref.pbm \ + kim_wodd_hodd.ref.pbm \ niblack.res.pbm \ niblack_wodd_heven.ref.pbm \ niblack_weven_hodd.ref.pbm \ @@ -41,6 +45,7 @@ EXTRA_DIST = \ check_PROGRAMS = \ global_threshold \ + kim \ local_threshold \ niblack \ otsu \ @@ -50,6 +55,7 @@ check_PROGRAMS = \ global_threshold_SOURCES = global_threshold.cc +kim_SOURCES = kim.cc local_threshold_SOURCES = local_threshold.cc niblack_SOURCES = niblack.cc otsu_SOURCES = otsu.cc diff --git a/scribo/tests/binarization/sauvola.cc b/scribo/tests/binarization/kim.cc similarity index 77% copy from scribo/tests/binarization/sauvola.cc copy to scribo/tests/binarization/kim.cc index 54e8bbd..74e0eef 100644 --- a/scribo/tests/binarization/sauvola.cc +++ b/scribo/tests/binarization/kim.cc @@ -31,7 +31,7 @@ #include <mln/io/pgm/load.hh> #include <mln/io/pbm/load.hh> -#include <scribo/binarization/sauvola.hh> +#include <scribo/binarization/kim.hh> #include "tests/data.hh" @@ -44,10 +44,10 @@ int main() image2d<value::int_u8> input; io::pgm::load(input, MILENA_IMG_DIR "/lena.pgm"); - image2d<bool> bin = scribo::binarization::sauvola(input, 101); + image2d<bool> bin = scribo::binarization::kim(input, 101); image2d<bool> ref; - io::pbm::load(ref, SCRIBO_TESTS_DIR "binarization/sauvola.ref.pbm"); + io::pbm::load(ref, SCRIBO_TESTS_DIR "binarization/kim.ref.pbm"); mln_assertion(bin == ref); } @@ -57,10 +57,10 @@ int main() image2d<value::int_u8> input; io::pgm::load(input, SCRIBO_IMG_DIR "/lena_wodd_heven.pgm"); - image2d<bool> bin = scribo::binarization::sauvola(input, 101); + image2d<bool> bin = scribo::binarization::kim(input, 101); image2d<bool> ref; - io::pbm::load(ref, SCRIBO_TESTS_DIR "binarization/sauvola_wodd_heven.ref.pbm"); + io::pbm::load(ref, SCRIBO_TESTS_DIR "binarization/kim_wodd_heven.ref.pbm"); mln_assertion(bin == ref); } @@ -70,10 +70,10 @@ int main() image2d<value::int_u8> input; io::pgm::load(input, SCRIBO_IMG_DIR "/lena_weven_hodd.pgm"); - image2d<bool> bin = scribo::binarization::sauvola(input, 101); + image2d<bool> bin = scribo::binarization::kim(input, 101); image2d<bool> ref; - io::pbm::load(ref, SCRIBO_TESTS_DIR "binarization/sauvola_weven_hodd.ref.pbm"); + io::pbm::load(ref, SCRIBO_TESTS_DIR "binarization/kim_weven_hodd.ref.pbm"); mln_assertion(bin == ref); } @@ -83,10 +83,10 @@ int main() image2d<value::int_u8> input; io::pgm::load(input, SCRIBO_IMG_DIR "/lena_wodd_hodd.pgm"); - image2d<bool> bin = scribo::binarization::sauvola(input, 101); + image2d<bool> bin = scribo::binarization::kim(input, 101); image2d<bool> ref; - io::pbm::load(ref, SCRIBO_TESTS_DIR "binarization/sauvola_wodd_hodd.ref.pbm"); + io::pbm::load(ref, SCRIBO_TESTS_DIR "binarization/kim_wodd_hodd.ref.pbm"); mln_assertion(bin == ref); } diff --git a/scribo/tests/binarization/kim.ref.pbm b/scribo/tests/binarization/kim.ref.pbm new file mode 100644 index 0000000..d792130 Binary files /dev/null and b/scribo/tests/binarization/kim.ref.pbm differ diff --git a/scribo/tests/binarization/kim_weven_hodd.ref.pbm b/scribo/tests/binarization/kim_weven_hodd.ref.pbm new file mode 100644 index 0000000..45eab1d Binary files /dev/null and b/scribo/tests/binarization/kim_weven_hodd.ref.pbm differ diff --git a/scribo/tests/binarization/kim_wodd_heven.ref.pbm b/scribo/tests/binarization/kim_wodd_heven.ref.pbm new file mode 100644 index 0000000..1dc805f Binary files /dev/null and b/scribo/tests/binarization/kim_wodd_heven.ref.pbm differ diff --git a/scribo/tests/binarization/kim_wodd_hodd.ref.pbm b/scribo/tests/binarization/kim_wodd_hodd.ref.pbm new file mode 100644 index 0000000..5598763 Binary files /dev/null and b/scribo/tests/binarization/kim_wodd_hodd.ref.pbm differ -- 1.7.2.5

1 0

olena-2.0-104-gcd9f3d8 Make integral browsing canvas robust to large windows.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

* scribo/binarization/sauvola_ms.hh: remove tests on window size. * scribo/canvas/integral_browsing.hh: Check window size. --- scribo/ChangeLog | 8 ++++++++ scribo/scribo/binarization/sauvola_ms.hh | 28 ---------------------------- scribo/scribo/canvas/integral_browsing.hh | 19 +++++++++++++++++++ 3 files changed, 27 insertions(+), 28 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1c1295b..5d67d59 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + Make integral browsing canvas robust to large windows. + + * scribo/binarization/sauvola_ms.hh: remove tests on window size. + + * scribo/canvas/integral_browsing.hh: Check window size. + +2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + Several small fixes. * scribo/estim/font_color.hh: Fix namespace ambiguities. diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index ba58207..5f0f963 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -169,34 +169,6 @@ namespace scribo w_local_h = w_local, w_local_w = w_local; - //std::cout << "scale " <= static_cast<const unsigned>(integral_sum_sum_2.ncols())) - { - w_local_w = std::min(integral_sum_sum_2.ncols(), - integral_sum_sum_2.nrows()) - integral_sum_sum_2.border(); - w_local_h = w_local_w; - trace::warning("integral_browsing - Adjusting window width since it" - " was larger than image width."); - } - if (w_local_h >= static_cast<const unsigned>(integral_sum_sum_2.nrows())) - { - w_local_h = std::min(integral_sum_sum_2.nrows(), - integral_sum_sum_2.ncols()) - integral_sum_sum_2.border(); - w_local_w = w_local_h; - trace::warning("integral_browsing - Adjusting window height since it" - " was larger than image height."); - } - - if (! (w_local % 2)) - { - --w_local_w; - ++w_local_h; - } - - //std::cout << "Scale " < > f(sub, K, SCRIBO_DEFAULT_SAUVOLA_R, e_2, i, q); diff --git a/scribo/scribo/canvas/integral_browsing.hh b/scribo/scribo/canvas/integral_browsing.hh index da13fe7..5328a5a 100644 --- a/scribo/scribo/canvas/integral_browsing.hh +++ b/scribo/scribo/canvas/integral_browsing.hh @@ -88,6 +88,25 @@ namespace scribo // mln_precondition((h/2) < ima.nrows()); // mln_precondition((w/2) < ima.ncols()); + // Adjust window size to image. + if (w > (ima.domain().ncols() - ima.border())) + { + w = std::min(ima.domain().ncols(), ima.domain().nrows()) - ima.border(); + if (! (w % 2)) + --w; + trace::warning("integral_browsing - Adjusting window width since it" + " was larger than image height."); + } + if (h > (ima.domain().nrows() - ima.border())) + { + h = std::min(ima.domain().ncols(), ima.domain().nrows()) - ima.border(); + if (! (h % 2)) + --h; + trace::warning("integral_browsing - Adjusting window height since it" + " was larger than image width."); + } + + const int nrows = ima.nrows(), ncols = ima.ncols(), -- 1.7.2.5

1 0

olena-2.0-96-ge5f272e Add Wolf's binarization algorithm.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

* scribo/binarization/internal/wolf_formula.hh, * scribo/binarization/internal/wolf_functor.hh, * scribo/binarization/wolf.hh, * scribo/util/integral_sum_sum2_global_min_functor.hh, * src/binarization/wolf.cc, * tests/binarization/wolf.cc, * tests/binarization/wolf.ref.pbm, * tests/binarization/wolf_weven_hodd.ref.pbm, * tests/binarization/wolf_wodd_heven.ref.pbm, * tests/binarization/wolf_wodd_hodd.ref.pbm: New. * src/binarization/Makefile.am, * tests/binarization/Makefile.am: Add new target. --- scribo/ChangeLog | 18 ++ .../scribo/binarization/internal/wolf_formula.hh | 95 ++++++++++ .../scribo/binarization/internal/wolf_functor.hh | 176 +++++++++++++++++ scribo/scribo/binarization/wolf.hh | 197 ++++++++++++++++++++ .../util/integral_sum_sum2_global_min_functor.hh | 156 ++++++++++++++++ scribo/src/binarization/Makefile.am | 9 +- scribo/src/binarization/wolf.cc | 107 +++++++++++ scribo/tests/binarization/Makefile.am | 19 ++- scribo/tests/binarization/wolf.cc | 93 +++++++++ scribo/tests/binarization/wolf.ref.pbm | Bin 0 -> 32884 bytes scribo/tests/binarization/wolf_weven_hodd.ref.pbm | Bin 0 -> 32820 bytes scribo/tests/binarization/wolf_wodd_heven.ref.pbm | Bin 0 -> 32884 bytes scribo/tests/binarization/wolf_wodd_hodd.ref.pbm | Bin 0 -> 32820 bytes 13 files changed, 867 insertions(+), 3 deletions(-) create mode 100644 scribo/scribo/binarization/internal/wolf_formula.hh create mode 100644 scribo/scribo/binarization/internal/wolf_functor.hh create mode 100644 scribo/scribo/binarization/wolf.hh create mode 100644 scribo/scribo/util/integral_sum_sum2_global_min_functor.hh create mode 100644 scribo/src/binarization/wolf.cc create mode 100644 scribo/tests/binarization/wolf.cc create mode 100644 scribo/tests/binarization/wolf.ref.pbm create mode 100644 scribo/tests/binarization/wolf_weven_hodd.ref.pbm create mode 100644 scribo/tests/binarization/wolf_wodd_heven.ref.pbm create mode 100644 scribo/tests/binarization/wolf_wodd_hodd.ref.pbm diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 9604def..ff7d1fa 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,23 @@ 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + Add Wolf's binarization algorithm. + + * scribo/binarization/internal/wolf_formula.hh, + * scribo/binarization/internal/wolf_functor.hh, + * scribo/binarization/wolf.hh, + * scribo/util/integral_sum_sum2_global_min_functor.hh, + * src/binarization/wolf.cc, + * tests/binarization/wolf.cc, + * tests/binarization/wolf.ref.pbm, + * tests/binarization/wolf_weven_hodd.ref.pbm, + * tests/binarization/wolf_wodd_heven.ref.pbm, + * tests/binarization/wolf_wodd_hodd.ref.pbm: New. + + * src/binarization/Makefile.am, + * tests/binarization/Makefile.am: Add new target. + +2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + Add more debug. * scribo/binarization/internal/local_threshold_debug.hh, diff --git a/scribo/scribo/binarization/internal/wolf_formula.hh b/scribo/scribo/binarization/internal/wolf_formula.hh new file mode 100644 index 0000000..a3084a7 --- /dev/null +++ b/scribo/scribo/binarization/internal/wolf_formula.hh @@ -0,0 +1,95 @@ +// Copyright (C) 2012 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_BINARIZATION_INTERNAL_WOLF_FORMULA_HH +# define SCRIBO_BINARIZATION_INTERNAL_WOLF_FORMULA_HH + + +/// \file +/// +/// \brief Routines computing a threshold using Wolf's binarization +/// formula. + + +// Setup default Wolf's formula parameters values. +// These macros may be used in other variant of Wolf's algorithms. +// +// Values are set according to the following reference: <FIXME> + +# define SCRIBO_DEFAULT_WOLF_K 0.34 + + +#include <mln/core/alias/point2d.hh> + +namespace scribo +{ + + namespace binarization + { + + namespace internal + { + + using namespace mln; + + template <typename V> + struct wolf_formula + { + + /*! \brief Compute a threshold using Wolf's formula. + + \todo doc! + + \return A threshold. + */ + double operator()(const double m_x_y, const double s_x_y, + const double K, const double global_max_stddev, + const V& global_min) const; + + }; + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename V> + inline + double + wolf_formula<V>::operator()(const double m_x_y, const double s_x_y, + const double K, const double global_max_stddev, + const V& global_min) const + { + return m_x_y - K * (1 - s_x_y / global_max_stddev) * (m_x_y - global_min); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::binarization::internal + + } // end of namespace scribo::binarization + +} // end of namespace scribo + +#endif // ! SCRIBO_BINARIZATION_INTERNAL_WOLF_FORMULA_HH diff --git a/scribo/scribo/binarization/internal/wolf_functor.hh b/scribo/scribo/binarization/internal/wolf_functor.hh new file mode 100644 index 0000000..d394c21 --- /dev/null +++ b/scribo/scribo/binarization/internal/wolf_functor.hh @@ -0,0 +1,176 @@ +// Copyright (C) 2012 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_BINARIZATION_INTERNAL_WOLF_FUNCTOR_HH +# define SCRIBO_BINARIZATION_INTERNAL_WOLF_FUNCTOR_HH + +/// \file +/// +/// + +# include <mln/core/image/image2d.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/extension/fill.hh> + +# include <scribo/binarization/internal/wolf_formula.hh> + +# ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG +# include <scribo/binarization/internal/local_threshold_debug.hh> +# endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG + + +namespace scribo +{ + + namespace binarization + { + + namespace internal + { + + using namespace mln; + + + template <typename I> + struct wolf_functor + { + typedef mln_value(I) V; + + wolf_functor(const Image& input, double K, + const mln_value(I)& global_min, + double global_max_stddev); + + // Run every 4 pixels. + void exec(double mean, double stddev); + + void end_of_row(int); + + void finalize(); + + + const I input; + mln_ch_value(I,bool) output; + + const mln_value(I)* pi; + bool* po; + + double K_; + + V global_min_; + double global_max_stddev_; + + scribo::binarization::internal::wolf_formula<V> formula_; + + int step_; + unsigned next_line3; + unsigned offset1; + unsigned offset2; + }; + +#ifndef MLN_INCLUDE_ONLY + + template <typename I> + wolf_functor::wolf_functor(const Image& input_, + double K, + const mln_value(I)& global_min, + double global_max_stddev) + : input(exact(input_)), + pi(&input(input.domain().pmin())), + K_(K), + global_min_(global_min), + global_max_stddev_(global_max_stddev) + { + step_ = 3; + + // Since we iterate from a smaller image in the largest ones + // and image at scale 1 does not always have a size which can + // be divided by 3, some sites in the border may not be + // processed and we must skip them. + int more_offset = - (3 - input.ncols() % 3); + if (more_offset == - 3) + more_offset = 0; // No offset needed. + + next_line3 = input.delta_index(dpoint2d(+2,0)) + + 2 * input.border() + more_offset; + + offset1 = input.delta_index(dpoint2d(+1,0)); + offset2 = input.delta_index(dpoint2d(+2,0)); + + initialize(output, input); + po = &output(output.domain().pmin()); + } + + template <typename I> + void + wolf_functor::exec(double mean, double stddev) + { + double th = formula_(mean, stddev, K_, + global_max_stddev_, global_min_); + + for (int i = 0; i < step_; ++i, ++po, ++pi) + { + *po = (*pi <= th); + *(po + offset1) = (*(pi + offset1) <= th); + *(po + offset2) = (*(pi + offset2) <= th); + } + +# ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG + // Store local mean + unsigned index = pi - input.buffer(); + + debug_mean.element(index) = mean * mean_debug_factor; + debug_stddev.element(index) = stddev * stddev_debug_factor; + debug_threshold.element(index) = th; + + double alpha = K_ * (1 - stddev / R_); + debug_alpham.element(index) = alpha * mean * alpham_debug_factor; + debug_alphacond.element(index) = (stddev < (alpha * mean / 2.)); +# endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG + + } + + template <typename I> + void + wolf_functor::end_of_row(int) + { + po += next_line3; + pi += next_line3; + } + + template <typename I> + void + wolf_functor::finalize() + { + } + +#endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::binarization::internal + + } // end of namespace scribo::binarization + +} // end of namespace scribo + +#endif // SCRIBO_BINARIZATION_INTERNAL_WOLF_FUNCTOR_HH diff --git a/scribo/scribo/binarization/wolf.hh b/scribo/scribo/binarization/wolf.hh new file mode 100644 index 0000000..25b4531 --- /dev/null +++ b/scribo/scribo/binarization/wolf.hh @@ -0,0 +1,197 @@ +// Copyright (C) 2012 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_BINARIZATION_WOLF_HH +# define SCRIBO_BINARIZATION_WOLF_HH + +/// \file +/// +/// + +# include <mln/core/concept/image.hh> +# include <scribo/binarization/internal/wolf_functor.hh> +# include <scribo/binarization/internal/local_threshold_core.hh> +# include <scribo/util/integral_sum_sum2_global_min_functor.hh> + +namespace scribo +{ + + namespace binarization + { + + using namespace mln; + + + /*! \brief Convert an image into a binary image. + + \input[in] input An image. + \input[in] window_size The window size. + \input[in] K Wolf's formulae constant. + + \return A binary image. + + This implementation is based on article "Text Localization, + Enhancement and Binarization in Multimedia Documents", Christian + Wolf, Jean-Michel Jolion, Françoise Chassaing, ICPR 2002. + + */ + template <typename I> + mln_ch_value(I, bool) + wolf(const Image& input, unsigned window_size, double K); + + + + /*! \brief Convert an image into a binary image. + + Wolf's formulae constant K is set to 0.34. + + \input[in] input An image. + \input[in] window_size The window size. + + \return A binary image. + + */ + template <typename I> + mln_ch_value(I, bool) + wolf(const Image& input, unsigned window_size); + + + /// \overload + /// The window size is set to 11. + // + template <typename I> + mln_ch_value(I, bool) + wolf(const Image& input); + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + template <typename I> + struct global_max_stddev + { + global_max_stddev() + : max_stddev(0) + { + } + + // Run every 4 pixels. + void exec(double mean, double stddev) + { + (void) mean; + if (max_stddev < stddev) + max_stddev = stddev; + } + + void end_of_row(int) + { + } + + void finalize() + { + } + + double max_stddev; + }; + + } // end of namespace scribo::binarization::internal + + + // Facades + + template <typename I> + mln_ch_value(I, bool) + wolf(const Image& input, unsigned window_size, double K) + { + trace::entering("scribo::binarization::wolf"); + + mln_precondition(exact(input).is_valid()); + + + // Make sure the image sizes are a multiple of 3 in each + // dimension. (browsing while binarizing relies on that + // property). + mln::util::array<mln::util::couple<box2d, unsigned> > + sub_domains = scribo::util::compute_sub_domains(input, 1, 3); + + border::adjust(input, sub_domains(1).second()); + border::mirror(input); + + scribo::util::integral_sum_sum2_global_min_functor<value::int_u8, double> fi; + image2d<mln::util::couple<double,double> > + integral = scribo::util::init_integral_image(input, 3, fi, + sub_domains[2].first(), + sub_domains[2].second()); + + window_size /= 3; + if (window_size % 2) + window_size += 2; + else + window_size += 1; + + + // Compute max(stddev) of all windows. + internal::global_max_stddev f_max_stddev; + scribo::canvas::integral_browsing(integral, 1, window_size, + window_size, 3, f_max_stddev); + + // Binarize ! + internal::wolf_functor + f(input, K, fi.global_min(), f_max_stddev.max_stddev); + scribo::canvas::integral_browsing(integral, 1, window_size, + window_size, 3, f); + + trace::exiting("scribo::binarization::wolf"); + return f.output; + } + + + template <typename I> + mln_ch_value(I, bool) + wolf(const Image& input, unsigned window_size) + { + return wolf(input, window_size, SCRIBO_DEFAULT_WOLF_K); + } + + + template <typename I> + mln_ch_value(I, bool) + wolf(const Image& input) + { + return wolf(input, 11); + } + + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace scribo::binarization + +} // end of namespace scribo + + +#endif // ! SCRIBO_BINARIZATION_WOLF_HH diff --git a/scribo/scribo/util/integral_sum_sum2_global_min_functor.hh b/scribo/scribo/util/integral_sum_sum2_global_min_functor.hh new file mode 100644 index 0000000..20a61c0 --- /dev/null +++ b/scribo/scribo/util/integral_sum_sum2_global_min_functor.hh @@ -0,0 +1,156 @@ +// Copyright (C) 2012 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_UTIL_INTEGRAL_SUM_SUM2_GLOBAL_MIN_FUNCTOR_HH +# define SCRIBO_UTIL_INTEGRAL_SUM_SUM2_GLOBAL_MIN_FUNCTOR_HH + +/// \file +/// +/// + +# include <mln/util/couple.hh> + +namespace scribo +{ + + namespace util + { + + template <typename V, typename S = mln_sum(V)> + class integral_sum_sum2_global_min_functor + { + public: + typedef mln::util::couple<S, S> result; + + void begin_of_first_row(); + void begin_of_row(); + void end_of_row(); + + void begin_of_col(); + void end_of_col(); + + + void take(const V& v); + + result to_result_first_row() const; + result to_result(const result& up_result) const; + + const V& global_min() const; + + private: + S h_sum_; + S h_sum_2_; + + V global_min_; + }; + + +# ifndef MLN_INCLUDE_ONLY + + template <typename V, typename S> + inline + void + integral_sum_sum2_global_min_functor<V,S>::begin_of_first_row() + { + h_sum_ = 0; + h_sum_2_ = 0; + global_min_ = 0; + } + + template <typename V, typename S> + inline + void + integral_sum_sum2_global_min_functor<V,S>::begin_of_row() + { + h_sum_ = 0; + h_sum_2_ = 0; + } + + template <typename V, typename S> + inline + void + integral_sum_sum2_global_min_functor<V,S>::take(const V& v) + { + if (global_min_ > v) + global_min_ = v; + + h_sum_ += v; + h_sum_2_ += v * v; + } + + template <typename V, typename S> + inline + typename integral_sum_sum2_global_min_functor<V,S>::result + integral_sum_sum2_global_min_functor<V,S>::to_result_first_row() const + { + return result(h_sum_, h_sum_2_); + } + + template <typename V, typename S> + inline + typename integral_sum_sum2_global_min_functor<V,S>::result + integral_sum_sum2_global_min_functor<V,S>::to_result(const result& up_result) const + { + return result(h_sum_ + up_result.first(), + h_sum_2_ + up_result.second()); + } + + template <typename V, typename S> + inline + const V& + integral_sum_sum2_global_min_functor<V,S>::global_min() const + { + return global_min_; + } + + template <typename V, typename S> + inline + void + integral_sum_sum2_global_min_functor<V,S>::begin_of_col() + { + } + + template <typename V, typename S> + inline + void + integral_sum_sum2_global_min_functor<V,S>::end_of_col() + { + } + + + template <typename V, typename S> + inline + void + integral_sum_sum2_global_min_functor<V,S>::end_of_row() + { + } + +#endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::util + +} // end of namespace scribo + +#endif // ! SCRIBO_UTIL_INTEGRAL_SUM_SUM2_GLOBAL_MIN_FUNCTOR_HH diff --git a/scribo/src/binarization/Makefile.am b/scribo/src/binarization/Makefile.am index a0a4378..68b83dc 100644 --- a/scribo/src/binarization/Makefile.am +++ b/scribo/src/binarization/Makefile.am @@ -35,7 +35,8 @@ if HAVE_MAGICKXX sauvola \ sauvola_ms \ sauvola_ms_fg \ - sauvola_ms_split + sauvola_ms_split \ + wolf global_threshold_SOURCES = global_threshold.cc @@ -70,6 +71,12 @@ if HAVE_MAGICKXX sauvola_LDFLAGS = $(AM_LDFLAGS) \ $(MAGICKXX_LDFLAGS) + wolf_SOURCES = wolf.cc + wolf_CPPFLAGS = $(AM_CPPFLAGS) \ + $(MAGICKXX_CPPFLAGS) + wolf_LDFLAGS = $(AM_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) + sauvola_debug_SOURCES = sauvola_debug.cc sauvola_debug_CPPFLAGS = $(AM_CPPFLAGS) \ -DSCRIBO_LOCAL_THRESHOLD_DEBUG \ diff --git a/scribo/src/binarization/wolf.cc b/scribo/src/binarization/wolf.cc new file mode 100644 index 0000000..c481e09 --- /dev/null +++ b/scribo/src/binarization/wolf.cc @@ -0,0 +1,107 @@ +// Copyright (C) 2009, 2010, 2011 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. + +#include <mln/core/image/image2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/io/magick/load.hh> +#include <mln/io/pbm/save.hh> +#include <mln/data/transform.hh> +#include <mln/fun/v2v/rgb_to_luma.hh> + +#include <scribo/binarization/wolf.hh> +#include <scribo/debug/option_parser.hh> +#include <scribo/debug/logger.hh> + +static const scribo::debug::arg_data arg_desc[] = +{ + { "input.*", "An image." }, + { "output.pbm", "A binary image." }, + {0, 0} +}; + + +// --enable/disable-<name> +static const scribo::debug::toggle_data toggle_desc[] = +{ + // name, description, default value + {0, 0, false} +}; + + +// --<name> <args> +static const scribo::debug::opt_data opt_desc[] = +{ + // name, description, arguments, check args function, number of args, default arg + { "debug-prefix", "Enable debug image outputs. Prefix image name with that " + "given prefix.", "<prefix>", 0, 1, 0 }, + { "k", "Wolf's formulae parameter", "<value>", 0, 1, "0.34" }, + { "verbose", "Enable verbose mode", 0, 0, 0, 0 }, + { "win-size", "Window size", "<size>", 0, 1, "101" }, + {0, 0, 0, 0, 0, 0} +}; + + + +int main(int argc, char *argv[]) +{ + using namespace mln; + + scribo::debug::option_parser options(arg_desc, toggle_desc, opt_desc); + + if (!options.parse(argc, argv)) + return 1; + + // Enable debug output. + if (options.is_set("debug-prefix")) + { + scribo::debug::logger().set_filename_prefix(options.opt_value("debug-prefix").c_str()); + scribo::debug::logger().set_level(scribo::debug::All); + } + + Magick::InitializeMagick(*argv); + + trace::entering("main"); + + bool verbose = options.is_set("verbose"); + unsigned w = atoi(options.opt_value("win-size").c_str()); + double k = atof(options.opt_value("k").c_str()); + + if (verbose) + std::cout << "Using w=" << w << " and k=" << k << std::endl; + + image2d<value::rgb8> input; + io::magick::load(input, options.arg("input.*")); + + // Convert to Gray level image. + image2d<value::int_u8> + input_1_gl = data::transform(input, mln::fun::v2v::rgb_to_luma<value::int_u8>()); + + image2d<bool> out = scribo::binarization::wolf(input_1_gl, w, k); + + io::pbm::save(out, options.arg("output.pbm")); + + trace::exiting("main"); +} diff --git a/scribo/tests/binarization/Makefile.am b/scribo/tests/binarization/Makefile.am index a2962bb..bac5a24 100644 --- a/scribo/tests/binarization/Makefile.am +++ b/scribo/tests/binarization/Makefile.am @@ -22,9 +22,22 @@ include $(top_srcdir)/scribo/tests/tests.mk EXTRA_DIST = \ niblack.res.pbm \ + niblack_wodd_heven.ref.pbm \ + niblack_weven_hodd.ref.pbm \ + niblack_wodd_hodd.ref.pbm \ sauvola_ms.ref.pbm \ + sauvola_ms_wodd_heven.ref.pbm \ + sauvola_ms_weven_hodd.ref.pbm \ + sauvola_ms_wodd_hodd.ref.pbm \ sauvola.ref.pbm \ - otsu.ref.pbm + sauvola_wodd_heven.ref.pbm \ + sauvola_weven_hodd.ref.pbm \ + sauvola_wodd_hodd.ref.pbm \ + otsu.ref.pbm \ + wolf.ref.pbm \ + wolf_wodd_heven.ref.pbm \ + wolf_weven_hodd.ref.pbm \ + wolf_wodd_hodd.ref.pbm check_PROGRAMS = \ global_threshold \ @@ -32,7 +45,8 @@ check_PROGRAMS = \ niblack \ otsu \ sauvola \ - sauvola_ms + sauvola_ms \ + wolf global_threshold_SOURCES = global_threshold.cc @@ -41,6 +55,7 @@ niblack_SOURCES = niblack.cc otsu_SOURCES = otsu.cc sauvola_SOURCES = sauvola.cc sauvola_ms_SOURCES = sauvola_ms.cc +wolf_SOURCES = wolf.cc TESTS = $(check_PROGRAMS) diff --git a/scribo/tests/binarization/wolf.cc b/scribo/tests/binarization/wolf.cc new file mode 100644 index 0000000..27d7cd2 --- /dev/null +++ b/scribo/tests/binarization/wolf.cc @@ -0,0 +1,93 @@ +// Copyright (C) 2012 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. + +/// \file + +#include <mln/core/image/image2d.hh> +#include <mln/data/compare.hh> +#include <mln/value/int_u8.hh> +#include <mln/io/pgm/load.hh> +#include <mln/io/pbm/load.hh> + +#include <scribo/binarization/wolf.hh> + +#include "tests/data.hh" + +int main() +{ + using namespace mln; + + // even height and width + { + image2d<value::int_u8> input; + io::pgm::load(input, MILENA_IMG_DIR "/lena.pgm"); + + image2d<bool> bin = scribo::binarization::wolf(input, 101); + + image2d<bool> ref; + io::pbm::load(ref, SCRIBO_TESTS_DIR "binarization/wolf.ref.pbm"); + + mln_assertion(bin == ref); + } + + // even height and odd width + { + image2d<value::int_u8> input; + io::pgm::load(input, SCRIBO_IMG_DIR "/lena_wodd_heven.pgm"); + + image2d<bool> bin = scribo::binarization::wolf(input, 101); + + image2d<bool> ref; + io::pbm::load(ref, SCRIBO_TESTS_DIR "binarization/wolf_wodd_heven.ref.pbm"); + + mln_assertion(bin == ref); + } + + // odd height and even width + { + image2d<value::int_u8> input; + io::pgm::load(input, SCRIBO_IMG_DIR "/lena_weven_hodd.pgm"); + + image2d<bool> bin = scribo::binarization::wolf(input, 101); + + image2d<bool> ref; + io::pbm::load(ref, SCRIBO_TESTS_DIR "binarization/wolf_weven_hodd.ref.pbm"); + + mln_assertion(bin == ref); + } + + // odd height and width + { + image2d<value::int_u8> input; + io::pgm::load(input, SCRIBO_IMG_DIR "/lena_wodd_hodd.pgm"); + + image2d<bool> bin = scribo::binarization::wolf(input, 101); + + image2d<bool> ref; + io::pbm::load(ref, SCRIBO_TESTS_DIR "binarization/wolf_wodd_hodd.ref.pbm"); + + mln_assertion(bin == ref); + } +} diff --git a/scribo/tests/binarization/wolf.ref.pbm b/scribo/tests/binarization/wolf.ref.pbm new file mode 100644 index 0000000..9b8a367 Binary files /dev/null and b/scribo/tests/binarization/wolf.ref.pbm differ diff --git a/scribo/tests/binarization/wolf_weven_hodd.ref.pbm b/scribo/tests/binarization/wolf_weven_hodd.ref.pbm new file mode 100644 index 0000000..d2281ed Binary files /dev/null and b/scribo/tests/binarization/wolf_weven_hodd.ref.pbm differ diff --git a/scribo/tests/binarization/wolf_wodd_heven.ref.pbm b/scribo/tests/binarization/wolf_wodd_heven.ref.pbm new file mode 100644 index 0000000..c29fffa Binary files /dev/null and b/scribo/tests/binarization/wolf_wodd_heven.ref.pbm differ diff --git a/scribo/tests/binarization/wolf_wodd_hodd.ref.pbm b/scribo/tests/binarization/wolf_wodd_hodd.ref.pbm new file mode 100644 index 0000000..9dce37a Binary files /dev/null and b/scribo/tests/binarization/wolf_wodd_hodd.ref.pbm differ -- 1.7.2.5

1 0