August 2012 - Olena-patches

olena-2.0-71-gd984d2d z/skewness/skewness2.cc: New.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

--- scribo/sandbox/ChangeLog | 4 + scribo/sandbox/z/skewness/skewness2.cc | 154 ++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+), 0 deletions(-) create mode 100644 scribo/sandbox/z/skewness/skewness2.cc diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index 10376fc..c87381c 100644 --- a/scribo/sandbox/ChangeLog +++ b/scribo/sandbox/ChangeLog @@ -1,5 +1,9 @@ 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * z/skewness/skewness2.cc: New. + +2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * z/skewness/skewness.cc: New. 2010-11-25 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/sandbox/z/skewness/skewness2.cc b/scribo/sandbox/z/skewness/skewness2.cc new file mode 100644 index 0000000..642ae3f --- /dev/null +++ b/scribo/sandbox/z/skewness/skewness2.cc @@ -0,0 +1,154 @@ +#include <mln/io/pgm/all.hh> +#include <mln/io/pbm/all.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/dmorph/sub_image.hh> +#include <mln/pw/all.hh> +#include <mln/value/int_u8.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/neighb.hh> +#include <mln/win/rectangle2d.hh> +#include <mln/extension/adjust.hh> +#include <mln/border/mirror.hh> +#include <mln/extension/duplicate.hh> +#include <mln/core/alias/window2d.hh> + +#include <mln/data/convert.hh> +#include <mln/data/stretch.hh> +#include <mln/debug/println.hh> +#include <mln/data/transform.hh> +#include <mln/io/dump/save.hh> +#include <mln/accu/math/sumpow.hh> +#include <mln/accu/stat/mean.hh> +#include <mln/data/compute_in_window.hh> +#include <mln/core/var.hh> +#include <mln/data/saturate.hh> +#include <mln/fun/v2b/threshold_le.hh> +#include <mln/arith/revert.hh> +#include <mln/util/timer.hh> + +mln::image2d<double> skewness; + +#include <scribo/binarization/sauvola_ms.hh> + +mln::image2d<bool> skewness_pbm; +std::string prefix; + + +int main(int argc, char *argv[]) +{ + using namespace mln; + + if (argc != 4) + { + std::cerr << "Usage: " << argv[0] << " <input.pgm> <prefix> <win_size>" << std::endl; + return 1; + } + + util::timer tt; + tt.start(); + util::timer t; + + t.start(); + image2d<value::int_u8> input; + io::pgm::load(input, argv[1]); + + prefix = argv[2]; + + int win_size = atoi(argv[3]); + win::rectangle2d wr = win::rectangle2d(win_size,win_size); + window2d win; + win.insert(wr); + + accu::pair<accu::stat::mean<value::int_u8,double>, + accu::pair<accu::math::sumpow<2,value::int_u8,double>, + accu::math::sumpow<3,value::int_u8,double> > > accu; + t.stop(); + std::cout << "initialization - " << t << std::endl; + + + t.restart(); + mln_VAR(res, data::compute_in_window(accu, input, win)); + t.stop(); + std::cout << "compute in window - " << t << std::endl; + + initialize(skewness, res); + data::fill(skewness, 0); + + + point2d pc = input.domain().pcenter(); + std::cout << pc << " - sum_2 = " << res(pc).second.first << " - sum_3 = " << res(pc).second.second << " - mean = " << res(pc).first << std::endl; + + t.restart(); + { + int n; + mln_pixter_(image2d<double>) p(skewness); + for_all(p) + { + n = win.size(); + mln_VAR(d, res.element(p.offset())); + double m = d.first; + double sum_3 = d.second.second; + double sum_2 = d.second.first; + p.val() = (sum_3 - 3. * m * sum_2) / (double) n + 2. * std::pow(m, 3); + } + } + t.stop(); + std::cout << "Compute unskew - " << t << std::endl; + + + // t.restart(); + // skewness_pbm = data::transform(skewness, fun::v2b::threshold_le<double>(0)); + // t.stop(); + // std::cout << "binarize - " << t << std::endl; + + // { + // io::dump::save(skewness, prefix + "skewness.dump"); + // io::pgm::save(data::convert(value::int_u8(), skewness), prefix + "skewness_u8.pgm"); + // io::pgm::save(data::stretch(value::int_u8(), skewness), prefix + "skewness_stretch.pgm"); + // io::pbm::save(skewness_pbm, prefix + "skewness.pbm"); + // } + + t.restart(); + { + border::resize(skewness, input.border()); + mln_pixter_(image2d<value::int_u8>) p(input); + for_all(p) + { + if (skewness.element(p.offset()) > 0) + p.val() = mln_max(value::int_u8) - p.val(); + } + } + t.stop(); + std::cout << "Negate parts of input image - " << t << std::endl; + + t.restart(); + image2d<bool> bin = scribo::binarization::sauvola_ms(input, 101, 2); + std::cout << "sauvola_ms - " << t << std::endl; + + + std::cout << "Total time : " << tt << std::endl; + // prefix += "i_"; + + // image2d<bool> bin_i = scribo::binarization::sauvola(arith::revert(input), 51); + + // prefix = argv[2]; + + io::pbm::save(bin, prefix + "bin.pbm"); + // io::pbm::save(bin_i, prefix + "bin_i.pbm"); + + // image2d<bool> out; + // initialize(out, bin); + // mln_piter_(image2d<bool>) p(out.domain()); + // for_all(p) + // if (skewness_pbm(p)) + // out(p) = bin(p); + // else + // out(p) = bin_i(p); + + // io::pbm::save(out, prefix + "output.pbm"); + + // io::dump::save(scribo::binarization::internal::debug_stddev, prefix + "stddev.dump"); + // io::dump::save(scribo::binarization::internal::debug_mean, prefix + "mean.dump"); + // io::dump::save(scribo::binarization::internal::debug_threshold, prefix + "threshold.dump"); + +} -- 1.7.2.5

1 0

olena-2.0-70-gb90f28d mln/data/compute_in_window.hh: Fix warnings.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

--- milena/ChangeLog | 4 ++++ milena/mln/data/compute_in_window.hh | 17 ++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 96019b5..5ad6a19 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/data/compute_in_window.hh: Fix warnings. + 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/data/compute_in_window.hh b/milena/mln/data/compute_in_window.hh index 297a923..c47501c 100644 --- a/milena/mln/data/compute_in_window.hh +++ b/milena/mln/data/compute_in_window.hh @@ -23,8 +23,8 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_DATA_COMPUTE_HH -# define MLN_DATA_COMPUTE_HH +#ifndef MLN_DATA_COMPUTE_IN_WINDOW_HH +# define MLN_DATA_COMPUTE_IN_WINDOW_HH /// \file /// @@ -76,10 +76,13 @@ namespace mln compute_in_window_tests(const Accumulator<A>& a, const Image& input_, const Window<W>& win_) { - (void) a; const W& win = exact(win_); const I& input = exact(input_); + (void) a; + (void) win; + (void) input; + mln_assertion(win.is_valid()); mln_assertion(input.is_valid()); } @@ -142,15 +145,15 @@ namespace mln internal::compute_in_window_tests(a, input, win); + extension::adjust(input, win); + border::mirror(input); + typedef mln_ch_value(I, A) J; J accu; initialize(accu, input); accu::image::init(accu); - extension::adjust(input, win); - border::mirror(input); - mln_pixter(J) p(accu); mln_qixter(J, W) q(p, win); @@ -245,4 +248,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_DATA_COMPUTE_HH +#endif // ! MLN_DATA_COMPUTE_IN_WINDOW_HH -- 1.7.2.5

