January 2013 - Olena-patches

olena-2.0-194-g15818fb mln/world/k1/un_immerse.hh: Work in K1 space instead of K2.
by Guillaume Lazzara 28 Jan '13

28 Jan '13

--- milena/mln/world/k1/un_immerse.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/milena/mln/world/k1/un_immerse.hh b/milena/mln/world/k1/un_immerse.hh index 8c352ca..6acb0bd 100644 --- a/milena/mln/world/k1/un_immerse.hh +++ b/milena/mln/world/k1/un_immerse.hh @@ -79,7 +79,7 @@ namespace mln const I& ima = exact(ima_); mln_precondition(ima.is_valid()); - mln_ch_value(I,V) output = kn::un_immerse(ima, 2, new_value_type); + mln_ch_value(I,V) output = kn::un_immerse(ima, 1, new_value_type); trace::exiting("mln::world::k1::un_immerse"); return output; -- 1.7.2.5

1 0

olena-2.0-136-gd437055 Fix binarization programs.
by Guillaume Lazzara 24 Jan '13

24 Jan '13

* src/binarization/sauvola_ms.cc: Add negate option. * src/binarization/sauvola_ms_debug.cc: Fix invalid k parameter value. --- scribo/ChangeLog | 9 +++++++++ scribo/src/binarization/sauvola_ms.cc | 7 ++++++- scribo/src/binarization/sauvola_ms_debug.cc | 8 ++++---- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 64e13a6..8d45b42 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,12 @@ +2013-01-24 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix binarization programs. + + * src/binarization/sauvola_ms.cc: Add negate option. + + * src/binarization/sauvola_ms_debug.cc: Fix invalid k parameter + value. + 2012-11-05 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/binarization/sauvola_ms.hh: Fix overlapping area diff --git a/scribo/src/binarization/sauvola_ms.cc b/scribo/src/binarization/sauvola_ms.cc index 970e2aa..f05186a 100644 --- a/scribo/src/binarization/sauvola_ms.cc +++ b/scribo/src/binarization/sauvola_ms.cc @@ -33,6 +33,7 @@ #include <mln/data/transform.hh> #include <mln/fun/v2v/rgb_to_luma.hh> #include <mln/util/timer.hh> +#include <mln/logical/not.hh> #include <scribo/binarization/sauvola_ms.hh> #include <scribo/debug/option_parser.hh> @@ -50,6 +51,7 @@ static const scribo::debug::arg_data arg_desc[] = static const scribo::debug::toggle_data toggle_desc[] = { // name, description, default value + { "negate", "Negate output image.", false}, {0, 0, false} }; @@ -147,5 +149,8 @@ int main(int argc, char *argv[]) scribo::debug::logger().stop_local_time_logging("Binarized in"); - io::magick::save(output, options.arg("output.*")); + if (options.is_enabled("negate")) + io::magick::save(logical::not_(output), options.arg("output.*")); + else + io::magick::save(output, options.arg("output.*")); } diff --git a/scribo/src/binarization/sauvola_ms_debug.cc b/scribo/src/binarization/sauvola_ms_debug.cc index d4dcc14..434556a 100644 --- a/scribo/src/binarization/sauvola_ms_debug.cc +++ b/scribo/src/binarization/sauvola_ms_debug.cc @@ -66,9 +66,9 @@ static const scribo::debug::opt_data opt_desc[] = "given prefix.", "<prefix>", 0, 1, 0 }, { "all-k", "Sauvola's formulae parameter", "<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", "Sauvola's formulae parameter", "<value>", 0, 1, 0 }, + { "k3", "Sauvola's formulae parameter", "<value>", 0, 1, 0 }, + { "k4", "Sauvola's formulae parameter", "<value>", 0, 1, 0 }, { "s", "First subsampling ratio. Possible values: 2 or 3.", "ratio", scribo::debug::check_sauvola_first_subsampling, 1, "3" }, @@ -190,7 +190,7 @@ int main(int argc, char *argv[]) for (unsigned i = 0; i < geom::nrows(output); ++i) for (unsigned j = 0; j < geom::ncols(output); ++j) if (output.at_(i,j)) - scale_bin.at_(i,j) = binarization::internal::debug_e_2.at_(i/3, j/3); + scale_bin.at_(i,j) = binarization::internal::debug_e_2.at_(i/s, j/s); else scale_bin.at_(i,j) = 0; -- 1.7.2.5

