- Olena-patches

olena-2.0-112-g0489364 Small fixes in Scribo.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

* scribo/binarization/internal/local_threshold_core.hh: Add a missing include. * scribo/debug/logger.hh: Fix attributes initialization order. * scribo/text/paragraphs_closing.hh: Fix a warning related to an unused-variable. --- scribo/ChangeLog | 12 ++++++++++++ .../binarization/internal/local_threshold_core.hh | 1 + scribo/scribo/debug/logger.hh | 4 ++-- scribo/scribo/text/paragraphs_closing.hh | 4 ++-- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 6982e6b..e0f9201 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,17 @@ 2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes in Scribo. + + * scribo/binarization/internal/local_threshold_core.hh: Add a + missing include. + + * scribo/debug/logger.hh: Fix attributes initialization order. + + * scribo/text/paragraphs_closing.hh: Fix a warning related to an + unused-variable. + +2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a better support for different k values in Sauvola Multiscale. * scribo/scribo/binarization/internal/sauvola_ms_functor.hh, diff --git a/scribo/scribo/binarization/internal/local_threshold_core.hh b/scribo/scribo/binarization/internal/local_threshold_core.hh index 7589499..1ab7385 100644 --- a/scribo/scribo/binarization/internal/local_threshold_core.hh +++ b/scribo/scribo/binarization/internal/local_threshold_core.hh @@ -44,6 +44,7 @@ # include <scribo/util/integral_sum_sum2_functor.hh> # include <scribo/util/compute_sub_domains.hh> +# include <scribo/debug/logger.hh> # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG # include <scribo/binarization/internal/local_threshold_debug.hh> # include <mln/io/pgm/save.hh> diff --git a/scribo/scribo/debug/logger.hh b/scribo/scribo/debug/logger.hh index cac2770..95bfeb3 100644 --- a/scribo/scribo/debug/logger.hh +++ b/scribo/scribo/debug/logger.hh @@ -243,8 +243,8 @@ namespace scribo : level_(None), verbose_mode_(Mute), default_verbose_mode_(Low), - stream_(std::cerr), - verbose_prefix_("LOG: ") + verbose_prefix_("LOG: "), + stream_(std::cerr) { // Magick::InitializeMagick(0); } diff --git a/scribo/scribo/text/paragraphs_closing.hh b/scribo/scribo/text/paragraphs_closing.hh index 476c14e..9dd28d2 100644 --- a/scribo/scribo/text/paragraphs_closing.hh +++ b/scribo/scribo/text/paragraphs_closing.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. @@ -207,7 +207,7 @@ namespace scribo const paragraph_info<L>& current_par = parset(p); const mln::util::array<line_id_t>& line_ids = current_par.line_ids(); - line_id_t last_id = line_ids[0]; + //line_id_t last_id = line_ids[0]; for_all_elements(i, line_ids) { const line_id_t& line_id = line_ids(i); -- 1.7.2.5

1 0

olena-2.0-113-gfa8caca demos/graph/region_adjacency_graph.cc: Add program arguments.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

