- Olena-patches

olena-2.0-95-gc2ba610 New tools.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

* z/sauvola_ms_rv/pbm_color_diff.cc, * z/sauvola_ms_rv/pgm_color_diff.cc: New. --- scribo/sandbox/ChangeLog | 7 +++++++ .../{pgm_color_diff.cc => pbm_color_diff.cc} | 17 ++++++++++------- scribo/sandbox/z/sauvola_ms_rv/pgm_color_diff.cc | 2 +- 3 files changed, 18 insertions(+), 8 deletions(-) copy scribo/sandbox/z/sauvola_ms_rv/{pgm_color_diff.cc => pbm_color_diff.cc} (72%) diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index 2c0068f..71ad3f4 100644 --- a/scribo/sandbox/ChangeLog +++ b/scribo/sandbox/ChangeLog @@ -1,5 +1,12 @@ 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + New tools. + + * z/sauvola_ms_rv/pbm_color_diff.cc, + * z/sauvola_ms_rv/pgm_color_diff.cc: New. + +2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * z/sauvola_ms_rv/dump_color_sign.cc: New. 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/sandbox/z/sauvola_ms_rv/pgm_color_diff.cc b/scribo/sandbox/z/sauvola_ms_rv/pbm_color_diff.cc similarity index 72% copy from scribo/sandbox/z/sauvola_ms_rv/pgm_color_diff.cc copy to scribo/sandbox/z/sauvola_ms_rv/pbm_color_diff.cc index 7474c46..b49f40b 100644 --- a/scribo/sandbox/z/sauvola_ms_rv/pgm_color_diff.cc +++ b/scribo/sandbox/z/sauvola_ms_rv/pbm_color_diff.cc @@ -2,10 +2,11 @@ #include <mln/core/image/image2d.hh> #include <mln/value/rgb8.hh> #include <mln/value/int_u8.hh> -#include <mln/io/pgm/load.hh> +#include <mln/io/pbm/load.hh> #include <mln/io/ppm/save.hh> #include <mln/data/transform.hh> #include <mln/arith/minus.hh> +#include <mln/data/convert.hh> namespace mln { @@ -21,7 +22,7 @@ namespace mln int v_d2 = std::abs(v / 2); if (v >= -threshold_ && v <= threshold_) - return value::rgb8(255, 255, 255); + return value::rgb8(0, 0, 0); else if (v > threshold_) return value::rgb8(v_d2, 128 + v_d2, v_d2); else @@ -42,16 +43,18 @@ int main(int argc, char *argv[]) if (argc != 5) { - std::cout << "Usage: " << argv[0] << " in.pgm ref.pgm threshold out.ppm" << std::endl; + std::cout << "Usage: " << argv[0] << " in.pbm ref.pbm threshold out.ppm" << std::endl; return 1; } - image2d<value::int_u8> input, ref; + image2d<bool> input, ref; - io::pgm::load(input, argv[1]); - io::pgm::load(ref, argv[2]); + io::pbm::load(input, argv[1]); + io::pbm::load(ref, argv[2]); - image2d<int> diff = input - ref; + image2d<int> + diff = data::convert(value::int_u8(), input) + - data::convert(value::int_u8(), ref); color_diff f(atoi(argv[3])); image2d<value::rgb8> result = data::transform(diff, f); diff --git a/scribo/sandbox/z/sauvola_ms_rv/pgm_color_diff.cc b/scribo/sandbox/z/sauvola_ms_rv/pgm_color_diff.cc index 7474c46..d9c677a 100644 --- a/scribo/sandbox/z/sauvola_ms_rv/pgm_color_diff.cc +++ b/scribo/sandbox/z/sauvola_ms_rv/pgm_color_diff.cc @@ -21,7 +21,7 @@ namespace mln int v_d2 = std::abs(v / 2); if (v >= -threshold_ && v <= threshold_) - return value::rgb8(255, 255, 255); + return value::rgb8(0, 0, 0); else if (v > threshold_) return value::rgb8(v_d2, 128 + v_d2, v_d2); else -- 1.7.2.5

1 0

olena-2.0-94-gd9cc1c4 Add more debug.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