1 0

olena-2.0-69-g9a65533 z/skewness/skewness.cc: New.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

--- scribo/sandbox/ChangeLog | 4 + scribo/sandbox/z/skewness/skewness.cc | 128 +++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 0 deletions(-) create mode 100644 scribo/sandbox/z/skewness/skewness.cc diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index 24b948f..10376fc 100644 --- a/scribo/sandbox/ChangeLog +++ b/scribo/sandbox/ChangeLog @@ -1,3 +1,7 @@ +2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + * z/skewness/skewness.cc: New. + 2010-11-25 Guillaume Lazzara <z(a)lrde.epita.fr> Fix encoding issues in xml_transform. diff --git a/scribo/sandbox/z/skewness/skewness.cc b/scribo/sandbox/z/skewness/skewness.cc new file mode 100644 index 0000000..0280fa3 --- /dev/null +++ b/scribo/sandbox/z/skewness/skewness.cc @@ -0,0 +1,128 @@ +#include <mln/io/pgm/all.hh> +#include <mln/io/pbm/all.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/dmorph/sub_image.hh> +#include <mln/pw/all.hh> +#include <mln/value/int_u8.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/neighb.hh> +#include <mln/win/rectangle2d.hh> +#include <mln/extension/adjust.hh> +#include <mln/border/mirror.hh> +#include <mln/extension/duplicate.hh> +#include <mln/core/alias/window2d.hh> + +#include <mln/data/convert.hh> +#include <mln/data/stretch.hh> +#include <mln/debug/println.hh> +#include <mln/data/transform.hh> +#include <mln/fun/v2b/threshold.hh> +#include <mln/io/dump/save.hh> + +mln::image2d<double> skewness; + +#include <scribo/binarization/sauvola.hh> + +namespace mln +{ + + template <typename T, typename N> + std::pair<image2d<double>, image2d<double> > + init_(const image2d<T>& ima, const N& nbh) + { + image2d<double> output_2, output_3; + initialize(output_2, ima); + initialize(output_3, ima); + extension::adjust(ima, nbh); + border::mirror(ima); + + typedef image2d<T> I; + mln_piter(I) p(ima.domain()); + mln_niter(N) n(nbh, p); + + extension::duplicate(ima); + + for_all(p) + { + double sum = ima(p); + for_all(n) + sum += ima(n); + + double mean = sum / (double)nbh.size(); + double + res_2 = std::pow(ima(p) - mean, 2), + res_3 = std::pow(ima(p) - mean, 3); + for_all(n) + { + res_2 += std::pow(ima(n) - mean, 2); + res_3 += std::pow(ima(n) - mean, 3); + } + + output_2(p) = res_2; + output_3(p) = res_3; + } + + return std::pair<image2d<double>, image2d<double> >(output_2, output_3); + } + + +} + + + +int main(int argc, char *argv[]) +{ + using namespace mln; + + if (argc != 4) + { + std::cerr << "Usage: " << argv[0] << " <input.pgm> <prefix> <win_size>" << std::endl; + return 1; + } + + image2d<value::int_u8> input; + io::pgm::load(input, argv[1]); + std::string prefix = argv[2]; + + int win_size = atoi(argv[3]); + win::rectangle2d wr = win::rectangle2d(win_size,win_size); + window2d win; + win.insert(wr); + + std::pair<image2d<double>, image2d<double> > res_init = init_(input, neighb<window2d>(win)); + + image2d<double> x_mean_2 = res_init.first; + image2d<double> x_mean_3 = res_init.second; + + { + io::pgm::save(data::stretch(value::int_u8(), x_mean_2), prefix + "x_mean_2_stretch.pgm"); + io::pgm::save(data::stretch(value::int_u8(), x_mean_3), prefix + "x_mean_3_stretch.pgm"); + } + + + initialize(skewness, x_mean_2); + data::fill(skewness, 0); + + int n; + mln_piter_(image2d<double>) p(skewness.domain()); + for_all(p) + { + n = win.size(); + double frac = std::pow(std::sqrt((1.0/(double)n * x_mean_2(p))), 3); + skewness(p) = (std::sqrt(n * (n - 1)) / (n - 2)) * ((1.0/(double)n * x_mean_3(p)) / frac); + + // if (p == point2d(5, 5)) + // std::cout << p << " - " << std::setprecision(8) << (double)x_mean_3(p) << " - " << (double)x_mean_2(p) << " - " << skewness(p) << std::endl; + } + + + { + io::dump::save(skewness, prefix + "skewness.dump"); + io::pgm::save(data::convert(value::int_u8(), skewness), prefix + "skewness_u8.pgm"); + io::pbm::save(data::transform(skewness, fun::v2b::threshold<double>(0)), prefix + "skewness.pbm"); + io::pgm::save(data::stretch(value::int_u8(), skewness), prefix + "skewness_stretch.pgm"); + } + +// image2d<bool> bin = scribo::binarization::sauvola(input, 51); +// io::pbm::save(bin, "input.pbm"); +} -- 1.7.2.5

1 0

olena-2.0-128-g9a4c370 tests/unit_test/unit-tests.mk: Regen.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