--- milena/ChangeLog | 4 ++ milena/demos/graph/region_adjacency_graph.cc | 41 +++++++++++++++++++------- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 67cf83a..21114eb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + * demos/graph/region_adjacency_graph.cc: Add program arguments. + 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/core/internal/image_base.hh: Improve documentation. diff --git a/milena/demos/graph/region_adjacency_graph.cc b/milena/demos/graph/region_adjacency_graph.cc index 44a2f17..32d05b0 100644 --- a/milena/demos/graph/region_adjacency_graph.cc +++ b/milena/demos/graph/region_adjacency_graph.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2012 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -67,6 +68,9 @@ #include <mln/math/diff_abs.hh> #include <mln/debug/draw_graph.hh> +#include <mln/debug/filename.hh> +#include <mln/data/transform.hh> +#include <mln/fun/v2v/rgb_to_int_u.hh> namespace mln { @@ -149,27 +153,42 @@ namespace mln } -int main() +int main(int argc, char *argv[]) { using namespace mln; using value::int_u8; using value::rgb8; using value::label_16; - image2d<int_u8> input_pgm; - io::pgm::load(input_pgm, "house.pgm"); + if (argc != 3 && argc != 4) + { + std::cout << "Usage: " << argv[0] << " <input.*> <output_prefix>" + << " [closing_area_value (default:25)]" << std::endl; + return 1; + } + /// Load input image. image2d<rgb8> input_ppm; - io::ppm::load(input_ppm, "house.ppm"); + io::ppm::load(input_ppm, argv[1]); + + /// Convert input image to graylevel image. + image2d<value::int_u8> + input_pgm = data::transform(input_ppm, fun::v2v::rgb_to_int_u<8>()); + + /// Set output filename prefix. + debug::internal::filename_prefix = argv[2]; + unsigned area_value = 25; + if (argc == 4) + area_value = atoi(argv[3]); /// Gradient of the gray level image. image2d<int_u8> grad = morpho::gradient(input_pgm, win_c4p()); - io::pgm::save(grad, "tmp_grad_c4p.pgm"); + io::pgm::save(grad, debug::filename("grad_c4p.pgm")); /// Closing of the gradient. - image2d<int_u8> clo = morpho::closing::area(grad, c4(), 25); - io::pgm::save(clo, "tmp_clo_a100.pgm"); + image2d<int_u8> clo = morpho::closing::area(grad, c4(), area_value); + io::pgm::save(clo, debug::filename("clo_a100.pgm")); /// Watershed on the closing image. label_16 nbasins; @@ -178,12 +197,12 @@ int main() /// Output: A watershed image where each basin value is set to the basin /// mean value in the original ppm image. io::ppm::save(labeling::mean_values(input_ppm, wshed, nbasins), - "tmp_wshed_mean_colors.ppm"); + debug::filename("wshed_mean_colors.ppm")); /// Set watershed line value to yellow. data::fill((input_ppm | (pw::value(wshed) == 0u)).rw(), literal::yellow); - io::ppm::save(input_ppm, "tmp_wshed_color.ppm"); + io::ppm::save(input_ppm, debug::filename("wshed_color.ppm")); /// Build region adjacency graph. @@ -210,5 +229,5 @@ int main() mln_VAR(ima_e, make::edge_image(ima_v, dist())); io::ppm::save(make_debug_graph_image(input_ppm, ima_v, ima_e, literal::white), - "tmp_wst_rag_graph_image_white.ppm"); + debug::filename("wst_rag_graph_image_white.ppm")); } -- 1.7.2.5

1 0

olena-2.0-114-g2622f3b Rely on Argument-Dependent Lookup (ADL) in from_to_ overloads.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