* scribo/binarization/internal/local_threshold_debug.hh, * scribo/binarization/internal/sauvola_ms_functor.hh, * scribo/binarization/sauvola_ms.hh, * src/binarization/sauvola_ms_debug.cc: Here. --- scribo/ChangeLog | 9 +++ .../binarization/internal/local_threshold_debug.hh | 3 + .../binarization/internal/sauvola_ms_functor.hh | 55 ++++++++++++++++- scribo/scribo/binarization/sauvola_ms.hh | 63 +++++++++++++++++--- scribo/src/binarization/sauvola_ms_debug.cc | 1 + 5 files changed, 120 insertions(+), 11 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 9c1b5dd..9604def 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + Add more debug. + + * scribo/binarization/internal/local_threshold_debug.hh, + * scribo/binarization/internal/sauvola_ms_functor.hh, + * scribo/binarization/sauvola_ms.hh, + * src/binarization/sauvola_ms_debug.cc: Here. + +2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/binarization/sauvola_ms.hh: Change area thresholds. 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/binarization/internal/local_threshold_debug.hh b/scribo/scribo/binarization/internal/local_threshold_debug.hh index 6b2263f..46503f6 100644 --- a/scribo/scribo/binarization/internal/local_threshold_debug.hh +++ b/scribo/scribo/binarization/internal/local_threshold_debug.hh @@ -56,6 +56,7 @@ namespace scribo const char* mean_image_output = 0; const char* threshold_image_output = 0; const char* full_threshold_image_output = 0; + const char * scale_proba_output = 0; const char* scale_image_output = 0; const char* scale_iz_image_output = 0; @@ -68,6 +69,8 @@ namespace scribo image2d<double> debug_mean; image2d<double> debug_threshold; + image3d<double> debug_scale_proba; + image2d<double> debug_alpham; image2d<bool> debug_alphacond; diff --git a/scribo/scribo/binarization/internal/sauvola_ms_functor.hh b/scribo/scribo/binarization/internal/sauvola_ms_functor.hh index d72fc26..d0e6200 100644 --- a/scribo/scribo/binarization/internal/sauvola_ms_functor.hh +++ b/scribo/scribo/binarization/internal/sauvola_ms_functor.hh @@ -43,6 +43,7 @@ # include <scribo/binarization/internal/local_threshold_debug.hh> # endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG +#include <mln/value/int_u8.hh> namespace scribo { @@ -60,6 +61,11 @@ namespace scribo struct sauvola_ms_functor { const I& input; + + const image2d<value::int_u8>& e_2; + unsigned i; + unsigned q; + mln_fwd_pixter(const I) pxl; double res; image2d<unsigned> parent; @@ -79,7 +85,7 @@ namespace scribo sauvola_formula formula_; - sauvola_ms_functor(const I& input, double K, double R); + sauvola_ms_functor(const I& input, double K, double R, const image2d<value::int_u8>&e_2, unsigned i, unsigned q); void exec(double mean, double stddev); void end_of_row(int row); @@ -101,8 +107,11 @@ namespace scribo template <typename I> - sauvola_ms_functor<I>::sauvola_ms_functor(const I& input, double K, double R) + sauvola_ms_functor<I>::sauvola_ms_functor(const I& input, double K, double R, const image2d<value::int_u8>&e_2, unsigned i, unsigned q) : input(input), + e_2(e_2), + i(i), + q(q), pxl(input), K_(K), R_(R) @@ -142,7 +151,49 @@ namespace scribo value::int_u8 t_p; mln::convert::from_to(formula_(mean, stddev, K_, R_), t_p); + // point2d pi = input.point_at_index(p); + // pi.row() *= std::pow(q, i - 2); + // pi.col() *= std::pow(q, i - 2); + + // point2d pi_up = pi; + // pi_up.row() -= std::pow(q, i - 2); + + // point2d pi_up_left = pi; + // pi_up_left.row() -= std::pow(q, i - 2); + // pi_up_left.col() -= std::pow(q, i - 2); + + // point2d pi_up_right = pi; + // pi_up_right.row() -= std::pow(q, i - 2); + // pi_up_right.col() += std::pow(q, i - 2); + + // point2d pi_down = pi; + // pi_down.row() += std::pow(q, i - 2); + + // point2d pi_down_left = pi; + // pi_down_left.row() += std::pow(q, i - 2); + // pi_down_left.col() -= std::pow(q, i - 2); + + // point2d pi_down_right = pi; + // pi_down_right.row() += std::pow(q, i - 2); + // pi_down_right.col() += std::pow(q, i - 2); + + // point2d pi_left = pi; + // pi_left.col() -= std::pow(q, i - 2); + + // point2d pi_right = pi; + // pi_right.col() += std::pow(q, i - 2); + + + + + +// if (e_2(pi) != 0) // Already retrieved from another scale. +// // || e_2(pi_up) != 0 || e_2(pi_down) != 0 || e_2(pi_left) != 0 || e_2(pi_right) != 0 +// // || e_2(pi_up_left) != 0 || e_2(pi_up_right) != 0 || e_2(pi_down_left) != 0 || e_2(pi_down_right) != 0) +// msk.element(p) = false; +// else msk.element(p) = input.element(p) < t_p; + # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG full_msk.element(p) = msk.element(p); # endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index 63ea38f..e6297bd 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -72,6 +72,7 @@ # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG # include <scribo/binarization/internal/local_threshold_debug.hh> # include <mln/io/pgm/save.hh> +# include <mln/io/dump/save.hh> # include <mln/debug/filename.hh> # endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG @@ -186,13 +187,15 @@ namespace scribo // 1st pass scribo::binarization::internal::sauvola_ms_functor< image2d<int_u8> > - f(sub, K, SCRIBO_DEFAULT_SAUVOLA_R); + f(sub, K, SCRIBO_DEFAULT_SAUVOLA_R, e_2, i, q); scribo::canvas::integral_browsing(integral_sum_sum_2, ratio, w_local_w, w_local_h, s, f); + std::cout << " i = " << i << " - ratio = " << ratio << std::endl; + // 2nd pass { mln::util::array<mln_value_(I) *> ptr(ratio); @@ -235,6 +238,10 @@ namespace scribo && f.card.element(p) < lambda_max; # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG f.full_msk.element(p) = true; + + for (unsigned l = 0; l < ratio; ++l) + for (unsigned k = 0; k < ratio; ++k) + debug_scale_proba(point3d(i - 2, sq.row() + l, sq.col() + k)) = f.card.element(p); # endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG if (f.msk.element(p) && e_2(sq) == 0u) @@ -250,6 +257,13 @@ namespace scribo f.msk.element(p) = f.msk.element(f.parent.element(p)); # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG f.full_msk.element(p) = f.full_msk.element(f.parent.element(p)); + + point2d sqp = f.parent.point_at_index(f.parent.element(p)) * ratio; + unsigned v = debug_scale_proba(point3d(i - 2, sqp.row(), sqp.col())); + + for (unsigned l = 0; l < ratio; ++l) + for (unsigned k = 0; k < ratio; ++k) + debug_scale_proba(point3d(i - 2, sq.row() + l, sq.col() + k)) = v; # endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG if (f.msk.element(p) && e_2(sq) == 0u) @@ -868,10 +882,10 @@ namespace scribo 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; + // 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); @@ -879,11 +893,33 @@ namespace scribo // 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 = 1.4; + + +# ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG + internal::debug_scale_proba = image3d<double>(3, + integral_sum_sum_2.nrows(), + integral_sum_sum_2.ncols(), + integral_sum_sum_2.border()); +# endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG + + // 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, - min_area, +// (8096 / 144) / coeff, +// 44 / coeff, + win_w[i] / 3 / coeff, mln_max(unsigned), s, q, i, w_work, @@ -896,8 +932,12 @@ 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, - min_area, - max_area, +// 22 / coeff, +// 201 * coeff, + win_w[i] / 3 / coeff, + win_w[i] * 3 * coeff, +// (810 / 36) / coeff, +// (8096 / 36) * coeff, s, q, i, w_work, integral_sum_sum_2, @@ -909,7 +949,9 @@ namespace scribo { t_ima[2] = internal::compute_t_n_and_e_2(sub_ima[2], e_2, 0, - max_area, +// 99 * coeff, + win_w[2] * 3 * coeff, +// (810 / 9) * coeff, s, 1, 2, w_work, integral_sum_sum_2, K); @@ -938,6 +980,9 @@ namespace scribo if (internal::scale_iz_image_output) io::pgm::save(e_2, mln::debug::filename(internal::scale_iz_image_output)); + if (internal::scale_proba_output) + io::dump::save(internal::debug_scale_proba, + mln::debug::filename(internal::scale_proba_output)); # endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG // Binarize diff --git a/scribo/src/binarization/sauvola_ms_debug.cc b/scribo/src/binarization/sauvola_ms_debug.cc index 63fbefe..c04e58b 100644 --- a/scribo/src/binarization/sauvola_ms_debug.cc +++ b/scribo/src/binarization/sauvola_ms_debug.cc @@ -105,6 +105,7 @@ int main(int argc, char *argv[]) scribo::binarization::internal::threshold_image_output = "threshold_image.pbm"; scribo::binarization::internal::full_threshold_image_output = "full_threshold_image.pbm"; scribo::binarization::internal::scale_iz_image_output = "scale_iz.pgm"; + scribo::binarization::internal::scale_proba_output = "scale_proba.dump"; // Load image2d<value::rgb8> input_1; -- 1.7.2.5