1 0

olena-2.0-136-g3e26b9e Fix binarization programs.
by Guillaume Lazzara 24 Jan '13

24 Jan '13

* src/binarization/sauvola_ms.cc: Add negate option. * src/binarization/sauvola_ms_debug.cc: Fix invalid k parameter value. --- scribo/ChangeLog | 9 +++++++++ scribo/src/binarization/sauvola_ms.cc | 7 ++++++- scribo/src/binarization/sauvola_ms_debug.cc | 8 ++++---- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 64e13a6..8d45b42 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,12 @@ +2013-01-24 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix binarization programs. + + * src/binarization/sauvola_ms.cc: Add negate option. + + * src/binarization/sauvola_ms_debug.cc: Fix invalid k parameter + value. + 2012-11-05 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/binarization/sauvola_ms.hh: Fix overlapping area diff --git a/scribo/src/binarization/sauvola_ms.cc b/scribo/src/binarization/sauvola_ms.cc index 970e2aa..f05186a 100644 --- a/scribo/src/binarization/sauvola_ms.cc +++ b/scribo/src/binarization/sauvola_ms.cc @@ -33,6 +33,7 @@ #include <mln/data/transform.hh> #include <mln/fun/v2v/rgb_to_luma.hh> #include <mln/util/timer.hh> +#include <mln/logical/not.hh> #include <scribo/binarization/sauvola_ms.hh> #include <scribo/debug/option_parser.hh> @@ -50,6 +51,7 @@ static const scribo::debug::arg_data arg_desc[] = static const scribo::debug::toggle_data toggle_desc[] = { // name, description, default value + { "negate", "Negate output image.", false}, {0, 0, false} }; @@ -147,5 +149,8 @@ int main(int argc, char *argv[]) scribo::debug::logger().stop_local_time_logging("Binarized in"); - io::magick::save(output, options.arg("output.*")); + if (options.is_enabled("negate")) + io::magick::save(logical::not_(output), options.arg("output.*")); + else + io::magick::save(output, options.arg("output.*")); } diff --git a/scribo/src/binarization/sauvola_ms_debug.cc b/scribo/src/binarization/sauvola_ms_debug.cc index d4dcc14..434556a 100644 --- a/scribo/src/binarization/sauvola_ms_debug.cc +++ b/scribo/src/binarization/sauvola_ms_debug.cc @@ -66,9 +66,9 @@ static const scribo::debug::opt_data opt_desc[] = "given prefix.", "<prefix>", 0, 1, 0 }, { "all-k", "Sauvola's formulae parameter", "<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", "Sauvola's formulae parameter", "<value>", 0, 1, 0 }, + { "k3", "Sauvola's formulae parameter", "<value>", 0, 1, 0 }, + { "k4", "Sauvola's formulae parameter", "<value>", 0, 1, 0 }, { "s", "First subsampling ratio. Possible values: 2 or 3.", "ratio", scribo::debug::check_sauvola_first_subsampling, 1, "3" }, @@ -190,7 +190,7 @@ int main(int argc, char *argv[]) for (unsigned i = 0; i < geom::nrows(output); ++i) for (unsigned j = 0; j < geom::ncols(output); ++j) if (output.at_(i,j)) - scale_bin.at_(i,j) = binarization::internal::debug_e_2.at_(i/3, j/3); + scale_bin.at_(i,j) = binarization::internal::debug_e_2.at_(i/s, j/s); else scale_bin.at_(i,j) = 0; -- 1.7.2.5

1 0

olena-2.0-135-ga0864da mln/labeling/colorize.hh: Do not recompute previously computed colors.
by Guillaume Lazzara 24 Jan '13

24 Jan '13