--- scribo/ChangeLog | 4 +++ scribo/tests/unit_test/unit-tests.mk | 48 ++++++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index fca0939..efcdef1 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + * tests/unit_test/unit-tests.mk: Regen. + 2012-08-22 Guillaume Lazzara <z(a)lrde.epita.fr> Add Singh algorithm. diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index 0318303..0690ff7 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -226,13 +226,25 @@ scribo_all \ scribo_binarization_all \ scribo_binarization_global_threshold \ scribo_binarization_global_threshold_auto \ -scribo_binarization_internal_compute_local_threshold \ -scribo_binarization_internal_first_pass_functor \ +scribo_binarization_internal_local_threshold_core \ scribo_binarization_internal_local_threshold_debug \ scribo_binarization_internal_niblack_formula \ +scribo_binarization_internal_niblack_functor \ +scribo_binarization_internal_niblack_functor_fast \ +scribo_binarization_internal_niblack_threshold_functor \ scribo_binarization_internal_sauvola_formula \ +scribo_binarization_internal_sauvola_functor \ +scribo_binarization_internal_sauvola_ms_functor \ +scribo_binarization_internal_sauvola_threshold_functor \ +scribo_binarization_internal_singh_formula \ +scribo_binarization_internal_singh_functor \ +scribo_binarization_internal_wolf_formula \ +scribo_binarization_internal_wolf_functor \ +scribo_binarization_internal_wolf_functor_fast \ +scribo_binarization_kim \ scribo_binarization_local_threshold \ scribo_binarization_niblack \ +scribo_binarization_niblack_fast \ scribo_binarization_niblack_threshold \ scribo_binarization_otsu \ scribo_binarization_otsu_threshold \ @@ -240,6 +252,8 @@ scribo_binarization_sauvola \ scribo_binarization_sauvola_ms \ scribo_binarization_sauvola_ms_split \ scribo_binarization_sauvola_threshold \ +scribo_binarization_singh \ +scribo_binarization_wolf \ scribo_canvas_integral_browsing \ scribo_convert_to_base64 \ scribo_core_all \ @@ -475,19 +489,36 @@ scribo_util_box_intersection \ scribo_util_box_is_included \ scribo_util_color_to_hex \ scribo_util_component_precise_outline \ -scribo_util_hex_to_color +scribo_util_compute_sub_domains \ +scribo_util_hex_to_color \ +scribo_util_init_integral_image \ +scribo_util_integral_sub_sum_sum2_functor \ +scribo_util_integral_sum_sum2_functor \ +scribo_util_integral_sum_sum2_global_min_functor scribo_all_SOURCES = scribo_all.cc scribo_binarization_all_SOURCES = scribo_binarization_all.cc scribo_binarization_global_threshold_SOURCES = scribo_binarization_global_threshold.cc scribo_binarization_global_threshold_auto_SOURCES = scribo_binarization_global_threshold_auto.cc -scribo_binarization_internal_compute_local_threshold_SOURCES = scribo_binarization_internal_compute_local_threshold.cc -scribo_binarization_internal_first_pass_functor_SOURCES = scribo_binarization_internal_first_pass_functor.cc +scribo_binarization_internal_local_threshold_core_SOURCES = scribo_binarization_internal_local_threshold_core.cc scribo_binarization_internal_local_threshold_debug_SOURCES = scribo_binarization_internal_local_threshold_debug.cc scribo_binarization_internal_niblack_formula_SOURCES = scribo_binarization_internal_niblack_formula.cc +scribo_binarization_internal_niblack_functor_SOURCES = scribo_binarization_internal_niblack_functor.cc +scribo_binarization_internal_niblack_functor_fast_SOURCES = scribo_binarization_internal_niblack_functor_fast.cc +scribo_binarization_internal_niblack_threshold_functor_SOURCES = scribo_binarization_internal_niblack_threshold_functor.cc scribo_binarization_internal_sauvola_formula_SOURCES = scribo_binarization_internal_sauvola_formula.cc +scribo_binarization_internal_sauvola_functor_SOURCES = scribo_binarization_internal_sauvola_functor.cc +scribo_binarization_internal_sauvola_ms_functor_SOURCES = scribo_binarization_internal_sauvola_ms_functor.cc +scribo_binarization_internal_sauvola_threshold_functor_SOURCES = scribo_binarization_internal_sauvola_threshold_functor.cc +scribo_binarization_internal_singh_formula_SOURCES = scribo_binarization_internal_singh_formula.cc +scribo_binarization_internal_singh_functor_SOURCES = scribo_binarization_internal_singh_functor.cc +scribo_binarization_internal_wolf_formula_SOURCES = scribo_binarization_internal_wolf_formula.cc +scribo_binarization_internal_wolf_functor_SOURCES = scribo_binarization_internal_wolf_functor.cc +scribo_binarization_internal_wolf_functor_fast_SOURCES = scribo_binarization_internal_wolf_functor_fast.cc +scribo_binarization_kim_SOURCES = scribo_binarization_kim.cc scribo_binarization_local_threshold_SOURCES = scribo_binarization_local_threshold.cc scribo_binarization_niblack_SOURCES = scribo_binarization_niblack.cc +scribo_binarization_niblack_fast_SOURCES = scribo_binarization_niblack_fast.cc scribo_binarization_niblack_threshold_SOURCES = scribo_binarization_niblack_threshold.cc scribo_binarization_otsu_SOURCES = scribo_binarization_otsu.cc scribo_binarization_otsu_threshold_SOURCES = scribo_binarization_otsu_threshold.cc @@ -495,6 +526,8 @@ scribo_binarization_sauvola_SOURCES = scribo_binarization_sauvola.cc scribo_binarization_sauvola_ms_SOURCES = scribo_binarization_sauvola_ms.cc scribo_binarization_sauvola_ms_split_SOURCES = scribo_binarization_sauvola_ms_split.cc scribo_binarization_sauvola_threshold_SOURCES = scribo_binarization_sauvola_threshold.cc +scribo_binarization_singh_SOURCES = scribo_binarization_singh.cc +scribo_binarization_wolf_SOURCES = scribo_binarization_wolf.cc scribo_canvas_integral_browsing_SOURCES = scribo_canvas_integral_browsing.cc scribo_convert_to_base64_SOURCES = scribo_convert_to_base64.cc scribo_core_all_SOURCES = scribo_core_all.cc @@ -730,5 +763,10 @@ scribo_util_box_intersection_SOURCES = scribo_util_box_intersection.cc scribo_util_box_is_included_SOURCES = scribo_util_box_is_included.cc scribo_util_color_to_hex_SOURCES = scribo_util_color_to_hex.cc scribo_util_component_precise_outline_SOURCES = scribo_util_component_precise_outline.cc +scribo_util_compute_sub_domains_SOURCES = scribo_util_compute_sub_domains.cc scribo_util_hex_to_color_SOURCES = scribo_util_hex_to_color.cc +scribo_util_init_integral_image_SOURCES = scribo_util_init_integral_image.cc +scribo_util_integral_sub_sum_sum2_functor_SOURCES = scribo_util_integral_sub_sum_sum2_functor.cc +scribo_util_integral_sum_sum2_functor_SOURCES = scribo_util_integral_sum_sum2_functor.cc +scribo_util_integral_sum_sum2_global_min_functor_SOURCES = scribo_util_integral_sum_sum2_global_min_functor.cc -- 1.7.2.5

1 0

olena-2.0-127-g2259dac tests/unit_test/unit-tests.mk: Regen.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