1 0

olena-2.0-93-g6e6efc3 scribo/binarization/sauvola_ms.hh: Change area thresholds.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

--- scribo/ChangeLog | 4 +++ scribo/scribo/binarization/sauvola_ms.hh | 37 +++++++++++++++++------------ 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 5383b57..9c1b5dd 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/binarization/sauvola_ms.hh: Change area thresholds. + +2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/binarization/sauvola_ms.hh: More fixes in debug. 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index 0abef14..63ea38f 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -156,6 +156,8 @@ namespace scribo w_local_h = w_local, w_local_w = w_local; + std::cout << "scale " << i << " - w = " << w << " - lambda_min = " << lambda_min << " - lambda_max = " << lambda_max << std::endl; + // Make sure the window fits in the image domain. if (w_local_w >= static_cast<const unsigned>(integral_sum_sum_2.ncols())) { @@ -180,6 +182,7 @@ namespace scribo ++w_local_h; } + std::cout << "Scale " << i << " - w_h = " << w_local_h << " - w_w = " << w_local_w << " - w = " << w << std::endl; // 1st pass scribo::binarization::internal::sauvola_ms_functor< image2d<int_u8> > @@ -787,21 +790,16 @@ namespace scribo dpoint2d none(0, 0); - unsigned lambda_min_1 = w_1 / 2; - // Number of subscales. unsigned nb_subscale = 3; // Window size. - unsigned w_work = w_1 / s; // Scale 2 + unsigned w_work = w_1 * s; // Scale 2 // Subscale step. unsigned q = 2; - unsigned lambda_min_2 = lambda_min_1 / s; - unsigned lambda_max_2 = lambda_min_2 * q; - mln::util::array<I> t_ima; @@ -869,13 +867,23 @@ 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]; + // Highest scale -> no maximum component size. { int i = sub_ima.size() - 1; - // Cast to float is needed on MacOS X. - unsigned ratio = unsigned(std::pow(float(q), float(i - 2))); // Ratio compared to e_2 t_ima[i] = internal::compute_t_n_and_e_2(sub_ima[i], e_2, - lambda_min_2 / ratio, + min_area, mln_max(unsigned), s, q, i, w_work, @@ -887,11 +895,9 @@ namespace scribo { for (int i = sub_ima.size() - 2; i > 2; --i) { - // Cast to float is needed on MacOS X. - unsigned ratio = unsigned(std::pow(float(q), float(i - 2))); // Ratio compared to e_2 t_ima[i] = internal::compute_t_n_and_e_2(sub_ima[i], e_2, - lambda_min_2 / ratio, - lambda_max_2 / ratio, + min_area, + max_area, s, q, i, w_work, integral_sum_sum_2, @@ -901,8 +907,9 @@ namespace scribo // Lowest scale -> no minimum component size. { - t_ima[2] = internal::compute_t_n_and_e_2(sub_ima[2], e_2, 0, - lambda_max_2, + t_ima[2] = internal::compute_t_n_and_e_2(sub_ima[2], e_2, + 0, + max_area, s, 1, 2, w_work, integral_sum_sum_2, K); -- 1.7.2.5

1 0

olena-2.0-83-ga839009 sauvola_fast.cc: Cleanup and add some debug.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