* mln/accu/count_labels.hh, * mln/convert/from_to.hxx, * mln/convert/to.hh, * mln/core/alias/point1d.hh, * mln/core/alias/point2d.hh, * mln/core/alias/point3d.hh, * mln/core/dpoint.hh, * mln/core/internal/neighborhood_base.hh, * mln/core/point.hh, * mln/core/site_set/p_centered.hh, * mln/core/site_set/p_vaccess.hh, * mln/fun/v2v/hsl_to_rgb.hh, * mln/fun/v2v/rgb_to_hsl.hh, * mln/io/magick/save.hh, * mln/io/plot/save.hh, * mln/labeling/blobs_and_compute.hh, * mln/labeling/value_and_compute.hh, * mln/make/w_window2d.hh, * mln/win/multiple.hh, * mln/win/multiple_size.hh, * tests/accu/site_set/rectangularity.cc, * tests/core/other/graph_elt_neighborhood.cc, * tests/core/other/graph_elt_window.cc, * tests/core/other/point_set_compatibility.cc, * tests/draw/graph.cc: Update forward declarations and includes. * mln/algebra/vec.hh, * mln/convert/from_to.hh, * mln/convert/impl/from_double_to_value.hh, * mln/convert/impl/from_float_to_value.hh, * mln/convert/impl/from_image_to_site_set.hh, * mln/convert/impl/from_int_to_value.hh, * mln/convert/impl/from_unsigned_to_value.hh, * mln/convert/impl/from_value_to_value.hh, * mln/core/alias/neighb2d.hh, * mln/core/alias/neighb3d.hh, * mln/core/alias/window1d.hh, * mln/core/alias/window2d.hh, * mln/core/alias/window3d.hh, * mln/core/concept/accumulator.hh, * mln/core/concept/gdpoint.hh, * mln/core/concept/gpoint.hh, * mln/core/concept/image.hh, * mln/core/concept/proxy.hh, * mln/core/concept/site_set.hh, * mln/core/concept/window.hh, * mln/core/image/graph_window_if_piter.hh, * mln/core/image/image1d.hh, * mln/core/mixed_neighb.hh, * mln/core/neighb.hh, * mln/core/site_set/operators.hh, * mln/core/w_window.hh, * mln/fun/i2v/array.hh, * mln/util/object_id.hh, * mln/value/hsl.hh, * mln/value/int_u.hh, * mln/value/label.hh, * mln/value/qt/rgb32.hh, * mln/value/rgb.hh, * mln/histo/array.hh, * mln/util/array.hh: Move from_to_ overloads in the same namespace as their first argument. Conflicts: milena/mln/convert/from_to.hh --- milena/ChangeLog | 67 ++++++++++++++++++++++++++++++++++++++ milena/mln/convert/from_to.hh | 25 +++++++++----- milena/mln/core/concept/proxy.hh | 6 ++-- 3 files changed, 86 insertions(+), 12 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 21114eb..de897eb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,70 @@ +2012-05-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + Rely on Argument-Dependent Lookup (ADL) in from_to_ overloads. + + * mln/accu/count_labels.hh, + * mln/convert/from_to.hxx, + * mln/convert/to.hh, + * mln/core/alias/point1d.hh, + * mln/core/alias/point2d.hh, + * mln/core/alias/point3d.hh, + * mln/core/dpoint.hh, + * mln/core/internal/neighborhood_base.hh, + * mln/core/point.hh, + * mln/core/site_set/p_centered.hh, + * mln/core/site_set/p_vaccess.hh, + * mln/fun/v2v/hsl_to_rgb.hh, + * mln/fun/v2v/rgb_to_hsl.hh, + * mln/io/magick/save.hh, + * mln/io/plot/save.hh, + * mln/labeling/blobs_and_compute.hh, + * mln/labeling/value_and_compute.hh, + * mln/make/w_window2d.hh, + * mln/win/multiple.hh, + * mln/win/multiple_size.hh, + * tests/accu/site_set/rectangularity.cc, + * tests/core/other/graph_elt_neighborhood.cc, + * tests/core/other/graph_elt_window.cc, + * tests/core/other/point_set_compatibility.cc, + * tests/draw/graph.cc: Update forward declarations and includes. + + * mln/algebra/vec.hh, + * mln/convert/from_to.hh, + * mln/convert/impl/from_double_to_value.hh, + * mln/convert/impl/from_float_to_value.hh, + * mln/convert/impl/from_image_to_site_set.hh, + * mln/convert/impl/from_int_to_value.hh, + * mln/convert/impl/from_unsigned_to_value.hh, + * mln/convert/impl/from_value_to_value.hh, + * mln/core/alias/neighb2d.hh, + * mln/core/alias/neighb3d.hh, + * mln/core/alias/window1d.hh, + * mln/core/alias/window2d.hh, + * mln/core/alias/window3d.hh, + * mln/core/concept/accumulator.hh, + * mln/core/concept/gdpoint.hh, + * mln/core/concept/gpoint.hh, + * mln/core/concept/image.hh, + * mln/core/concept/proxy.hh, + * mln/core/concept/site_set.hh, + * mln/core/concept/window.hh, + * mln/core/image/graph_window_if_piter.hh, + * mln/core/image/image1d.hh, + * mln/core/mixed_neighb.hh, + * mln/core/neighb.hh, + * mln/core/site_set/operators.hh, + * mln/core/w_window.hh, + * mln/fun/i2v/array.hh, + * mln/util/object_id.hh, + * mln/value/hsl.hh, + * mln/value/int_u.hh, + * mln/value/label.hh, + * mln/value/qt/rgb32.hh, + * mln/value/rgb.hh, + * mln/histo/array.hh, + * mln/util/array.hh: Move from_to_ overloads in the same namespace + as their first argument. + 2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> * demos/graph/region_adjacency_graph.cc: Add program arguments. diff --git a/milena/mln/convert/from_to.hh b/milena/mln/convert/from_to.hh index 272a47d..a3ec6d4 100644 --- a/milena/mln/convert/from_to.hh +++ b/milena/mln/convert/from_to.hh @@ -102,6 +102,7 @@ namespace mln to = from; } + // Object -> Object (F not convertible towards T) // No conversion exists! template <typename F, typename T> @@ -116,15 +117,6 @@ namespace mln } - // Object -> Object - template <typename T> - inline - void - from_to_(const Object<T>& from, Object<T>& to) - { - exact(to) = exact(from); - } - namespace convert { @@ -208,6 +200,21 @@ namespace mln exact(from), exact(to)); } + // Object -> Object + template <typename T> + inline + void + from_to_dispatch(const Object<T>& from, Object<T>& to) + { + // // Here we would like to call from_to_ overloads in order + // to let the user specify its own conversion + // function. However, doing so may lead to ambiguous + // prototypes between from_to_(Object<>, Object<>) and + // from_to_(T, T). + // from_to_(exact(from), exact(to)); + exact(to) = exact(from); + } + // Dispatch entry points. diff --git a/milena/mln/core/concept/proxy.hh b/milena/mln/core/concept/proxy.hh index 8c4d2e9..43aed15 100644 --- a/milena/mln/core/concept/proxy.hh +++ b/milena/mln/core/concept/proxy.hh @@ -186,7 +186,7 @@ namespace mln // Disambiguate between (Proxy Op Object) and (Object Op Literal). - + template < template <class, class> class Op, typename P, typename L > struct set_binary_< Op, mln::Proxy, P, mln::Literal, L > @@ -229,7 +229,7 @@ namespace mln typedef q_subject; q_subject subj_(); */ - + protected: Proxy(); }; @@ -261,7 +261,7 @@ namespace mln template <typename T> typename mln::internal::unproxy_rec_<const T>::ret unproxy_rec(const T& t); - + // operator << -- 1.7.2.5