--- milena/ChangeLog | 4 ++++ milena/tests/unit_test/unit-tests.mk | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4fe25e6..054c6fd 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + * tests/unit_test/unit-tests.mk: Regen. + 2012-05-28 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/fun/x2x/rotation.hh: Remove alpha and axis attributes. diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 3a14188..e03e59a 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -125,6 +125,7 @@ mln_accu_math_count \ mln_accu_math_essential \ mln_accu_math_inf \ mln_accu_math_sum \ +mln_accu_math_sumpow \ mln_accu_math_sup \ mln_accu_max_site \ mln_accu_nil \ @@ -497,6 +498,7 @@ mln_data_approx_essential \ mln_data_approx_median \ mln_data_compare \ mln_data_compute \ +mln_data_compute_in_window \ mln_data_convert \ mln_data_essential \ mln_data_fast_median \ @@ -719,6 +721,7 @@ mln_fun_x2x_rotation \ mln_fun_x2x_translation \ mln_geom_all \ mln_geom_bbox \ +mln_geom_bottom_left \ mln_geom_chamfer \ mln_geom_complex_geometry \ mln_geom_crop \ @@ -746,6 +749,7 @@ mln_geom_seeds2tiling_roundness \ mln_geom_size1d \ mln_geom_size2d \ mln_geom_size3d \ +mln_geom_top_right \ mln_geom_translate \ mln_geom_vertical_symmetry \ mln_graph_all \ @@ -1455,6 +1459,7 @@ mln_accu_math_count_SOURCES = mln_accu_math_count.cc mln_accu_math_essential_SOURCES = mln_accu_math_essential.cc mln_accu_math_inf_SOURCES = mln_accu_math_inf.cc mln_accu_math_sum_SOURCES = mln_accu_math_sum.cc +mln_accu_math_sumpow_SOURCES = mln_accu_math_sumpow.cc mln_accu_math_sup_SOURCES = mln_accu_math_sup.cc mln_accu_max_site_SOURCES = mln_accu_max_site.cc mln_accu_nil_SOURCES = mln_accu_nil.cc @@ -1827,6 +1832,7 @@ mln_data_approx_essential_SOURCES = mln_data_approx_essential.cc mln_data_approx_median_SOURCES = mln_data_approx_median.cc mln_data_compare_SOURCES = mln_data_compare.cc mln_data_compute_SOURCES = mln_data_compute.cc +mln_data_compute_in_window_SOURCES = mln_data_compute_in_window.cc mln_data_convert_SOURCES = mln_data_convert.cc mln_data_essential_SOURCES = mln_data_essential.cc mln_data_fast_median_SOURCES = mln_data_fast_median.cc @@ -2049,6 +2055,7 @@ mln_fun_x2x_rotation_SOURCES = mln_fun_x2x_rotation.cc mln_fun_x2x_translation_SOURCES = mln_fun_x2x_translation.cc mln_geom_all_SOURCES = mln_geom_all.cc mln_geom_bbox_SOURCES = mln_geom_bbox.cc +mln_geom_bottom_left_SOURCES = mln_geom_bottom_left.cc mln_geom_chamfer_SOURCES = mln_geom_chamfer.cc mln_geom_complex_geometry_SOURCES = mln_geom_complex_geometry.cc mln_geom_crop_SOURCES = mln_geom_crop.cc @@ -2076,6 +2083,7 @@ mln_geom_seeds2tiling_roundness_SOURCES = mln_geom_seeds2tiling_roundness.cc mln_geom_size1d_SOURCES = mln_geom_size1d.cc mln_geom_size2d_SOURCES = mln_geom_size2d.cc mln_geom_size3d_SOURCES = mln_geom_size3d.cc +mln_geom_top_right_SOURCES = mln_geom_top_right.cc mln_geom_translate_SOURCES = mln_geom_translate.cc mln_geom_vertical_symmetry_SOURCES = mln_geom_vertical_symmetry.cc mln_graph_all_SOURCES = mln_graph_all.cc -- 1.7.2.5

1 0

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