--- scribo/ChangeLog | 4 + scribo/sauvola_fast.cc | 234 ++++++++---------------------------------------- 2 files changed, 40 insertions(+), 198 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b01a8f8..43931c6 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * sauvola_fast.cc: Cleanup and add some debug. + +2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * sauvola_fast.cc: Use subscaled integral image. 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/sauvola_fast.cc b/scribo/sauvola_fast.cc index ed4e6d4..7eb41ca 100644 --- a/scribo/sauvola_fast.cc +++ b/scribo/sauvola_fast.cc @@ -5,12 +5,14 @@ #include <mln/util/couple.hh> #include <mln/util/timer.hh> #include <scribo/binarization/internal/sauvola_formula.hh> +#include <scribo/util/init_integral_image.hh> +#include <scribo/util/integral_sum_sum2_functor.hh> namespace mln { template <typename I> - struct sauvola_fast_functor + struct sauvola_functor { const I& input; @@ -28,13 +30,12 @@ namespace mln scribo::binarization::internal::sauvola_formula formula_; int step_; - unsigned next_line1; unsigned next_line2; unsigned next_line3; unsigned offset1; unsigned offset2; - sauvola_fast_functor(const I& input_, mln_ch_value(I,bool)& bin_, double K, double R) + sauvola_functor(const I& input_, mln_ch_value(I,bool)& bin_, double K, double R) : input(input_), bin(bin_), pi(&input(input.domain().pmin())), @@ -43,7 +44,7 @@ namespace mln R_(R) { step_ = 3; - next_line1 = 2 * input.border(); + unsigned next_line1 = 2 * input.border(); next_line2 = input.delta_index(dpoint2d(+1,0)) + next_line1; next_line3 = input.delta_index(dpoint2d(+2,0)) + next_line1; @@ -51,6 +52,7 @@ namespace mln offset2 = input.delta_index(dpoint2d(+2,0)); } + // Run every 4 pixels. void exec(double mean, double stddev) { static point2d p(0,0); @@ -63,6 +65,20 @@ namespace mln *(po + offset1) = (*(pi + offset1) <= th); *(po + offset2) = (*(pi + offset2) <= th); } + +# ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG + // Store local mean + unsigned index = pi - input.buffer(); + + internal::debug_mean.element(index) = mean * internal::mean_debug_factor; + internal::debug_stddev.element(index) = stddev * internal::stddev_debug_factor; + internal::debug_threshold.element(index) = t; + + double alpha = K * (1 - stddev / R); + internal::debug_alpham.element(index) = alpha * mean * internal::alpham_debug_factor; + internal::debug_alphacond.element(index) = (stddev < (alpha * mean / 2.)); +# endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG + } void end_of_row(int) @@ -80,213 +96,34 @@ namespace mln - - template <typename I, typename J> - void - init_integral_3(const Image<I>& input_, - Image<J>& integral_sum_sum_2_) - { - trace::entering("subsampling::impl::integral_3"); - - const unsigned scale = 3; - - const I& input = exact(input_); - J& integral_sum_sum_2 = exact(integral_sum_sum_2_); - - box<mln_site(I)> - output_domain = mln::make::box2d((input.nrows() + scale - 1) / scale, - (input.ncols() + scale - 1) / scale); - - mln_precondition(input.is_valid()); - mln_precondition(input.domain().pmin() == literal::origin); - mln_precondition(scale > 1); - - typedef mln_value(I) V; - typedef mln_sum(V) S; - typedef mln_value(J) V2; - typedef mln_site(I) P; - - integral_sum_sum_2.init_(output_domain, input.border()); - V2* p_integ = integral_sum_sum_2.buffer(); - - const int up = integral_sum_sum_2.delta_index(dpoint2d(-1, 0)); - - const unsigned nrows = 3 * integral_sum_sum_2.nrows(); - const unsigned ncols = 3 * integral_sum_sum_2.ncols(); - - unsigned row = 0; - - unsigned b_offset = integral_sum_sum_2.delta_index(dpoint2d(input.border(), - input.border())); - p_integ += b_offset; - { - S h_sum = 0, h_sum_2 = 0; - const V* ptr1 = & input.at_(row, 0); - const V* ptr2 = & input.at_(row + 1, 0); - const V* ptr3 = & input.at_(row + 2, 0); - for (unsigned col = 0; col < ncols; col += scale) - { - V v11 = *ptr1, v12 = *(ptr1 + 1), v13 = *(ptr1 + 2), - v21 = *ptr2, v22 = *(ptr2 + 1), v23 = *(ptr2 + 2), - v31 = *ptr3, v32 = *(ptr3 + 1), v33 = *(ptr3 + 2); - ptr1 += 3; - ptr2 += 3; - ptr3 += 3; - S local_sum = v11 + v12 + v13 - + v21 + v22 + v23 - + v31 + v32 + v33, - local_sum_2 = v11*v11 + v12*v12 + v13*v13 - + v21*v21 + v22*v22 + v23*v23 - + v31*v31 + v32*v32 + v33*v33; - - h_sum += local_sum; - h_sum_2 += local_sum_2; - - // exception - p_integ->first() = h_sum; - p_integ->second() = h_sum_2; - - p_integ += 1; - } - } - - unsigned b_next = 2 * input.border(); - - p_integ += b_next; - - for (row += scale; row < nrows; row += scale) - { - S h_sum = 0, h_sum_2 = 0; - const V* ptr1 = & input.at_(row, 0); - const V* ptr2 = & input.at_(row + 1, 0); - const V* ptr3 = & input.at_(row + 2, 0); - for (unsigned col = 0; col < ncols; col += scale) - { - V v11 = *ptr1, v12 = *(ptr1 + 1), v13 = *(ptr1 + 2), - v21 = *ptr2, v22 = *(ptr2 + 1), v23 = *(ptr2 + 2), - v31 = *ptr3, v32 = *(ptr3 + 1), v33 = *(ptr3 + 2); - ptr1 += 3; - ptr2 += 3; - ptr3 += 3; - S local_sum = v11 + v12 + v13 - + v21 + v22 + v23 - + v31 + v32 + v33, - local_sum_2 = v11*v11 + v12*v12 + v13*v13 - + v21*v21 + v22*v22 + v23*v23 - + v31*v31 + v32*v32 + v33*v33; - - h_sum += local_sum; - h_sum_2 += local_sum_2; - - p_integ->first() = h_sum + (p_integ + up)->first(); - p_integ->second() = h_sum_2 + (p_integ + up)->second(); - - p_integ += 1; - } - - p_integ += b_next; - } - - trace::exiting("subsampling::impl::integral_3"); - } - - - - template <typename I, typename J> - void - init_integral(const Image<I>& input_, - Image<J>& integral_sum_sum_2_) - { - trace::entering("subsampling::impl::integral_3"); - - const I& input = exact(input_); - J& integral_sum_sum_2 = exact(integral_sum_sum_2_); - - mln_precondition(input.is_valid()); - mln_precondition(input.domain().pmin() == literal::origin); - - typedef mln_value(I) V; - typedef mln_sum(V) S; - typedef mln_value(J) V2; - typedef mln_site(I) P; - - initialize(integral_sum_sum_2, input); - V2* p_integ = integral_sum_sum_2.buffer(); - - const int up = input.delta_index(dpoint2d(-1, 0)); - - const unsigned nrows = input.domain().nrows(); - const unsigned ncols = input.domain().ncols(); - - unsigned row = 0; - - unsigned b_offset = input.delta_index(dpoint2d(input.border(), - input.border())); - p_integ += b_offset; - { - S h_sum = 0, h_sum_2 = 0; - const V* ptr1 = & input.at_(row, 0); - for (unsigned col = 0; col < ncols; ++col) - { - V v = *ptr1++; - - h_sum += v; - h_sum_2 += v * v; - - // exception - p_integ->first() = h_sum; - p_integ->second() = h_sum_2; - - ++p_integ; - } - } - - unsigned b_next = 2 * input.border(); - - p_integ += b_next; - - for (row += 1; row < nrows; ++row) - { - S h_sum = 0, h_sum_2 = 0; - const V* ptr1 = & input.at_(row, 0); - for (unsigned col = 0; col < ncols; ++col) - { - V v = *ptr1++; - - h_sum += v; - h_sum_2 += v * v; - - p_integ->first() = h_sum + (p_integ + up)->first(); - p_integ->second() = h_sum_2 + (p_integ + up)->second(); - - ++p_integ; - } - - p_integ += b_next; - } - - trace::exiting("subsampling::impl::integral_3"); - } - - - image2d<bool> sauvola_fast(const image2d<value::int_u8>& input, unsigned win) { util::timer t; t.start(); - image2d<util::couple<double,double> > integral; - init_integral_3(input, integral); - // image2d<value::int_u8> sub = scribo::subsampling::integral(input, 3, integral); + scribo::util::integral_sum_sum2_functor<value::int_u8, double> fi; + image2d<util::couple<double,double> > + integral = scribo::util::init_integral_image(input, 3, fi); t.stop(); std::cout << "image integrale - " << t << std::endl; +# ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG + initialize(internal::debug_mean, input); + initialize(internal::debug_stddev, input); + + initialize(internal::debug_threshold, input); + initialize(internal::debug_alpham, input); + initialize(internal::debug_alphacond, input); +# endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG + t.restart(); image2d<bool> output; initialize(output, input); - sauvola_fast_functor<image2d<value::int_u8> > f(input, output, SCRIBO_DEFAULT_SAUVOLA_K, SCRIBO_DEFAULT_SAUVOLA_R); + sauvola_functor<image2d<value::int_u8> > f(input, output, + SCRIBO_DEFAULT_SAUVOLA_K, + SCRIBO_DEFAULT_SAUVOLA_R); scribo::canvas::integral_browsing(integral, 1, win / 3, win / 3, 3, f); t.stop(); std::cout << "Binarization - " << t << std::endl; @@ -314,3 +151,4 @@ int main(int argc, char *argv[]) io::pbm::save(output, argv[3]); } + -- 1.7.2.5