1 0

olena-2.0-115-gd9deb1a Improve conversion between algebra::h_mat and algebra::quat.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

* mln/algebra/h_mat.hh, * mln/algebra/quat.hh: New from_to_ overloads. * mln/fun/x2x/rotation.hh: Make use of new make::h_mat overload. * mln/make/h_mat.hh: New overload using quaternion as argument. * mln/value/builtin/integers.hh: Add epsilon. * tests/algebra/h_mat.cc, * tests/make/h_mat.cc: Improve tests. --- milena/ChangeLog | 16 ++++++ milena/mln/algebra/h_mat.hh | 94 +++++++++++++++++++++++++++++++++- milena/mln/algebra/quat.hh | 71 +++++++++++++++++++++++++- milena/mln/fun/x2x/rotation.hh | 12 +---- milena/mln/make/h_mat.hh | 38 +++++++++++++- milena/mln/value/builtin/integers.hh | 4 +- milena/tests/algebra/h_mat.cc | 52 +++++++++++++----- milena/tests/make/h_mat.cc | 38 +++++++++++++- 8 files changed, 291 insertions(+), 34 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index de897eb..d8d0804 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,19 @@ +2012-05-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Improve conversion between algebra::h_mat and algebra::quat. + + * mln/algebra/h_mat.hh, + * mln/algebra/quat.hh: New from_to_ overloads. + + * mln/fun/x2x/rotation.hh: Make use of new make::h_mat overload. + + * mln/make/h_mat.hh: New overload using quaternion as argument. + + * mln/value/builtin/integers.hh: Add epsilon. + + * tests/algebra/h_mat.cc, + * tests/make/h_mat.cc: Improve tests. + 2012-05-10 Guillaume Lazzara <z(a)lrde.epita.fr> Rely on Argument-Dependent Lookup (ADL) in from_to_ overloads. diff --git a/milena/mln/algebra/h_mat.hh b/milena/mln/algebra/h_mat.hh index 3d75a66..e2ee67f 100644 --- a/milena/mln/algebra/h_mat.hh +++ b/milena/mln/algebra/h_mat.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -31,10 +32,21 @@ * \brief Definition of a matrix with homogeneous coordinates. * * \todo Add traits. + * + * FIXME: there is a big issue with this class. exact() does not + * return the correct type since the exact type is NOT correctly + * propagated to Object. mat and h_mat should inherit from a base + * class and the operator traits should be updated so that + * interoperability between mat and h_mat is preserved which is not + * obvious. + * */ # include <mln/algebra/mat.hh> +# include <mln/algebra/quat.hh> +# include <mln/math/pi.hh> +# include <mln/util/couple.hh> namespace mln { @@ -57,9 +69,15 @@ namespace mln h_mat(); /// Constructor with the underlying matrix. h_mat(const mat<d+1, d+1, T>& x); + }; + /// \internal Conversion: h_mat -> quat + template <typename C> + void from_to_(const algebra::h_mat<3,C>& from, algebra::quat& to); + + # ifndef MLN_INCLUDE_ONLY template <unsigned d, typename T> @@ -76,6 +94,80 @@ namespace mln { } + + // Conversions + + template <typename C> + void from_to_(const algebra::h_mat<3,C>& from, algebra::quat& to) + { + C tr = from(0, 0) + from(1, 1) + from(2, 2) + 1; + + if (tr > 0.005f) // Actually, greater than 0 + { + C s = 0.5 / sqrt(tr), + w = 0.25 / s, + x = (from(2, 1) - from(1, 2)) * s, + y = (from(0, 2) - from(2, 0)) * s, + z = (from(1, 0) - from(0, 1)) * s; + + to = algebra::quat(w, x, y, z); + return; + } + + // If the trace of the matrix is less than or equal to zero + // then identify which major diagonal element has the greatest + // value. + + C max = 0; + unsigned c = 0; + for (unsigned d = 0; d <= 3; ++d) + if (from(d, d) > max) + { + max = from(d, d); + c = d; + } + + // Depending on this value, calculate the following: + C s, w, x, y, z; + switch(c) + { + case 0: + s = sqrt(1.0 + from(0, 0) - from(1, 1) - from(2, 2)) * 2; + x = 0.5 / s; + y = (from(0, 1) + from(1, 0)) / s; + z = (from(0, 2) + from(2, 0)) / s; + w = (from(1, 2) + from(2, 1)) / s; + break; + + case 1: + s = sqrt(1.0 + from(1, 1) - from(0, 0) - from(2, 2)) * 2; + x = (from(0, 1) + from(1, 0)) / s; + y = 0.5 / s; + z = (from(1, 2) + from(2, 1)) / s; + w = (from(0, 2) + from(2, 0)) / s; + break; + + case 2: + s = sqrt(1.0 + from(2, 2) - from(0, 0) - from(1, 1)) * 2; + x = (from(0, 2) + from(2, 0)) / s; + y = (from(1, 2) + from(2, 1)) / s; + z = 0.5 / s; + w = (from(0, 1) + from(1, 0) ) / s; + break; + + // Error case + default: + x = 0; + y = 0; + z = 0; + w = 0; + } + + to = algebra::quat(w, x, y, z); + return; + } + + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::algebra diff --git a/milena/mln/algebra/quat.hh b/milena/mln/algebra/quat.hh index 9ec725d..20dc9db 100644 --- a/milena/mln/algebra/quat.hh +++ b/milena/mln/algebra/quat.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -44,6 +45,8 @@ # include <mln/math/abs.hh> # include <mln/norm/l2.hh> +# include <mln/util/couple.hh> +# include <mln/math/pi.hh> // FIXME: pow, exp etc... are def here and in value::... @@ -260,8 +263,28 @@ namespace mln quat slerp_5(const quat& p, const quat& q, float h); + /// \internal Conversion: quaternion -> (angle_degrees, axis). + template <typename C> + void from_to_(const quat& from, mln::util::couple<C, algebra::vec<3,C> >& to); + + } // end of namespace mln::algebra + + + namespace make + { + + template <typename C> + mln::algebra::quat + quat(double angle, const mln::algebra::vec<3,C>& axis); + + } + # ifndef MLN_INCLUDE_ONLY + + namespace algebra + { + // Constructors. inline @@ -673,10 +696,54 @@ namespace mln return tmp; } -# endif // ! MLN_INCLUDE_ONLY + + // Conversions. + + template <typename C> + void from_to_(const quat& from, mln::util::couple<C, algebra::vec<3,C> >& to) + { + quat tmp = from; + tmp.set_unit(); + + C w = tmp.to_vec()[0], + angle = std::acos(w) * 2 * 180/math::pi; + + C sa = std::sin(std::acos(w)); + if (std::fabs( sa ) < 0.0005 ) + sa = 1; + + to.first() = angle; + to.second()[0] = tmp.to_vec()[1] / sa; + to.second()[1] = tmp.to_vec()[2] / sa; + to.second()[2] = tmp.to_vec()[3] / sa; + } } // end of namespace mln::algebra + + namespace make + { + + template <typename C> + mln::algebra::quat + quat(double angle, const mln::algebra::vec<3,C>& axis) + { + angle *= mln::math::pi/180; + C s = std::sin(angle / 2); + + C x = axis[0] * s, + y = axis[1] * s, + z = axis[2] * s, + w = std::cos(angle / 2); + + return mln::algebra::quat(w, x, y, z); + } + + } // end of namespace mln::make + + +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln #endif // ! MLN_ALGEBRA_QUAT_HH diff --git a/milena/mln/fun/x2x/rotation.hh b/milena/mln/fun/x2x/rotation.hh index ed48ebf..da0e1fc 100644 --- a/milena/mln/fun/x2x/rotation.hh +++ b/milena/mln/fun/x2x/rotation.hh @@ -214,17 +214,7 @@ namespace mln mlc_bool(n == 3)::check(); mln_precondition(q.is_unit()); - C - w = q.to_vec()[0], - x = q.to_vec()[1], x2 = 2*x*x, xw = 2*x*w, - y = q.to_vec()[2], y2 = 2*y*y, xy = 2*x*y, yw = 2*y*w, - z = q.to_vec()[3], z2 = 2*z*z, xz = 2*x*z, yz = 2*y*z, zw = 2*z*w; - - C t[9] = {1.f - y2 - z2, xy - zw, xz + yw, - xy + zw, 1.f - x2 - z2, yz - xw, - xz - yw, yz + xw, 1.f - x2 - y2}; - - this->m_ = mln::make::h_mat(t); + this->m_ = mln::make::h_mat(q); mln_assertion(check_rotation(q)); /// Update attributes. diff --git a/milena/mln/make/h_mat.hh b/milena/mln/make/h_mat.hh index d124ccf..1ab2dc0 100644 --- a/milena/mln/make/h_mat.hh +++ b/milena/mln/make/h_mat.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2012 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -41,7 +42,7 @@ namespace mln { - /// Create an mln::algebra::mat<n,n,T>. + /// Create an mln::algebra::h_mat<n,T>. /* * \param[in] tab C-array of values. * @@ -51,6 +52,14 @@ namespace mln algebra::h_mat<mlc_sqrt_int(N), T> h_mat(const T (&tab)[N]); + /*! \brief Create a rotation matrix as mln::algebra::h_mat<n,T>. + + \param[in] q A quaternion. + + \return A rotation matrix based on \p q. + */ + template <typename C> + algebra::h_mat<3, C> h_mat(const C& v, const algebra::quat& q); # ifndef MLN_INCLUDE_ONLY @@ -67,6 +76,31 @@ namespace mln return tmp; } + + template <typename C> + inline + algebra::h_mat<3, C> + h_mat(const C& v, const algebra::quat& q) + { + mln_precondition(q.is_unit()); + (void) v; + + algebra::h_mat<3, C> m; + C + w = q.to_vec()[0], + x = q.to_vec()[1], x2 = 2*x*x, xw = 2*x*w, + y = q.to_vec()[2], y2 = 2*y*y, xy = 2*x*y, yw = 2*y*w, + z = q.to_vec()[3], z2 = 2*z*z, xz = 2*x*z, yz = 2*y*z, zw = 2*z*w; + + C t[9] = {1.f - y2 - z2, xy - zw, xz + yw, + xy + zw, 1.f - x2 - z2, yz - xw, + xz - yw, yz + xw, 1.f - x2 - y2}; + + m = mln::make::h_mat(t); + return m; + } + + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::make diff --git a/milena/mln/value/builtin/integers.hh b/milena/mln/value/builtin/integers.hh index 05cbede..8cc173c 100644 --- a/milena/mln/value/builtin/integers.hh +++ b/milena/mln/value/builtin/integers.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -81,6 +82,7 @@ namespace mln static const E min() { return mln::value::internal::limits<E>::min(); } static const E max() { return mln::value::internal::limits<E>::max(); } + static const E epsilon() { return mln::value::internal::limits<E>::epsilon(); } typedef float sum; }; diff --git a/milena/tests/algebra/h_mat.cc b/milena/tests/algebra/h_mat.cc index a5bb31c..7a30f6b 100644 --- a/milena/tests/algebra/h_mat.cc +++ b/milena/tests/algebra/h_mat.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2009, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -26,34 +27,55 @@ #include <mln/fun/i2v/all_to.hh> #include <mln/algebra/mat.hh> #include <mln/algebra/h_mat.hh> +#include <mln/make/h_mat.hh> +template <typename T> +bool about_equal(const T& f, const T& q) +{ + return mln::math::abs(q - f) <= 0.000001; +} + int main() { using namespace mln; - algebra::mat<1,3,float> m1; - m1.set_all(4); - algebra::mat<2,2,float> m2 = literal::identity; + // Reading in h_mat. + algebra::h_mat<3,float> hm2(all_to(2.5)); + for (int i = 0; i < 4; ++i) + for (int j = 0; j < 4; ++j) + mln_assertion(hm2(i, j) == 2.5f); + // Conversion from mat to h_mat + algebra::mat<2,2,float> m2 = literal::identity; algebra::h_mat<1,float> hm1(m2); - algebra::h_mat<2,float> hm2; - algebra::h_mat<3,float> hm3(all_to(1.5)); + mln_assertion(m2.size() == hm1.size()); + for (int i = 0; i < 2; ++i) + for (int j = 0; j < 2; ++j) + mln_assertion(m2(i, j) == hm1(i, j)); + // Conversion from h_mat to mat. + algebra::h_mat<3,float> hm3(all_to(1.5)); algebra::mat<4,4,float> m4 = hm3; + mln_assertion(m4.size() == hm3.size()); + for (int i = 0; i < 4; ++i) + for (int j = 0; j < 4; ++j) + mln_assertion(m4(i, j) == hm3(i, j)); - std::cout << "m1 = " << m1 << ";" << std::endl; - std::cout << "m2 = " << m2 << ";" << std::endl; - std::cout << "m4 = " << m4 << ";" << std::endl; - std::cout << "hm1 = " << hm1 << ";" << std::endl; - std::cout << "hm2 = " << hm2 << ";" << std::endl; - std::cout << "hm3 = " << hm3 << ";" << std::endl; + // Check from_to_ overloads. { - algebra::h_mat<2,float> m, m2; - m = m2; - // FIXME: Test *many* => runs ok... + algebra::quat q_ref(0.92388, 0.186238, 0.310397, 0.124159); + double vals[9] = { 0.776477, -0.113801, 0.619785, + 0.345031, 0.8998, -0.267046, + -0.527293, 0.4212, 0.737938 }; + algebra::h_mat<3,double> m = make::h_mat(vals); + algebra::quat q2; + algebra::from_to_(m, q2); + + for (int i = 0; i < 4; ++i) + mln_assertion(about_equal(q_ref.to_vec()[i], q2.to_vec()[i])); } } diff --git a/milena/tests/make/h_mat.cc b/milena/tests/make/h_mat.cc index a737252..eaf232e 100644 --- a/milena/tests/make/h_mat.cc +++ b/milena/tests/make/h_mat.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2012 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -24,6 +25,7 @@ // executable file might be covered by the GNU General Public License. #include <mln/make/h_mat.hh> +#include <mln/math/abs.hh> static const int result[4][4] = { { 2, 3, 4, 0 }, @@ -31,6 +33,19 @@ static const int result[4][4] = { { 2, 3, 4, 0 }, { 8, 9, 10, 0 }, { 0, 0, 0, 1 } }; +static const double result_q[4][4] = { { 0.776477, -0.113801, 0.619785, 0 }, + { 0.345031, 0.8998, -0.267046, 0 }, + { -0.527293, 0.4212, 0.737938, 0 }, + { 0, 0, 0, 1 } }; + + +template <typename T> +bool about_equal(const T& f, const T& q) +{ + return mln::math::abs(q - f) <= 0.000001; +} + + int main() { using namespace mln; @@ -39,8 +54,27 @@ int main() 5, 6, 7, 8, 9, 10 }; algebra::h_mat<3,int> m = make::h_mat(vals); - + for (unsigned i = 0; i < 4; ++i) for (unsigned j = 0; j < 4; ++j) mln_assertion(m(i,j) == result[i][j]); + + + // Checking creation from quaternions. + { + algebra::vec<3,double> v; + v[0] = 1; + v[1] = 2; + v[2] = 3; + v.normalize(); + + algebra::quat q(0.92388, 0.186238, 0.310397, 0.124159); + q.set_unit(); + + algebra::h_mat<3,double> mat = make::h_mat(double(), q); + + for (unsigned i = 0; i < 4; ++i) + for (unsigned j = 0; j < 4; ++j) + mln_assertion(about_equal(mat(i,j), result_q[i][j])); + } } -- 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<I>& 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<I>& 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<I>& 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<I>& 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