22 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 updated via 0cd712af56c473412a3065c7f03385b626f00224 (commit) from ba5badd9d9719afaea44bd06716cb27462ad4e18 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 0cd712a Add Singh algorithm. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 9 +++ .../{sauvola_formula.hh => singh_formula.hh} | 55 +++++++++---------- .../{niblack_functor_fast.hh => singh_functor.hh} | 36 +++++++------ .../scribo/binarization/{niblack.hh => singh.hh} | 39 +++++++------- scribo/src/binarization/{wolf.cc => singh.cc} | 11 ++-- 5 files changed, 79 insertions(+), 71 deletions(-) copy scribo/scribo/binarization/internal/{sauvola_formula.hh => singh_formula.hh} (58%) copy scribo/scribo/binarization/internal/{niblack_functor_fast.hh => singh_functor.hh} (81%) copy scribo/scribo/binarization/{niblack.hh => singh.hh} (71%) copy scribo/src/binarization/{wolf.cc => singh.cc} (90%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-126-g82e9a80 Add Singh algorithm.
by Guillaume Lazzara 22 Aug '12

22 Aug '12

* scribo/binarization/internal/singh_formula.hh, * scribo/binarization/internal/singh_functor.hh, * scribo/binarization/singh.hh, * src/binarization/singh.cc: New. --- scribo/ChangeLog | 9 +++ .../{sauvola_formula.hh => singh_formula.hh} | 55 +++++++++---------- .../{niblack_functor_fast.hh => singh_functor.hh} | 36 +++++++------ .../scribo/binarization/{niblack.hh => singh.hh} | 39 +++++++------- scribo/src/binarization/{wolf.cc => singh.cc} | 11 ++-- 5 files changed, 79 insertions(+), 71 deletions(-) copy scribo/scribo/binarization/internal/{sauvola_formula.hh => singh_formula.hh} (58%) copy scribo/scribo/binarization/internal/{niblack_functor_fast.hh => singh_functor.hh} (81%) copy scribo/scribo/binarization/{niblack.hh => singh.hh} (71%) copy scribo/src/binarization/{wolf.cc => singh.cc} (90%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index acca687..fca0939 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2012-08-22 Guillaume Lazzara <z(a)lrde.epita.fr> + Add Singh algorithm. + + * scribo/binarization/internal/singh_formula.hh, + * scribo/binarization/internal/singh_functor.hh, + * scribo/binarization/singh.hh, + * src/binarization/singh.cc: New. + +2012-08-22 Guillaume Lazzara <z(a)lrde.epita.fr> + Make the area value depends on the first scale ratio. * scribo/binarization/sauvola_ms.hh: Change area ranges. diff --git a/scribo/scribo/binarization/internal/sauvola_formula.hh b/scribo/scribo/binarization/internal/singh_formula.hh similarity index 58% copy from scribo/scribo/binarization/internal/sauvola_formula.hh copy to scribo/scribo/binarization/internal/singh_formula.hh index 005c034..e307a2c 100644 --- a/scribo/scribo/binarization/internal/sauvola_formula.hh +++ b/scribo/scribo/binarization/internal/singh_formula.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,31 +23,25 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_BINARIZATION_INTERNAL_SAUVOLA_FORMULA_HH -# define SCRIBO_BINARIZATION_INTERNAL_SAUVOLA_FORMULA_HH +#ifndef SCRIBO_BINARIZATION_INTERNAL_SINGH_FORMULA_HH +# define SCRIBO_BINARIZATION_INTERNAL_SINGH_FORMULA_HH /// \file /// -/// \brief Routines computing a threshold using Sauvola's binarization +/// \brief Routines computing a threshold using Singh's binarization /// formula. -// Setup default Sauvola's formula parameters values. -// These macros may be used in other variant of Sauvola's algorithms. -// -// Values are set according to the following reference: "Automatic -// Evaluation of Document Binarization Results", Badekas and al, 2005 -// -// Badekas et al. said 0.34 was best for Sauvola. -# define SCRIBO_DEFAULT_SAUVOLA_K 0.34 -// -// 128 is best for grayscale documents. -# define SCRIBO_DEFAULT_SAUVOLA_R 128 +// Setup default Singh's formula parameters values. +// These macros may be used in other variant of Singh's algorithms. +# define SCRIBO_DEFAULT_SINGH_K 0.06 #include <mln/core/alias/point2d.hh> +// extern mln::image2d<bool> skewness_pbm; + namespace scribo { @@ -60,10 +53,11 @@ namespace scribo using namespace mln; - struct sauvola_formula + template <typename V> + struct singh_formula { - /*! \brief Compute a threshold using Sauvola's formula. + /*! \brief Compute a threshold using Singh's formula. \param[in] m_x_y Mean value. \param[in] s_x_y Standard deviation. @@ -75,33 +69,36 @@ namespace scribo \return A threshold. */ - double operator()(const double m_x_y, const double s_x_y, - const double K, const double R) const; + double operator()(const V& v, const double m_x_y, const double K) const; /*! - \overload K = 0.34 and R = 128. + \overload K = 0.34. */ - double operator()(const double m_x_y, const double s_x_y) const; + double operator()(const V& v, const double m_x_y) const; }; # ifndef MLN_INCLUDE_ONLY + // bool b; + // double skewness_; + + template <typename V> inline double - sauvola_formula::operator()(const double m_x_y, const double s_x_y, - const double K, const double R) const + singh_formula<V>::operator()(const V& v, const double m_x_y, const double K) const { - return m_x_y * (1.0 + K * ((s_x_y / R) - 1.0)); + double mean_dev = v - m_x_y; + return m_x_y * (1.0 + K * (mean_dev / (1 - mean_dev) - 1)); } + template <typename V> inline double - sauvola_formula::operator()(const double m_x_y, const double s_x_y) const + singh_formula<V>::operator()(const V& v, const double m_x_y) const { - return (*this)(m_x_y, s_x_y, - SCRIBO_DEFAULT_SAUVOLA_K, SCRIBO_DEFAULT_SAUVOLA_R); + return (*this)(v, m_x_y, SCRIBO_DEFAULT_SINGH_K); } # endif // ! MLN_INCLUDE_ONLY @@ -112,4 +109,4 @@ namespace scribo } // end of namespace scribo -#endif // ! SCRIBO_BINARIZATION_INTERNAL_SAUVOLA_FORMULA_HH +#endif // ! SCRIBO_BINARIZATION_INTERNAL_SINGH_FORMULA_HH diff --git a/scribo/scribo/binarization/internal/niblack_functor_fast.hh b/scribo/scribo/binarization/internal/singh_functor.hh similarity index 81% copy from scribo/scribo/binarization/internal/niblack_functor_fast.hh copy to scribo/scribo/binarization/internal/singh_functor.hh index 8251ecd..5e7e66f 100644 --- a/scribo/scribo/binarization/internal/niblack_functor_fast.hh +++ b/scribo/scribo/binarization/internal/singh_functor.hh @@ -23,18 +23,18 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_BINARIZATION_INTERNAL_NIBLACK_FUNCTOR_FAST_HH -# define SCRIBO_BINARIZATION_INTERNAL_NIBLACK_FUNCTOR_FAST_HH +#ifndef SCRIBO_BINARIZATION_INTERNAL_SINGH_FUNCTOR_HH +# define SCRIBO_BINARIZATION_INTERNAL_SINGH_FUNCTOR_HH /// \file /// -/// \todo Refactor with sauvola_functor. +/// # include <mln/core/image/image2d.hh> # include <mln/core/alias/neighb2d.hh> # include <mln/extension/fill.hh> -# include <scribo/binarization/internal/niblack_formula.hh> +# include <scribo/binarization/internal/singh_formula.hh> # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG # include <scribo/binarization/internal/local_threshold_debug.hh> @@ -54,9 +54,9 @@ namespace scribo template <typename I> - struct niblack_functor_fast + struct singh_functor { - niblack_functor_fast(const Image& input, double K); + typedef mln_value(I) V; // Moves in input and output images are made using "step" // pixels. It corresponds to the scale ratio between the input @@ -64,6 +64,8 @@ namespace scribo // values. enum { step = 3 }; + singh_functor(const Image& input, double K); + // Run every 4 pixels. void exec(double mean, double stddev); @@ -75,12 +77,12 @@ namespace scribo const I input; mln_ch_value(I,bool) output; - const mln_value(I)* pi; + const V* pi; bool* po; double K_; - scribo::binarization::internal::niblack_formula formula_; + scribo::binarization::internal::singh_formula<V> formula_; unsigned next_line3; unsigned offset1; @@ -90,8 +92,7 @@ namespace scribo #ifndef MLN_INCLUDE_ONLY template <typename I> - niblack_functor_fast::niblack_functor_fast(const Image& input_, - double K) + singh_functor::singh_functor(const Image& input_, double K) : input(exact(input_)), pi(&input(input.domain().pmin())), K_(K) @@ -116,14 +117,18 @@ namespace scribo template <typename I> void - niblack_functor_fast::exec(double mean, double stddev) + singh_functor::exec(double mean, double stddev) { - double th = formula_(mean, stddev, K_); + (void) stddev; + for (int i = 0; i < step; ++i, ++po, ++pi) { + double th = formula_(*pi, mean, K_); *po = (*pi <= th); + th = formula_(*(pi + offset1), mean, K_); *(po + offset1) = (*(pi + offset1) <= th); + th = formula_(*(pi + offset2), mean, K_); *(po + offset2) = (*(pi + offset2) <= th); } @@ -132,7 +137,6 @@ namespace scribo unsigned index = pi - input.buffer(); debug_mean.element(index) = mean * mean_debug_factor; - debug_stddev.element(index) = stddev * stddev_debug_factor; debug_threshold.element(index) = th; # endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG @@ -140,7 +144,7 @@ namespace scribo template <typename I> void - niblack_functor_fast::end_of_row(int) + singh_functor::end_of_row(int) { po += next_line3; pi += next_line3; @@ -148,7 +152,7 @@ namespace scribo template <typename I> void - niblack_functor_fast::finalize() + singh_functor::finalize() { } @@ -160,4 +164,4 @@ namespace scribo } // end of namespace scribo -#endif // SCRIBO_BINARIZATION_INTERNAL_NIBLACK_FUNCTOR_FAST_HH +#endif // SCRIBO_BINARIZATION_INTERNAL_SINGH_FUNCTOR_HH diff --git a/scribo/scribo/binarization/niblack.hh b/scribo/scribo/binarization/singh.hh similarity index 71% copy from scribo/scribo/binarization/niblack.hh copy to scribo/scribo/binarization/singh.hh index 134e15a..58f4664 100644 --- a/scribo/scribo/binarization/niblack.hh +++ b/scribo/scribo/binarization/singh.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,15 +23,15 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_BINARIZATION_NIBLACK_HH -# define SCRIBO_BINARIZATION_NIBLACK_HH +#ifndef SCRIBO_BINARIZATION_SINGH_HH +# define SCRIBO_BINARIZATION_SINGH_HH /// \file /// /// # include <mln/core/concept/image.hh> -# include <scribo/binarization/internal/niblack_functor.hh> +# include <scribo/binarization/internal/singh_functor.hh> # include <scribo/binarization/internal/local_threshold_core.hh> namespace scribo @@ -48,21 +47,20 @@ namespace scribo \input[in] input An image. \input[in] window_size The window size. - \input[in] K Sauvola's formulae constant. + \input[in] K Singh's formulae constant. \return A binary image. */ template <typename I> mln_ch_value(I, bool) - niblack(const Image& input, unsigned window_size, double K); + singh(const Image& input, unsigned window_size, double K); /*! \brief Convert an image into a binary image. - Sauvola's formulae constant K is set to - SCRIBO_DEFAULT_NIBLACK_K. + Singh's formulae constant K is set to 0.34. \input[in] input An image. \input[in] window_size The window size. @@ -72,7 +70,7 @@ namespace scribo */ template <typename I> mln_ch_value(I, bool) - niblack(const Image& input, unsigned window_size); + singh(const Image& input, unsigned window_size); /// \overload @@ -80,7 +78,7 @@ namespace scribo // template <typename I> mln_ch_value(I, bool) - niblack(const Image& input); + singh(const Image& input); # ifndef MLN_INCLUDE_ONLY @@ -89,35 +87,36 @@ namespace scribo template <typename I> mln_ch_value(I, bool) - niblack(const Image& input, unsigned window_size, double K) + singh(const Image& input, unsigned window_size, double K) { - trace::entering("scribo::binarization::niblack"); + trace::entering("scribo::binarization::singh"); mln_precondition(exact(input).is_valid()); - internal::niblack_functor f(input, K); + internal::singh_functor f(input, K); internal::local_threshold_core(input, f, window_size); - trace::exiting("scribo::binarization::niblack"); + trace::exiting("scribo::binarization::singh"); return f.output; } template <typename I> mln_ch_value(I, bool) - niblack(const Image& input, unsigned window_size) + singh(const Image& input, unsigned window_size) { - return niblack(input, window_size, SCRIBO_DEFAULT_NIBLACK_K); + return singh(input, window_size, SCRIBO_DEFAULT_SINGH_K); } template <typename I> mln_ch_value(I, bool) - niblack(const Image& input) + singh(const Image& input) { - return niblack(input, 11); + return singh(input, 11); } + # endif // ! MLN_INCLUDE_ONLY @@ -126,4 +125,4 @@ namespace scribo } // end of namespace scribo -#endif // ! SCRIBO_BINARIZATION_NIBLACK_HH +#endif // ! SCRIBO_BINARIZATION_SINGH_HH diff --git a/scribo/src/binarization/wolf.cc b/scribo/src/binarization/singh.cc similarity index 90% copy from scribo/src/binarization/wolf.cc copy to scribo/src/binarization/singh.cc index 4495f64..8078bfd 100644 --- a/scribo/src/binarization/wolf.cc +++ b/scribo/src/binarization/singh.cc @@ -1,5 +1,4 @@ -// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -31,7 +30,7 @@ #include <mln/data/transform.hh> #include <mln/fun/v2v/rgb_to_luma.hh> -#include <scribo/binarization/wolf.hh> +#include <scribo/binarization/singh.hh> #include <scribo/debug/option_parser.hh> #include <scribo/debug/logger.hh> @@ -57,10 +56,10 @@ static const scribo::debug::opt_data opt_desc[] = // name, description, arguments, check args function, number of args, default arg { "debug-prefix", "Enable debug image outputs. Prefix image name with that " "given prefix.", "<prefix>", 0, 1, 0 }, - { "k", "Wolf's formulae parameter", "<value>", 0, 1, "0.34" }, + { "k", "Singh's formulae parameter", "<value>", 0, 1, "0.06" }, { "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" }, + { "win-size", "Window size", "<size>", 0, 1, "15" }, {0, 0, 0, 0, 0, 0} }; @@ -98,7 +97,7 @@ 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>()); - image2d<bool> out = scribo::binarization::wolf(input_1_gl, w, k); + image2d<bool> out = scribo::binarization::singh(input_1_gl, w, k); io::pbm::save(out, options.arg("output.pbm")); -- 1.7.2.5

1 0

olena-2.0-118-g0cd712a Add Singh algorithm.
by Guillaume Lazzara 22 Aug '12

22 Aug '12

* scribo/binarization/internal/singh_formula.hh, * scribo/binarization/internal/singh_functor.hh, * scribo/binarization/singh.hh, * src/binarization/singh.cc: New. --- scribo/ChangeLog | 9 +++ .../{sauvola_formula.hh => singh_formula.hh} | 55 +++++++++---------- .../{niblack_functor_fast.hh => singh_functor.hh} | 36 +++++++------ .../scribo/binarization/{niblack.hh => singh.hh} | 39 +++++++------- scribo/src/binarization/{wolf.cc => singh.cc} | 11 ++-- 5 files changed, 79 insertions(+), 71 deletions(-) copy scribo/scribo/binarization/internal/{sauvola_formula.hh => singh_formula.hh} (58%) copy scribo/scribo/binarization/internal/{niblack_functor_fast.hh => singh_functor.hh} (81%) copy scribo/scribo/binarization/{niblack.hh => singh.hh} (71%) copy scribo/src/binarization/{wolf.cc => singh.cc} (90%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 608254b..5147cf4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2012-08-22 Guillaume Lazzara <z(a)lrde.epita.fr> + Add Singh algorithm. + + * scribo/binarization/internal/singh_formula.hh, + * scribo/binarization/internal/singh_functor.hh, + * scribo/binarization/singh.hh, + * src/binarization/singh.cc: New. + +2012-08-22 Guillaume Lazzara <z(a)lrde.epita.fr> + Make the area value depends on the first scale ratio. * scribo/binarization/sauvola_ms.hh: Change area ranges. diff --git a/scribo/scribo/binarization/internal/sauvola_formula.hh b/scribo/scribo/binarization/internal/singh_formula.hh similarity index 58% copy from scribo/scribo/binarization/internal/sauvola_formula.hh copy to scribo/scribo/binarization/internal/singh_formula.hh index 005c034..e307a2c 100644 --- a/scribo/scribo/binarization/internal/sauvola_formula.hh +++ b/scribo/scribo/binarization/internal/singh_formula.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,31 +23,25 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_BINARIZATION_INTERNAL_SAUVOLA_FORMULA_HH -# define SCRIBO_BINARIZATION_INTERNAL_SAUVOLA_FORMULA_HH +#ifndef SCRIBO_BINARIZATION_INTERNAL_SINGH_FORMULA_HH +# define SCRIBO_BINARIZATION_INTERNAL_SINGH_FORMULA_HH /// \file /// -/// \brief Routines computing a threshold using Sauvola's binarization +/// \brief Routines computing a threshold using Singh's binarization /// formula. -// Setup default Sauvola's formula parameters values. -// These macros may be used in other variant of Sauvola's algorithms. -// -// Values are set according to the following reference: "Automatic -// Evaluation of Document Binarization Results", Badekas and al, 2005 -// -// Badekas et al. said 0.34 was best for Sauvola. -# define SCRIBO_DEFAULT_SAUVOLA_K 0.34 -// -// 128 is best for grayscale documents. -# define SCRIBO_DEFAULT_SAUVOLA_R 128 +// Setup default Singh's formula parameters values. +// These macros may be used in other variant of Singh's algorithms. +# define SCRIBO_DEFAULT_SINGH_K 0.06 #include <mln/core/alias/point2d.hh> +// extern mln::image2d<bool> skewness_pbm; + namespace scribo { @@ -60,10 +53,11 @@ namespace scribo using namespace mln; - struct sauvola_formula + template <typename V> + struct singh_formula { - /*! \brief Compute a threshold using Sauvola's formula. + /*! \brief Compute a threshold using Singh's formula. \param[in] m_x_y Mean value. \param[in] s_x_y Standard deviation. @@ -75,33 +69,36 @@ namespace scribo \return A threshold. */ - double operator()(const double m_x_y, const double s_x_y, - const double K, const double R) const; + double operator()(const V& v, const double m_x_y, const double K) const; /*! - \overload K = 0.34 and R = 128. + \overload K = 0.34. */ - double operator()(const double m_x_y, const double s_x_y) const; + double operator()(const V& v, const double m_x_y) const; }; # ifndef MLN_INCLUDE_ONLY + // bool b; + // double skewness_; + + template <typename V> inline double - sauvola_formula::operator()(const double m_x_y, const double s_x_y, - const double K, const double R) const + singh_formula<V>::operator()(const V& v, const double m_x_y, const double K) const { - return m_x_y * (1.0 + K * ((s_x_y / R) - 1.0)); + double mean_dev = v - m_x_y; + return m_x_y * (1.0 + K * (mean_dev / (1 - mean_dev) - 1)); } + template <typename V> inline double - sauvola_formula::operator()(const double m_x_y, const double s_x_y) const + singh_formula<V>::operator()(const V& v, const double m_x_y) const { - return (*this)(m_x_y, s_x_y, - SCRIBO_DEFAULT_SAUVOLA_K, SCRIBO_DEFAULT_SAUVOLA_R); + return (*this)(v, m_x_y, SCRIBO_DEFAULT_SINGH_K); } # endif // ! MLN_INCLUDE_ONLY @@ -112,4 +109,4 @@ namespace scribo } // end of namespace scribo -#endif // ! SCRIBO_BINARIZATION_INTERNAL_SAUVOLA_FORMULA_HH +#endif // ! SCRIBO_BINARIZATION_INTERNAL_SINGH_FORMULA_HH diff --git a/scribo/scribo/binarization/internal/niblack_functor_fast.hh b/scribo/scribo/binarization/internal/singh_functor.hh similarity index 81% copy from scribo/scribo/binarization/internal/niblack_functor_fast.hh copy to scribo/scribo/binarization/internal/singh_functor.hh index 8251ecd..5e7e66f 100644 --- a/scribo/scribo/binarization/internal/niblack_functor_fast.hh +++ b/scribo/scribo/binarization/internal/singh_functor.hh @@ -23,18 +23,18 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_BINARIZATION_INTERNAL_NIBLACK_FUNCTOR_FAST_HH -# define SCRIBO_BINARIZATION_INTERNAL_NIBLACK_FUNCTOR_FAST_HH +#ifndef SCRIBO_BINARIZATION_INTERNAL_SINGH_FUNCTOR_HH +# define SCRIBO_BINARIZATION_INTERNAL_SINGH_FUNCTOR_HH /// \file /// -/// \todo Refactor with sauvola_functor. +/// # include <mln/core/image/image2d.hh> # include <mln/core/alias/neighb2d.hh> # include <mln/extension/fill.hh> -# include <scribo/binarization/internal/niblack_formula.hh> +# include <scribo/binarization/internal/singh_formula.hh> # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG # include <scribo/binarization/internal/local_threshold_debug.hh> @@ -54,9 +54,9 @@ namespace scribo template <typename I> - struct niblack_functor_fast + struct singh_functor { - niblack_functor_fast(const Image& input, double K); + typedef mln_value(I) V; // Moves in input and output images are made using "step" // pixels. It corresponds to the scale ratio between the input @@ -64,6 +64,8 @@ namespace scribo // values. enum { step = 3 }; + singh_functor(const Image& input, double K); + // Run every 4 pixels. void exec(double mean, double stddev); @@ -75,12 +77,12 @@ namespace scribo const I input; mln_ch_value(I,bool) output; - const mln_value(I)* pi; + const V* pi; bool* po; double K_; - scribo::binarization::internal::niblack_formula formula_; + scribo::binarization::internal::singh_formula<V> formula_; unsigned next_line3; unsigned offset1; @@ -90,8 +92,7 @@ namespace scribo #ifndef MLN_INCLUDE_ONLY template <typename I> - niblack_functor_fast::niblack_functor_fast(const Image& input_, - double K) + singh_functor::singh_functor(const Image& input_, double K) : input(exact(input_)), pi(&input(input.domain().pmin())), K_(K) @@ -116,14 +117,18 @@ namespace scribo template <typename I> void - niblack_functor_fast::exec(double mean, double stddev) + singh_functor::exec(double mean, double stddev) { - double th = formula_(mean, stddev, K_); + (void) stddev; + for (int i = 0; i < step; ++i, ++po, ++pi) { + double th = formula_(*pi, mean, K_); *po = (*pi <= th); + th = formula_(*(pi + offset1), mean, K_); *(po + offset1) = (*(pi + offset1) <= th); + th = formula_(*(pi + offset2), mean, K_); *(po + offset2) = (*(pi + offset2) <= th); } @@ -132,7 +137,6 @@ namespace scribo unsigned index = pi - input.buffer(); debug_mean.element(index) = mean * mean_debug_factor; - debug_stddev.element(index) = stddev * stddev_debug_factor; debug_threshold.element(index) = th; # endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG @@ -140,7 +144,7 @@ namespace scribo template <typename I> void - niblack_functor_fast::end_of_row(int) + singh_functor::end_of_row(int) { po += next_line3; pi += next_line3; @@ -148,7 +152,7 @@ namespace scribo template <typename I> void - niblack_functor_fast::finalize() + singh_functor::finalize() { } @@ -160,4 +164,4 @@ namespace scribo } // end of namespace scribo -#endif // SCRIBO_BINARIZATION_INTERNAL_NIBLACK_FUNCTOR_FAST_HH +#endif // SCRIBO_BINARIZATION_INTERNAL_SINGH_FUNCTOR_HH diff --git a/scribo/scribo/binarization/niblack.hh b/scribo/scribo/binarization/singh.hh similarity index 71% copy from scribo/scribo/binarization/niblack.hh copy to scribo/scribo/binarization/singh.hh index 134e15a..58f4664 100644 --- a/scribo/scribo/binarization/niblack.hh +++ b/scribo/scribo/binarization/singh.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,15 +23,15 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_BINARIZATION_NIBLACK_HH -# define SCRIBO_BINARIZATION_NIBLACK_HH +#ifndef SCRIBO_BINARIZATION_SINGH_HH +# define SCRIBO_BINARIZATION_SINGH_HH /// \file /// /// # include <mln/core/concept/image.hh> -# include <scribo/binarization/internal/niblack_functor.hh> +# include <scribo/binarization/internal/singh_functor.hh> # include <scribo/binarization/internal/local_threshold_core.hh> namespace scribo @@ -48,21 +47,20 @@ namespace scribo \input[in] input An image. \input[in] window_size The window size. - \input[in] K Sauvola's formulae constant. + \input[in] K Singh's formulae constant. \return A binary image. */ template <typename I> mln_ch_value(I, bool) - niblack(const Image& input, unsigned window_size, double K); + singh(const Image& input, unsigned window_size, double K); /*! \brief Convert an image into a binary image. - Sauvola's formulae constant K is set to - SCRIBO_DEFAULT_NIBLACK_K. + Singh's formulae constant K is set to 0.34. \input[in] input An image. \input[in] window_size The window size. @@ -72,7 +70,7 @@ namespace scribo */ template <typename I> mln_ch_value(I, bool) - niblack(const Image& input, unsigned window_size); + singh(const Image& input, unsigned window_size); /// \overload @@ -80,7 +78,7 @@ namespace scribo // template <typename I> mln_ch_value(I, bool) - niblack(const Image& input); + singh(const Image& input); # ifndef MLN_INCLUDE_ONLY @@ -89,35 +87,36 @@ namespace scribo template <typename I> mln_ch_value(I, bool) - niblack(const Image& input, unsigned window_size, double K) + singh(const Image& input, unsigned window_size, double K) { - trace::entering("scribo::binarization::niblack"); + trace::entering("scribo::binarization::singh"); mln_precondition(exact(input).is_valid()); - internal::niblack_functor f(input, K); + internal::singh_functor f(input, K); internal::local_threshold_core(input, f, window_size); - trace::exiting("scribo::binarization::niblack"); + trace::exiting("scribo::binarization::singh"); return f.output; } template <typename I> mln_ch_value(I, bool) - niblack(const Image& input, unsigned window_size) + singh(const Image& input, unsigned window_size) { - return niblack(input, window_size, SCRIBO_DEFAULT_NIBLACK_K); + return singh(input, window_size, SCRIBO_DEFAULT_SINGH_K); } template <typename I> mln_ch_value(I, bool) - niblack(const Image& input) + singh(const Image& input) { - return niblack(input, 11); + return singh(input, 11); } + # endif // ! MLN_INCLUDE_ONLY @@ -126,4 +125,4 @@ namespace scribo } // end of namespace scribo -#endif // ! SCRIBO_BINARIZATION_NIBLACK_HH +#endif // ! SCRIBO_BINARIZATION_SINGH_HH diff --git a/scribo/src/binarization/wolf.cc b/scribo/src/binarization/singh.cc similarity index 90% copy from scribo/src/binarization/wolf.cc copy to scribo/src/binarization/singh.cc index 4495f64..8078bfd 100644 --- a/scribo/src/binarization/wolf.cc +++ b/scribo/src/binarization/singh.cc @@ -1,5 +1,4 @@ -// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -31,7 +30,7 @@ #include <mln/data/transform.hh> #include <mln/fun/v2v/rgb_to_luma.hh> -#include <scribo/binarization/wolf.hh> +#include <scribo/binarization/singh.hh> #include <scribo/debug/option_parser.hh> #include <scribo/debug/logger.hh> @@ -57,10 +56,10 @@ static const scribo::debug::opt_data opt_desc[] = // name, description, arguments, check args function, number of args, default arg { "debug-prefix", "Enable debug image outputs. Prefix image name with that " "given prefix.", "<prefix>", 0, 1, 0 }, - { "k", "Wolf's formulae parameter", "<value>", 0, 1, "0.34" }, + { "k", "Singh's formulae parameter", "<value>", 0, 1, "0.06" }, { "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" }, + { "win-size", "Window size", "<size>", 0, 1, "15" }, {0, 0, 0, 0, 0, 0} }; @@ -98,7 +97,7 @@ 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>()); - image2d<bool> out = scribo::binarization::wolf(input_1_gl, w, k); + image2d<bool> out = scribo::binarization::singh(input_1_gl, w, k); io::pbm::save(out, options.arg("output.pbm")); -- 1.7.2.5

1 0

branch skewness deleted: olena-2.0-117-gba5badd
by git＠lrde.epita.fr 22 Aug '12

22 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 skewness has been deleted was ba5badd9d9719afaea44bd06716cb27462ad4e18 ----------------------------------------------------------------------- ba5badd9d9719afaea44bd06716cb27462ad4e18 Make the area value depends on the first scale ratio. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-73-gc6498e5 distrib/macports/Portfile.in: Apply changes required by MacPorts team.
by Guillaume Lazzara 22 Aug '12

22 Aug '12

--- ChangeLog | 5 +++++ distrib/macports/Portfile.in | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c844971..41798a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-06-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * distrib/macports/Portfile.in: Apply changes required by MacPorts + team. + 2012-05-11 Guillaume Lazzara <z(a)lrde.epita.fr> * NEWS: Start populating the changes list. diff --git a/distrib/macports/Portfile.in b/distrib/macports/Portfile.in index 63f41d7..c15c44f 100644 --- a/distrib/macports/Portfile.in +++ b/distrib/macports/Portfile.in @@ -26,6 +26,8 @@ depends_lib port:GraphicsMagick \ supported_archs i386 x86_64 configure.args-append --with-imagemagickxx=no +# code violates aliasing rules +configure.cxxflags-append -fno-strict-aliasing variant scribo description {Add a DIA framework} { depends_lib-append port:tesseract \ @@ -41,9 +43,4 @@ variant swilena description {Add Python bindings} { configure.args-append --enable-swilena } -# Temporary workaround because of a Apple's GCC bug. -platform darwin 11 { - configure.env-append CXXFLAGS=-fno-strict-aliasing -} - default_variants +scribo -- 1.7.2.5

1 0