1 0

olena-2.0-80-gb1d52c9 sauvola_fast.cc: New implementation.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

--- scribo/ChangeLog | 4 + scribo/sauvola_fast.cc | 175 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 179 insertions(+), 0 deletions(-) create mode 100644 scribo/sauvola_fast.cc diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 8b2cae5..5d4003e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * sauvola_fast.cc: New implementation. + +2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/binarization/sauvola_threshold.hh: Add some debug. 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/sauvola_fast.cc b/scribo/sauvola_fast.cc new file mode 100644 index 0000000..8018135 --- /dev/null +++ b/scribo/sauvola_fast.cc @@ -0,0 +1,175 @@ +#include <mln/core/image/image2d.hh> +#include <scribo/canvas/integral_browsing.hh> +#include <mln/io/pgm/load.hh> +#include <mln/io/pbm/save.hh> +#include <mln/util/couple.hh> +#include <mln/util/timer.hh> +#include <scribo/binarization/internal/sauvola_formula.hh> + +namespace mln +{ + + template <typename I> + struct sauvola_fast_functor + { + + const I& input; + typedef mln_ch_value(I,bool) bin_t; + bin_t bin; + + mln_fwd_pixter(const I) pi; + mln_fwd_pixter(bin_t) po; + + double K_; + double R_; + + scribo::binarization::internal::sauvola_formula formula_; + + unsigned count_; + + sauvola_fast_functor(const I& input_, mln_ch_value(I,bool)& bin_, double K, double R) + : input(input_), + bin(bin_), + pi(input), + po(bin), + K_(K), + R_(R) + { + pi.start(); + po.start(); + count_ = 0; + } + + void exec(double mean, double stddev) + { + static point2d p(0,0); + po.val() = (pi.val() <= formula_(p, mean, stddev, K_, R_)); + + pi.next(); // next pixel + po.next(); // next pixel + + ++count_; + } + + void finalize() + { + std::cout << input.domain().nsites() << " - " << input.domain().nrows() * input.domain().ncols() << " - " << count_ << std::endl; + } + + }; + + + + + template <typename I, typename J> + void + init_integral(const Image<I>& input_, + Image<J>& integral_sum_sum_2_) + { + trace::entering("subsampling::impl::integral_3"); + + const I& input = exact(input_); + J& integral_sum_sum_2 = exact(integral_sum_sum_2_); + + mln_precondition(input.is_valid()); + mln_precondition(input.domain().pmin() == literal::origin); + + typedef mln_value(I) V; + typedef mln_sum(V) S; + typedef mln_value(J) V2; + typedef mln_site(I) P; + + initialize(integral_sum_sum_2, input); + V2* p_integ = integral_sum_sum_2.buffer(); + + const int up = input.delta_index(dpoint2d(-1, 0)); + + const unsigned nrows = input.domain().nrows(); + const unsigned ncols = input.domain().ncols(); + + unsigned row = 0; + + unsigned b_offset = input.delta_index(dpoint2d(input.border(), + input.border())); + p_integ += b_offset; + { + S h_sum = 0, h_sum_2 = 0; + const V* ptr1 = & input.at_(row, 0); + for (unsigned col = 0; col < ncols; ++col) + { + V v = *ptr1++; + + h_sum += v; + h_sum_2 += v * v; + + // exception + p_integ->first() = h_sum; + p_integ->second() = h_sum_2; + + ++p_integ; + } + } + + unsigned b_next = 2 * input.border(); + + p_integ += b_next; + + for (row += 1; row < nrows; ++row) + { + S h_sum = 0, h_sum_2 = 0; + const V* ptr1 = & input.at_(row, 0); + for (unsigned col = 0; col < ncols; ++col) + { + V v = *ptr1++; + + h_sum += v; + h_sum_2 += v * v; + + p_integ->first() = h_sum + (p_integ + up)->first(); + p_integ->second() = h_sum_2 + (p_integ + up)->second(); + + ++p_integ; + } + + p_integ += b_next; + } + + trace::exiting("subsampling::impl::integral_3"); + } + + + + image2d<bool> + sauvola_fast(const image2d<value::int_u8>& input, unsigned win) + { + image2d<util::couple<double,double> > integral; + init_integral(input, integral); + + image2d<bool> output; + initialize(output, input); + sauvola_fast_functor<image2d<value::int_u8> > f(input, output, SCRIBO_DEFAULT_SAUVOLA_K, SCRIBO_DEFAULT_SAUVOLA_R); + scribo::canvas::integral_browsing(integral, 1, win, win, 1, f); + + return f.bin; + } + +} + + +int main(int argc, char *argv[]) +{ + using namespace mln; + + image2d<value::int_u8> input; + io::pgm::load(input, argv[1]); + + unsigned win = atoi(argv[2]); + + util::timer t; + t.start(); + image2d<bool> output = sauvola_fast(input, win); + t.stop(); + std::cout << t << std::endl; + + io::pbm::save(output, argv[3]); +} -- 1.7.2.5