--- scribo/scribo/binarization/sauvola_ms.hh | 47 ++++++----------------------- 1 files changed, 10 insertions(+), 37 deletions(-) diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index 8be92e5..f68d053 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -211,7 +211,6 @@ namespace scribo { if (f.msk.element(p)) { - mln_site_(I) sq = site * ratio; if (f.parent.element(p) == p) @@ -874,30 +873,6 @@ namespace scribo initialize(e_2, sub_ima[2]); data::fill(e_2, 0u); - // Computing optimal object area for each scale. - // unsigned w_1_sq = w_1 * w_1; - // unsigned q_2 = std::pow(float(q), float(2)); - // unsigned min_area = (5 * w_1_sq) / (4 * q_2); - // unsigned max_area = (w_1_sq + (q_2) * w_1_sq) / 4; - - - // mln::util::array<unsigned> area(sub_ima.size(), 0); - // area[2] = s * s * w_1 * w_1; - // for (unsigned i = 3; i < area.nelements(); ++i) - // area[i] = std::pow(float(q), float(i * 2 - 4)) * area[2]; - - mln::util::array<unsigned> win_w(sub_ima.size(), 0); - win_w[2] = s * w_1; - for (unsigned i = 3; i < win_w.nelements(); ++i) - { - win_w[i] = q * win_w[i - 1]; - if (!(win_w[i] % 2)) - ++win_w[i]; - } - - float coeff_max = 1.6; - float coeff_min = 1.4; - # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG internal::debug_scale_proba = image3d<double>(3, @@ -910,13 +885,17 @@ namespace scribo == Step 2 - Object selection at each scale == ===========================================*/ + float + min_coef = 0.8, + max_s2 = (w_1 * w_1) / (s * s) * 0.7, + q_2 = q * q; + + // Highest scale -> no maximum component size. { int i = sub_ima.size() - 1; t_ima[i] = internal::compute_t_n_and_e_2(sub_ima[i], e_2, -// (8096 / 144) / coeff, -// 44 / coeff, - win_w[i] / s / coeff_max, + (max_s2 * q_2) / (q_2) * min_coef, mln_max(unsigned), s, q, i, w_work, @@ -928,12 +907,8 @@ namespace scribo for (int i = sub_ima.size() - 2; i > 2; --i) { t_ima[i] = internal::compute_t_n_and_e_2(sub_ima[i], e_2, -// 22 / coeff, -// 201 * coeff, - win_w[i] / s / coeff_min, - win_w[i] * s * coeff_max, -// (810 / 36) / coeff, -// (8096 / 36) * coeff, + max_s2 / (q_2) * min_coef, + max_s2 * q_2, s, q, i, w_work, integral_sum_sum_2); @@ -945,9 +920,7 @@ namespace scribo t_ima[2] = internal::compute_t_n_and_e_2(sub_ima[2], e_2, // FIXME: was '0'. '2' is to avoid too much noise with k=0.2. 2, -// 99 * coeff, - win_w[2] * s * coeff_max, -// (810 / 9) * coeff, + max_s2, s, 1, 2, w_work, integral_sum_sum_2); } -- 1.7.2.5

1 0

[Olena] #266: Improve PDF rendering of the documentation
by Olena Trac 17 Jan '13

17 Jan '13

#266: Improve PDF rendering of the documentation -------------------------+-------------------------------------------------- Reporter: lazzara | Owner: Olena Team Type: enhancement | Status: new Priority: major | Milestone: Olena 2.2 Component: Olena | Version: 2.0 Keywords: | -------------------------+-------------------------------------------------- Some references and illustrations are not correctly rendered in the PDF version. The overall layout could be also improved. -- Ticket URL: <https://trac.lrde.org/olena/ticket/266> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

1 0

olena-2.0-133-g05ee3ad mln/histo/equalize.hh: Fix.
by Guillaume Lazzara 14 Jan '13

14 Jan '13

--- milena/ChangeLog | 4 ++++ milena/mln/histo/equalize.hh | 24 +++++++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a9f96d8..d9f0ffa 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2012-11-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/histo/equalize.hh: Fix. + +2012-11-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/histo/equalize.hh: Revamp. 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/mln/histo/equalize.hh b/milena/mln/histo/equalize.hh index d1de0e9..7f994df 100644 --- a/milena/mln/histo/equalize.hh +++ b/milena/mln/histo/equalize.hh @@ -27,6 +27,7 @@ #ifndef MLN_HISTO_EQUALIZE_HH # define MLN_HISTO_EQUALIZE_HH +# include <cmath> # include <mln/core/concept/image.hh> # include <mln/histo/all.hh> @@ -43,6 +44,9 @@ namespace mln /*! \brief Equalizes the histogram of image \p input. \author J. Fabrizio, R. Levillain + + Source: + http://en.wikipedia.org/wiki/Histogram_equalization */ template <typename I> mln_concrete(I) equalize(const Image<I>& input); @@ -63,19 +67,25 @@ namespace mln array<V> histogram = compute(input); array<V> histo_correction; - unsigned cumulation = 0; - unsigned number_of_pixels = input.nsites(); - //int number_of_colors=histogram.nvalues(); - //int number_of_colors=mln_card(V); + unsigned nsites = input.nsites(); V max_color = mln_max(V); + unsigned h_min = nsites; mln_viter(mln::value::set<V>) v(histogram.vset()); + + // Looking for minimum occurence in histogram + for_all(v) + if (histogram(v) > 0 && h_min > histogram(v)) + h_min = histogram(v); + + // Computing new histogram. + unsigned cdf_v = 0; for_all(v) if (histogram(v) != 0) { - cumulation += histogram(v); - histo_correction(v) = (/*number_of_colors-1*/max_color) - * cumulation / number_of_pixels; + cdf_v += histogram(v); + histo_correction(v) + = round((cdf_v - h_min) / (float)(nsites - h_min) * max_color); } mln_concrete(I) output; -- 1.7.2.5

1 0

olena-2.0-132-g27529df mln/histo/equalize.hh: Revamp.
by Guillaume Lazzara 14 Jan '13

14 Jan '13

--- milena/ChangeLog | 4 +++ milena/mln/histo/equalize.hh | 48 +++++++++++++++++++++-------------------- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 054c6fd..a9f96d8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2012-11-13 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/histo/equalize.hh: Revamp. + 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/unit_test/unit-tests.mk: Regen. diff --git a/milena/mln/histo/equalize.hh b/milena/mln/histo/equalize.hh index 223499a..d1de0e9 100644 --- a/milena/mln/histo/equalize.hh +++ b/milena/mln/histo/equalize.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2012 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -23,15 +24,15 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_HISTO_EQUALIZATION_HH -# define MLN_HISTO_EQUALIZATION_HH +#ifndef MLN_HISTO_EQUALIZE_HH +# define MLN_HISTO_EQUALIZE_HH # include <mln/core/concept/image.hh> # include <mln/histo/all.hh> /// \file /// -/// Function histogram equalization. +/// Histogram equalization. namespace mln { @@ -39,13 +40,12 @@ namespace mln namespace histo { - /** - Equalizes the histogram of image \p input. + /*! \brief Equalizes the histogram of image \p input. + \author J. Fabrizio, R. Levillain */ template <typename I> - mln_concrete(I) - equalize(const Image<I>& input); + mln_concrete(I) equalize(const Image<I>& input); # ifndef MLN_INCLUDE_ONLY @@ -54,36 +54,38 @@ namespace mln mln_concrete(I) equalize(const Image<I>& input_) { - trace::entering("histo::equalize"); + trace::entering("mln::histo::equalize"); const I& input = exact(input_); - mln_concrete(I) out_image; + mln_precondition(input.is_valid()); - array<mln_value(I)> histogram = compute(input); - array<mln_value(I)> histogram_correction; + typedef mln_value(I) V; + array<V> histogram = compute(input); + array<V> histo_correction; unsigned cumulation = 0; - int number_of_pixels = input.nsites(); + unsigned number_of_pixels = input.nsites(); //int number_of_colors=histogram.nvalues(); - //int number_of_colors=mln_card(mln_value(I)); - int max_color = mln_max(mln_value(I)); - mln_piter(I) p(input.domain()); + //int number_of_colors=mln_card(V); + V max_color = mln_max(V); - mln_viter(mln::value::set<mln_value(I)>) v(histogram.vset()); + mln_viter(mln::value::set<V>) v(histogram.vset()); for_all(v) if (histogram(v) != 0) { cumulation += histogram(v); - histogram_correction(v) = (/*number_of_colors-1*/max_color) + histo_correction(v) = (/*number_of_colors-1*/max_color) * cumulation / number_of_pixels; } - initialize(out_image, input); + mln_concrete(I) output; + initialize(output, input); + mln_piter(I) p(input.domain()); for_all(p) - out_image(p) = histogram_correction[input(p)]; + output(p) = histo_correction[input(p)]; - trace::exiting("histo::equalize"); - return out_image; + trace::exiting("mln::histo::equalize"); + return output; } # endif // ! MLN_INCLUDE_ONLY @@ -94,4 +96,4 @@ namespace mln -#endif // ! MLN_HISTO_EQUALIZATION_HH +#endif // ! MLN_HISTO_EQUALIZE_HH -- 1.7.2.5

1 0

olena-2.0-131-g2d34749 scribo/binarization/sauvola_ms.hh: Fix overlapping area criterion.
by Guillaume Lazzara 14 Jan '13

14 Jan '13

--- scribo/ChangeLog | 5 +++++ scribo/scribo/binarization/sauvola_ms.hh | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 615a624..64e13a6 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,8 @@ +2012-11-05 Guillaume Lazzara <z(a)lrde.epita.fr> + + * scribo/binarization/sauvola_ms.hh: Fix overlapping area + criterion. + 2012-09-10 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/binarization/sauvola_ms.hh: Add comments. diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index 0bc595e..8be92e5 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -895,7 +895,8 @@ namespace scribo ++win_w[i]; } - float coeff = 1.4; + float coeff_max = 1.6; + float coeff_min = 1.4; # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG @@ -915,7 +916,7 @@ namespace scribo t_ima[i] = internal::compute_t_n_and_e_2(sub_ima[i], e_2, // (8096 / 144) / coeff, // 44 / coeff, - win_w[i] / s / coeff, + win_w[i] / s / coeff_max, mln_max(unsigned), s, q, i, w_work, @@ -929,8 +930,8 @@ namespace scribo t_ima[i] = internal::compute_t_n_and_e_2(sub_ima[i], e_2, // 22 / coeff, // 201 * coeff, - win_w[i] / s / coeff, - win_w[i] * s * coeff, + win_w[i] / s / coeff_min, + win_w[i] * s * coeff_max, // (810 / 36) / coeff, // (8096 / 36) * coeff, s, @@ -945,7 +946,7 @@ namespace scribo // FIXME: was '0'. '2' is to avoid too much noise with k=0.2. 2, // 99 * coeff, - win_w[2] * s * coeff, + win_w[2] * s * coeff_max, // (810 / 9) * coeff, s, 1, 2, w_work, integral_sum_sum_2); -- 1.7.2.5

1 0

branch papers/lazzara.12.ijdar deleted: olena-2.0-131-gc671343
by git＠lrde.epita.fr 14 Jan '13

14 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch papers/lazzara.12.ijdar has been deleted was c671343e8aba129d47b890f655175d3f3c07a769 ----------------------------------------------------------------------- c671343e8aba129d47b890f655175d3f3c07a769 src/binarization/sauvola_ms.cc: Use global timer instead of local one. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch papers/lazzara.13.ijdar created: olena-2.0-134-gb0bb6e9
by git＠lrde.epita.fr 14 Jan '13

14 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch papers/lazzara.13.ijdar has been created at b0bb6e941bc9f919230b4325eb2b1c7a3013965f (commit) - Log ----------------------------------------------------------------- b0bb6e9 mln/labeling/colorize.hh: Do not recompute previously computed colors. 05ee3ad mln/histo/equalize.hh: Fix. 27529df mln/histo/equalize.hh: Revamp. 2d34749 scribo/binarization/sauvola_ms.hh: Fix overlapping area criterion. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0