1 0

olena-2.0-79-ga8f83ef z/sauvola_ms_rv/dump_color_sign.cc: New.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

--- scribo/sandbox/ChangeLog | 4 ++ scribo/sandbox/z/sauvola_ms_rv/dump_color_sign.cc | 52 +++++++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) create mode 100644 scribo/sandbox/z/sauvola_ms_rv/dump_color_sign.cc diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index 92abdb1..2c0068f 100644 --- a/scribo/sandbox/ChangeLog +++ b/scribo/sandbox/ChangeLog @@ -1,5 +1,9 @@ 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * z/sauvola_ms_rv/dump_color_sign.cc: New. + +2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + Add test images. * z/sauvola_ms_rv/img/001.pgm, diff --git a/scribo/sandbox/z/sauvola_ms_rv/dump_color_sign.cc b/scribo/sandbox/z/sauvola_ms_rv/dump_color_sign.cc new file mode 100644 index 0000000..6ea6ad8 --- /dev/null +++ b/scribo/sandbox/z/sauvola_ms_rv/dump_color_sign.cc @@ -0,0 +1,52 @@ +#include <mln/core/concept/function.hh> +#include <mln/core/image/image2d.hh> +#include <mln/value/rgb8.hh> +#include <mln/io/dump/load.hh> +#include <mln/io/ppm/save.hh> +#include <mln/data/transform.hh> +#include <mln/data/stretch.hh> +#include <mln/arith/minus.hh> + +namespace mln +{ + + struct color_diff : Function_v2v<color_diff> + { + typedef value::rgb8 result; + + value::rgb8 operator()(const int& v) const + { + int v_d2 = std::abs(v) * 0.0001; + + if (v < 0) + return value::rgb8(128 + v_d2, v_d2, v_d2); + else if (v > 0) + return value::rgb8(v_d2, 128 + v_d2, v_d2); + else + return value::rgb8(255, 255, 255); + } + }; + +} + + +int main(int argc, char *argv[]) +{ + using namespace mln; + + + if (argc != 3) + { + std::cout << "Usage: " << argv[0] << " in.dump out.ppm" << std::endl; + return 1; + } + + image2d<double> input; + + io::dump::load(input, argv[1]); + + color_diff f; + image2d<value::rgb8> result = data::transform(input, f); + + io::ppm::save(result, argv[2]); +} -- 1.7.2.5

1 0

olena-2.0-77-ge375d14 z/sauvola_ms_rv/skewness/skewness2.cc: Retrieve skewness debug image.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

--- scribo/sandbox/ChangeLog | 5 +++++ .../sandbox/z/sauvola_ms_rv/skewness/skewness2.cc | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index ba8672b..67fe4a3 100644 --- a/scribo/sandbox/ChangeLog +++ b/scribo/sandbox/ChangeLog @@ -1,5 +1,10 @@ 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * z/sauvola_ms_rv/skewness/skewness2.cc: Retrieve skewness debug + image. + +2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * z/sauvola_ms_rv/skewness/skewness2.cc: Fix calls to sauvola. 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/sandbox/z/sauvola_ms_rv/skewness/skewness2.cc b/scribo/sandbox/z/sauvola_ms_rv/skewness/skewness2.cc index 9b77a99..331575f 100644 --- a/scribo/sandbox/z/sauvola_ms_rv/skewness/skewness2.cc +++ b/scribo/sandbox/z/sauvola_ms_rv/skewness/skewness2.cc @@ -32,6 +32,7 @@ #include "integral_browsing_rv.hh" mln::image2d<bool> skewness_pbm; +mln::image2d<double> skewness_d; std::string prefix; @@ -197,6 +198,7 @@ int main(int argc, char *argv[]) scribo::canvas::integral_browsing_rv(integral_sum_sum_2_sum_3, skewness_win_size, skewness_win_size, f); skewness_pbm = f.skewness_; + skewness_d = f.skewness_d_; t.stop(); std::cout << "invert on skewness - " << t << std::endl; -- 1.7.2.5

1 0

olena-2.0-76-ga987daa scribo/binarization/sauvola_threshold.hh: Add some debug.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

--- scribo/ChangeLog | 4 ++++ scribo/scribo/binarization/sauvola_threshold.hh | 6 +++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 6c79022..8b2cae5 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/binarization/sauvola_threshold.hh: Add some debug. + +2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + Compute Sauvola on documents with light text and dark background. * scribo/binarization/internal/compute_local_threshold.hh, diff --git a/scribo/scribo/binarization/sauvola_threshold.hh b/scribo/scribo/binarization/sauvola_threshold.hh index df46e95..7950c13 100644 --- a/scribo/scribo/binarization/sauvola_threshold.hh +++ b/scribo/scribo/binarization/sauvola_threshold.hh @@ -44,7 +44,7 @@ # include <scribo/binarization/internal/compute_local_threshold.hh> # include <scribo/binarization/internal/sauvola_formula.hh> - +extern std::string prefix; namespace scribo { @@ -130,6 +130,7 @@ namespace scribo # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG initialize(internal::debug_mean, input); initialize(internal::debug_stddev, input); + initialize(internal::debug_threshold, input); initialize(internal::debug_alpham, input); initialize(internal::debug_alphacond, input); @@ -262,6 +263,9 @@ namespace scribo simple = init_integral_image(input, scribo::internal::identity_), squared = init_integral_image(input, scribo::internal::square_); + io::dump::save(simple, prefix + "simple.dump"); + io::dump::save(squared, prefix + "squared.dump"); + return sauvola_threshold(input, window_size, K, simple, squared); } -- 1.7.2.5

1 0

olena-2.0-75-gb09fb77 z/sauvola_ms_rv/skewness/skewness2.cc: Fix calls to sauvola.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

--- scribo/sandbox/ChangeLog | 4 ++ .../sandbox/z/sauvola_ms_rv/skewness/skewness2.cc | 31 +++++++++++++------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index 446cae0..ba8672b 100644 --- a/scribo/sandbox/ChangeLog +++ b/scribo/sandbox/ChangeLog @@ -1,5 +1,9 @@ 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * z/sauvola_ms_rv/skewness/skewness2.cc: Fix calls to sauvola. + +2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + Add new tools. * z/sauvola_ms_rv/pgm_color_diff.cc, diff --git a/scribo/sandbox/z/sauvola_ms_rv/skewness/skewness2.cc b/scribo/sandbox/z/sauvola_ms_rv/skewness/skewness2.cc index 043e0ad..9b77a99 100644 --- a/scribo/sandbox/z/sauvola_ms_rv/skewness/skewness2.cc +++ b/scribo/sandbox/z/sauvola_ms_rv/skewness/skewness2.cc @@ -26,9 +26,9 @@ #include <mln/arith/revert.hh> #include <mln/util/timer.hh> -mln::image2d<double> skewness; #include <scribo/binarization/sauvola_ms.hh> +#include <scribo/binarization/sauvola.hh> #include "integral_browsing_rv.hh" mln::image2d<bool> skewness_pbm; @@ -131,7 +131,8 @@ namespace mln struct invert_on_skewness { I input; - image2d<double> skewness_; + image2d<bool> skewness_; + image2d<double> skewness_d_; mln_fwd_pixter(I) pxl; invert_on_skewness(const I& input_) @@ -140,14 +141,16 @@ namespace mln { pxl.start(); initialize(skewness_, input); + initialize(skewness_d_, input); } void exec(double skewness) { - skewness_.element(pxl.offset()) = skewness; + skewness_d_.element(pxl.offset()) = skewness; + skewness_.element(pxl.offset()) = (skewness <= 1000.); - if (skewness > 1000.) - pxl.val() = 255 - pxl.val(); + // if (skewness > 1000.) + // pxl.val() = 255 - pxl.val(); pxl.next(); // next pixel } @@ -163,9 +166,9 @@ int main(int argc, char *argv[]) { using namespace mln; - if (argc != 4) + if (argc != 5) { - std::cerr << "Usage: " << argv[0] << " <input.pgm> <prefix> <win_size>" << std::endl; + std::cerr << "Usage: " << argv[0] << " <input.pgm> <prefix> <skewness_win_size> <sauvola_win_size>" << std::endl; return 1; } @@ -179,7 +182,8 @@ int main(int argc, char *argv[]) prefix = argv[2]; - int win_size = atoi(argv[3]); + int skewness_win_size = atoi(argv[3]); + int sauvola_win_size = atoi(argv[4]); t.stop(); std::cout << "Initialization - " << t << std::endl; @@ -190,16 +194,21 @@ int main(int argc, char *argv[]) scribo::integral_rv(input, integral_sum_sum_2_sum_3); invert_on_skewness<image2d<value::int_u8> > f(input); - scribo::canvas::integral_browsing_rv(integral_sum_sum_2_sum_3, win_size, win_size, f); + scribo::canvas::integral_browsing_rv(integral_sum_sum_2_sum_3, skewness_win_size, skewness_win_size, f); + + skewness_pbm = f.skewness_; t.stop(); std::cout << "invert on skewness - " << t << std::endl; io::dump::save(f.skewness_, prefix + "skewness.dump"); + io::dump::save(f.skewness_d_, prefix + "skewness_d.dump"); t.restart(); - image2d<bool> bin = scribo::binarization::sauvola_ms(f.input, 101, 2); - std::cout << "sauvola_ms - " << t << std::endl; +// image2d<bool> bin = scribo::binarization::sauvola_ms(input, 101, 2); +// std::cout << "sauvola_ms - " << t << std::endl; + image2d<bool> bin = scribo::binarization::sauvola(input, sauvola_win_size); + std::cout << "sauvola - " << t << std::endl; std::cout << "Total time : " << tt << std::endl; -- 1.7.2.5

1 0

olena-2.0-74-g9be09ea Compute Sauvola on documents with light text and dark background.
by Guillaume Lazzara 23 Aug '12

23 Aug '12

* scribo/binarization/internal/compute_local_threshold.hh, * scribo/binarization/internal/first_pass_functor.hh, * scribo/binarization/internal/sauvola_formula.hh, * scribo/binarization/local_threshold.hh: Update formula. --- scribo/ChangeLog | 9 ++++++ .../internal/compute_local_threshold.hh | 15 +++++++++- .../binarization/internal/first_pass_functor.hh | 2 +- .../binarization/internal/sauvola_formula.hh | 22 +++++++++++----- scribo/scribo/binarization/local_threshold.hh | 27 +++++++++++++------ 5 files changed, 56 insertions(+), 19 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f8d7491..6c79022 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,12 @@ +2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + Compute Sauvola on documents with light text and dark background. + + * scribo/binarization/internal/compute_local_threshold.hh, + * scribo/binarization/internal/first_pass_functor.hh, + * scribo/binarization/internal/sauvola_formula.hh, + * scribo/binarization/local_threshold.hh: Update formula. + 2012-05-10 Guillaume Lazzara <z(a)lrde.epita.fr> Improve option parser. diff --git a/scribo/scribo/binarization/internal/compute_local_threshold.hh b/scribo/scribo/binarization/internal/compute_local_threshold.hh index 147ef0f..4c25e17 100644 --- a/scribo/scribo/binarization/internal/compute_local_threshold.hh +++ b/scribo/scribo/binarization/internal/compute_local_threshold.hh @@ -42,7 +42,8 @@ -// extern mln::image2d<double> skewness; +extern mln::image2d<double> skewness; +extern mln::image2d<bool> skewness_pbm; namespace scribo { @@ -117,6 +118,11 @@ namespace scribo - simple.at_(row_max, col_min) - simple.at_(row_min, col_max)); + // if (!skewness_pbm(p)) + // { + // m_x_y_tmp = 255 * wh - m_x_y_tmp; + // } + double m_x_y = m_x_y_tmp / wh; # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG @@ -130,6 +136,11 @@ namespace scribo - squared.at_(row_max, col_min) - squared.at_(row_min, col_max)); + // if (!skewness_pbm(p)) + // { + // s_x_y_tmp = std::pow(255, 2) * wh - s_x_y_tmp; + // } + double s_x_y = std::sqrt((s_x_y_tmp - (m_x_y_tmp * m_x_y_tmp) / wh) / (wh - 1.f)); # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG @@ -140,7 +151,7 @@ namespace scribo // Thresholding. // skewness_ = skewness(p); // b = (p == point2d(5,5)); - double t_x_y = formula(m_x_y, s_x_y, K, R); + double t_x_y = formula(p, m_x_y, s_x_y, K, R); # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG double alpha = K * (1 - s_x_y / R); diff --git a/scribo/scribo/binarization/internal/first_pass_functor.hh b/scribo/scribo/binarization/internal/first_pass_functor.hh index 8da401b..f0ae5a9 100644 --- a/scribo/scribo/binarization/internal/first_pass_functor.hh +++ b/scribo/scribo/binarization/internal/first_pass_functor.hh @@ -132,7 +132,7 @@ namespace scribo unsigned p = pxl.offset(); value::int_u8 t_p; - mln::convert::from_to(formula_(mean, stddev, K_, R_), + mln::convert::from_to(formula_(input.point_at_index(p), mean, stddev, K_, R_), t_p); msk.element(p) = input.element(p) < t_p; diff --git a/scribo/scribo/binarization/internal/sauvola_formula.hh b/scribo/scribo/binarization/internal/sauvola_formula.hh index adbef13..e010e85 100644 --- a/scribo/scribo/binarization/internal/sauvola_formula.hh +++ b/scribo/scribo/binarization/internal/sauvola_formula.hh @@ -46,6 +46,10 @@ # define SCRIBO_DEFAULT_SAUVOLA_R 128 +#include <mln/core/alias/point2d.hh> + +extern mln::image2d<bool> skewness_pbm; + namespace scribo { @@ -55,6 +59,8 @@ namespace scribo namespace internal { + using namespace mln; + struct sauvola_formula { @@ -70,13 +76,13 @@ namespace scribo \return A threshold. */ - double operator()(const double m_x_y, const double s_x_y, + double operator()(const point2d& p, const double m_x_y, const double s_x_y, const double K, const double R) const; /*! \overload K = 0.34 and R = 128. */ - double operator()(const double m_x_y, const double s_x_y) const; + double operator()(const point2d& p, const double m_x_y, const double s_x_y) const; }; @@ -88,7 +94,7 @@ namespace scribo inline double - sauvola_formula::operator()(const double m_x_y, const double s_x_y, + sauvola_formula::operator()(const point2d& p, const double m_x_y, const double s_x_y, const double K, const double R) const { // if (b) @@ -98,15 +104,17 @@ namespace scribo // if (skewness_ > 0) // if (new_t != old_t) // std::cout << skewness_ << " - " << new_t << " vs " << old_t << std::endl; - - return m_x_y * (1.0 + K * ((s_x_y / R) - 1.0)); + if (skewness_pbm(p)) + return m_x_y * (1.0 + K * ((s_x_y / R) - 1.0)); + else + return (255 - m_x_y) * (1.0 + K * ((s_x_y / R) - 1.0)); } inline double - sauvola_formula::operator()(const double m_x_y, const double s_x_y) const + sauvola_formula::operator()(const point2d& p, const double m_x_y, const double s_x_y) const { - return (*this)(m_x_y, s_x_y, + return (*this)(p, m_x_y, s_x_y, SCRIBO_DEFAULT_SAUVOLA_K, SCRIBO_DEFAULT_SAUVOLA_R); } diff --git a/scribo/scribo/binarization/local_threshold.hh b/scribo/scribo/binarization/local_threshold.hh index 9d116ed..ab589e2 100644 --- a/scribo/scribo/binarization/local_threshold.hh +++ b/scribo/scribo/binarization/local_threshold.hh @@ -34,12 +34,13 @@ /// /// \brief Binarize an image using a threshold image. +extern mln::image2d<bool> skewness_pbm; + namespace scribo { using namespace mln; - namespace binarization { @@ -110,8 +111,10 @@ namespace scribo mln_piter(I) p(input.domain()); for_all(p) - output(p) = (input(p) <= threshold(p)); - + if (skewness_pbm(p)) + output(p) = (input(p) <= threshold(p)); + else + output(p) = ((255 - input(p)) <= threshold(p)); trace::exiting("scribo::binarization::impl::generic::local_threshold"); return output; @@ -132,6 +135,8 @@ namespace scribo const I& input = exact(input_); const T& threshold = exact(threshold_); + border::resize(::skewness_pbm, input.border()); + typedef mln_ch_value(I, bool) O; O output; initialize(output, input); @@ -139,8 +144,12 @@ namespace scribo mln_pixter(const I) pi(input); mln_pixter(const T) pt(threshold); mln_pixter(O) po(output); + for_all_3(pi, pt, po) - po.val() = pi.val() <= pt.val(); + if (skewness_pbm.element(pi.offset())) + po.val() = (pi.val() <= pt.val()); + else + po.val() = ((255 - pi.val()) <= pt.val()); trace::exiting("scribo::binarization::impl::generic::local_threshold_fastest"); return output; @@ -159,7 +168,7 @@ namespace scribo template <typename I, typename T> mln_ch_value(I, bool) - local_threshold_dispatch(trait::image::value_alignment::any, + local_threshold_dispatch(trait::image::speed::any, trait::image::speed::any, const Image<I>& input, const Image<T>& threshold) { @@ -169,7 +178,7 @@ namespace scribo template <typename I, typename T> mln_ch_value(I, bool) - local_threshold_dispatch(trait::image::value_alignment::with_grid, + local_threshold_dispatch(trait::image::speed::fastest, trait::image::speed::fastest, const Image<I>& input, const Image<T>& threshold) { @@ -181,9 +190,9 @@ namespace scribo local_threshold_dispatch(const Image<I>& input, const Image<T>& threshold) { - return local_threshold_dispatch(mln_trait_image_value_alignment(I)(), - mln_trait_image_speed(I)(), - exact(input), exact(threshold)); + return local_threshold_dispatch(mln_trait_image_speed(I)(), + mln_trait_image_speed(T)(), + input, threshold); } } // end of namespace scribo::binarization::internal -- 1.7.2.5

1 0