November 2010 - Olena-patches

branch libiberty-pic updated: last-svn-commit-566-ge222518
by git＠lrde.epita.fr 15 Nov '10

15 Nov '10

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 libiberty-pic has been updated discards 07fe77d332c3f965bc1b787bda765f5b2fbe2341 (commit) discards c23c47928224c69eeadc539f85400749495706a0 (commit) discards d3cd1aa0a318cd998d6da9a2c13e9c5831116ed6 (commit) discards 45f7112e908c9e32cf6a0f33ead120ff0c53b63f (commit) discards de87f38439ee6a1d61806244caf726a5c8e9d368 (commit) discards cf101e3de813d028e91b9224fc275d97bd6d73d7 (commit) discards c1521eb5c4e1e5d92a5ddeab2c1960a0a9bc5626 (commit) via e22251860ebb2ed0691abaeb10a60cbdf899802a (commit) via 72191f7881ca5da0df2d0a0be82b8f75a99bfcb0 (commit) via 1712587063361e777e99cc2dc0e9e69c55a76295 (commit) via 3f96f84fc087b6bde1b39b1d1c9823a92d953123 (commit) via 913844fe64a7ab1328f75c6ba4362aac80503e64 (commit) via 0117b205ee9b11bc7b5b34e9ffbdc0520969becc (commit) via 92c53da51d7fabb2573fbe93634d5c1cec105365 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (07fe77d332c3f965bc1b787bda765f5b2fbe2341) \ N -- N -- N (e22251860ebb2ed0691abaeb10a60cbdf899802a) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 ----------------------------------------------------------------- e222518 Build Libiberty as a shared library. 72191f7 Mention Libiberty in Extatica's AUTHORS, NEWS and README. 1712587 Work around a defect in Libiberty's `configure.ac' (in Olena). 3f96f84 Work around a defect in Libiberty's `configure.ac' (in Extatica). 913844f Fix the distribution of Libiberty. 0117b20 Fix cleaning rules in Libiberty. 92c53da Make Libiberty compatible with Automake. ----------------------------------------------------------------------- Summary of changes: extatica/ChangeLog | 2 ++ extatica/libiberty/Makefile.in | 2 +- extatica/libiberty/local.mk | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-586-g938b829 Add a new debug tool.
by Guillaume Lazzara 15 Nov '10

15 Nov '10

* src/debug/Makefile.am: Add new target. * src/debug/center_pixel_stats.cc: New debug tool. --- scribo/ChangeLog | 8 +++++ scribo/src/debug/Makefile.am | 2 + scribo/src/debug/center_pixel_stats.cc | 52 ++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 0 deletions(-) create mode 100644 scribo/src/debug/center_pixel_stats.cc diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 253021d..dc66eb2 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new debug tool. + + * src/debug/Makefile.am: Add new target. + + * src/debug/center_pixel_stats.cc: New debug tool. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/canvas/integral_browsing.hh: Cleanup comments. 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/src/debug/Makefile.am b/scribo/src/debug/Makefile.am index d203f5c..e236dc4 100644 --- a/scribo/src/debug/Makefile.am +++ b/scribo/src/debug/Makefile.am @@ -18,6 +18,7 @@ include $(top_srcdir)/scribo/scribo.mk noinst_PROGRAMS = \ + center_pixel_stats \ show_info_x_height \ show_info_median_inter_characters \ show_links_left_right_links_validation \ @@ -46,6 +47,7 @@ noinst_PROGRAMS = \ show_objects_thin +center_pixel_stats_SOURCES = center_pixel_stats.cc show_info_x_height_SOURCES = show_info_x_height.cc show_info_median_inter_characters_SOURCES = show_info_median_inter_characters.cc show_links_left_right_links_validation_SOURCES = show_links_left_right_links_validation.cc diff --git a/scribo/src/debug/center_pixel_stats.cc b/scribo/src/debug/center_pixel_stats.cc new file mode 100644 index 0000000..c9d154d --- /dev/null +++ b/scribo/src/debug/center_pixel_stats.cc @@ -0,0 +1,52 @@ +#include <mln/core/image/image2d.hh> +#include <mln/accu/stat/deviation.hh> +#include <mln/accu/stat/mean.hh> +#include <mln/accu/pair.hh> +#include <mln/data/compute.hh> +#include <mln/io/pgm/load.hh> + +#include <scribo/binarization/sauvola_threshold_image.hh> + +#include <scribo/debug/usage.hh> + + +const char *args_desc[][2] = +{ + { "input.pgm", "A graylevel image." }, + {0, 0} +}; + + + +int main(int argc, char *argv[]) +{ + using namespace mln; + using namespace scribo::binarization::internal; + + if (argc != 2) + return scribo::debug::usage(argv, + "Give statistics for the center pixel " + "of an image. The whole image is considered " + "as a window centered to that pixel.", + "input.* input.pgm", + args_desc); + + typedef value::int_u8 V; + image2d<V> input; + io::pgm::load(input, argv[1]); + + typedef accu::stat::deviation<V> dev_t; + typedef accu::stat::mean<V> mean_t; + + float mean = data::compute(mean_t(), input); + dev_t dev(mean); + float stddev = data::compute(dev, input); + + std::cout << "mean = " << mean + << " - stddev = " << stddev + << std::endl; + std::cout << "center = " << input.domain().pcenter() + << " - threshold = " + << sauvola_threshold_formula(mean, stddev, 0.34, 128) + << std::endl; +} -- 1.5.6.5

1 0

last-svn-commit-585-g65981fd scribo/canvas/integral_browsing.hh: Cleanup comments.
by Guillaume Lazzara 15 Nov '10

15 Nov '10

--- scribo/ChangeLog | 4 ++++ scribo/scribo/canvas/integral_browsing.hh | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 60f0842..253021d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/canvas/integral_browsing.hh: Cleanup comments. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/binarization/sauvola_ms.cc: Add missing includes. 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/canvas/integral_browsing.hh b/scribo/scribo/canvas/integral_browsing.hh index 4e55109..286dc53 100644 --- a/scribo/scribo/canvas/integral_browsing.hh +++ b/scribo/scribo/canvas/integral_browsing.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -58,9 +59,6 @@ namespace scribo double& mean, double& stddev) { mean = sum / n; -// stddev = std::sqrt(sum_2 / n - mean * mean); - -// std::cout << "(" << mean << " - " << stddev << " - " << n << "),"; // unbias version: double num = (sum_2 - sum * sum / n); -- 1.5.6.5

1 0

last-svn-commit-585-g5a6d399 scribo/canvas/integral_browsing.hh: Cleanup comments.
by Guillaume Lazzara 15 Nov '10

15 Nov '10

--- scribo/ChangeLog | 4 ++++ scribo/scribo/canvas/integral_browsing.hh | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 60f0842..253021d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/canvas/integral_browsing.hh: Cleanup comments. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/binarization/sauvola_ms.cc: Add missing includes. 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/canvas/integral_browsing.hh b/scribo/scribo/canvas/integral_browsing.hh index 4e55109..286dc53 100644 --- a/scribo/scribo/canvas/integral_browsing.hh +++ b/scribo/scribo/canvas/integral_browsing.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -58,9 +59,6 @@ namespace scribo double& mean, double& stddev) { mean = sum / n; -// stddev = std::sqrt(sum_2 / n - mean * mean); - -// std::cout << "(" << mean << " - " << stddev << " - " << n << "),"; // unbias version: double num = (sum_2 - sum * sum / n); -- 1.5.6.5

1 0

last-svn-commit-584-gd33f580 src/binarization/sauvola_ms.cc: Add missing includes.
by Guillaume Lazzara 15 Nov '10

15 Nov '10

--- scribo/ChangeLog | 4 ++++ scribo/src/binarization/sauvola_ms.cc | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 0e2ace9..60f0842 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/binarization/sauvola_ms.cc: Add missing includes. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Set default window size to 101 in Sauvola examples. * src/binarization/pgm_sauvola.cc, diff --git a/scribo/src/binarization/sauvola_ms.cc b/scribo/src/binarization/sauvola_ms.cc index d85eece..5f07484 100644 --- a/scribo/src/binarization/sauvola_ms.cc +++ b/scribo/src/binarization/sauvola_ms.cc @@ -28,6 +28,8 @@ #include <mln/value/int_u8.hh> #include <mln/io/magick/load.hh> #include <mln/io/pbm/save.hh> +#include <mln/data/transform.hh> +#include <mln/fun/v2v/rgb_to_int_u.hh> #include <scribo/binarization/sauvola_ms.hh> #include <scribo/debug/usage.hh> -- 1.5.6.5

1 0

last-svn-commit-584-g5cc2327 src/binarization/sauvola_ms.cc: Add missing includes.
by Guillaume Lazzara 15 Nov '10

15 Nov '10

--- scribo/ChangeLog | 4 ++++ scribo/src/binarization/sauvola_ms.cc | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 0e2ace9..60f0842 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/binarization/sauvola_ms.cc: Add missing includes. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Set default window size to 101 in Sauvola examples. * src/binarization/pgm_sauvola.cc, diff --git a/scribo/src/binarization/sauvola_ms.cc b/scribo/src/binarization/sauvola_ms.cc index d85eece..5f07484 100644 --- a/scribo/src/binarization/sauvola_ms.cc +++ b/scribo/src/binarization/sauvola_ms.cc @@ -28,6 +28,8 @@ #include <mln/value/int_u8.hh> #include <mln/io/magick/load.hh> #include <mln/io/pbm/save.hh> +#include <mln/data/transform.hh> +#include <mln/fun/v2v/rgb_to_int_u.hh> #include <scribo/binarization/sauvola_ms.hh> #include <scribo/debug/usage.hh> -- 1.5.6.5

1 0

last-svn-commit-583-g91a43ae Set default window size to 101 in Sauvola examples.
by Guillaume Lazzara 15 Nov '10

15 Nov '10

* src/binarization/pgm_sauvola.cc, * src/binarization/ppm_sauvola.cc, * src/binarization/sauvola.cc: Set default window size to 101. --- scribo/ChangeLog | 8 ++++++++ scribo/src/binarization/pgm_sauvola.cc | 4 ++-- scribo/src/binarization/ppm_sauvola.cc | 4 ++-- scribo/src/binarization/sauvola.cc | 15 ++++++++++++--- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e2c4883..0e2ace9 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Set default window size to 101 in Sauvola examples. + + * src/binarization/pgm_sauvola.cc, + * src/binarization/ppm_sauvola.cc, + * src/binarization/sauvola.cc: Set default window size to 101. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve debug management and outputs for Sauvola. * scribo/binarization/internal/compute_sauvola_threshold.hh: diff --git a/scribo/src/binarization/pgm_sauvola.cc b/scribo/src/binarization/pgm_sauvola.cc index c6ba643..1052766 100644 --- a/scribo/src/binarization/pgm_sauvola.cc +++ b/scribo/src/binarization/pgm_sauvola.cc @@ -34,7 +34,7 @@ const char *args_desc[][2] = { { "input.pgm", "A gray level image." }, { "output.pbm", "A binary image." }, - { "w", "Window size (default 51)." }, + { "w", "Window size (default 101)." }, { "k", "Sauvola's formulae parameter (default 0.34)." }, {0, 0} }; @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) if (argc == 4) w = atoi(argv[3]); else - w = 51; + w = 101; double k; if (argc == 5) diff --git a/scribo/src/binarization/ppm_sauvola.cc b/scribo/src/binarization/ppm_sauvola.cc index 0b798ae..330af70 100644 --- a/scribo/src/binarization/ppm_sauvola.cc +++ b/scribo/src/binarization/ppm_sauvola.cc @@ -34,7 +34,7 @@ const char *args_desc[][2] = { { "input.ppm", "A color image." }, { "output.pbm", "A binary image." }, - { "w", "Window size (default 51)." }, + { "w", "Window size (default 101)." }, { "k", "Sauvola's formulae parameter (default 0.34)." }, {0, 0} }; @@ -56,7 +56,7 @@ int main(int argc, char *argv[]) if (argc == 4) w = atoi(argv[3]); else - w = 51; + w = 101; double k; if (argc == 5) diff --git a/scribo/src/binarization/sauvola.cc b/scribo/src/binarization/sauvola.cc index fb07b0d..3969524 100644 --- a/scribo/src/binarization/sauvola.cc +++ b/scribo/src/binarization/sauvola.cc @@ -24,8 +24,12 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +#include <mln/core/image/image2d.hh> +#include <mln/value/int_u8.hh> #include <mln/io/magick/load.hh> #include <mln/io/pbm/save.hh> +#include <mln/data/transform.hh> +#include <mln/fun/v2v/rgb_to_int_u.hh> #include <scribo/binarization/sauvola.hh> #include <scribo/debug/usage.hh> @@ -34,7 +38,7 @@ const char *args_desc[][2] = { { "input.*", "An image." }, { "output.pbm", "A binary image." }, - { "w", "Window size (default 51)." }, + { "w", "Window size (default 101)." }, { "k", "Sauvola's formulae parameter (default 0.34)." }, {0, 0} }; @@ -56,7 +60,7 @@ int main(int argc, char *argv[]) if (argc >= 4) w = atoi(argv[3]); else - w = 51; + w = 101; double k; if (argc >= 5) @@ -69,7 +73,12 @@ int main(int argc, char *argv[]) image2d<value::rgb8> input; io::magick::load(input, argv[1]); - image2d<bool> out = scribo::binarization::sauvola(input, w, k); + // Convert to Gray level image. + image2d<value::int_u8> + input_1_gl = data::transform(input, mln::fun::v2v::rgb_to_int_u<8>()); + + + image2d<bool> out = scribo::binarization::sauvola(input_1_gl, w, k); io::pbm::save(out, argv[2]); -- 1.5.6.5

1 0

last-svn-commit-583-ga10c9ac Set default window size to 101 in Sauvola examples.
by Guillaume Lazzara 15 Nov '10

15 Nov '10

* src/binarization/pgm_sauvola.cc, * src/binarization/ppm_sauvola.cc, * src/binarization/sauvola.cc: Set default window size to 101. --- scribo/ChangeLog | 8 ++++++++ scribo/src/binarization/pgm_sauvola.cc | 4 ++-- scribo/src/binarization/ppm_sauvola.cc | 4 ++-- scribo/src/binarization/sauvola.cc | 15 ++++++++++++--- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e2c4883..0e2ace9 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Set default window size to 101 in Sauvola examples. + + * src/binarization/pgm_sauvola.cc, + * src/binarization/ppm_sauvola.cc, + * src/binarization/sauvola.cc: Set default window size to 101. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve debug management and outputs for Sauvola. * scribo/binarization/internal/compute_sauvola_threshold.hh: diff --git a/scribo/src/binarization/pgm_sauvola.cc b/scribo/src/binarization/pgm_sauvola.cc index c6ba643..1052766 100644 --- a/scribo/src/binarization/pgm_sauvola.cc +++ b/scribo/src/binarization/pgm_sauvola.cc @@ -34,7 +34,7 @@ const char *args_desc[][2] = { { "input.pgm", "A gray level image." }, { "output.pbm", "A binary image." }, - { "w", "Window size (default 51)." }, + { "w", "Window size (default 101)." }, { "k", "Sauvola's formulae parameter (default 0.34)." }, {0, 0} }; @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) if (argc == 4) w = atoi(argv[3]); else - w = 51; + w = 101; double k; if (argc == 5) diff --git a/scribo/src/binarization/ppm_sauvola.cc b/scribo/src/binarization/ppm_sauvola.cc index 0b798ae..330af70 100644 --- a/scribo/src/binarization/ppm_sauvola.cc +++ b/scribo/src/binarization/ppm_sauvola.cc @@ -34,7 +34,7 @@ const char *args_desc[][2] = { { "input.ppm", "A color image." }, { "output.pbm", "A binary image." }, - { "w", "Window size (default 51)." }, + { "w", "Window size (default 101)." }, { "k", "Sauvola's formulae parameter (default 0.34)." }, {0, 0} }; @@ -56,7 +56,7 @@ int main(int argc, char *argv[]) if (argc == 4) w = atoi(argv[3]); else - w = 51; + w = 101; double k; if (argc == 5) diff --git a/scribo/src/binarization/sauvola.cc b/scribo/src/binarization/sauvola.cc index fb07b0d..3969524 100644 --- a/scribo/src/binarization/sauvola.cc +++ b/scribo/src/binarization/sauvola.cc @@ -24,8 +24,12 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +#include <mln/core/image/image2d.hh> +#include <mln/value/int_u8.hh> #include <mln/io/magick/load.hh> #include <mln/io/pbm/save.hh> +#include <mln/data/transform.hh> +#include <mln/fun/v2v/rgb_to_int_u.hh> #include <scribo/binarization/sauvola.hh> #include <scribo/debug/usage.hh> @@ -34,7 +38,7 @@ const char *args_desc[][2] = { { "input.*", "An image." }, { "output.pbm", "A binary image." }, - { "w", "Window size (default 51)." }, + { "w", "Window size (default 101)." }, { "k", "Sauvola's formulae parameter (default 0.34)." }, {0, 0} }; @@ -56,7 +60,7 @@ int main(int argc, char *argv[]) if (argc >= 4) w = atoi(argv[3]); else - w = 51; + w = 101; double k; if (argc >= 5) @@ -69,7 +73,12 @@ int main(int argc, char *argv[]) image2d<value::rgb8> input; io::magick::load(input, argv[1]); - image2d<bool> out = scribo::binarization::sauvola(input, w, k); + // Convert to Gray level image. + image2d<value::int_u8> + input_1_gl = data::transform(input, mln::fun::v2v::rgb_to_int_u<8>()); + + + image2d<bool> out = scribo::binarization::sauvola(input_1_gl, w, k); io::pbm::save(out, argv[2]); -- 1.5.6.5

1 0

last-svn-commit-582-g87a2f38 Improve debug management and outputs for Sauvola.
by Guillaume Lazzara 15 Nov '10

15 Nov '10

* scribo/binarization/internal/compute_sauvola_threshold.hh: New. Move sauvola_threshold related routines here. * scribo/binarization/internal/first_pass_functor.hh, * scribo/binarization/sauvola.hh, * scribo/binarization/sauvola_ms.hh, * scribo/binarization/sauvola_threshold_image.hh: Move debug variables... * scribo/binarization/internal/sauvola_debug.hh: ... here. New. * scribo/binarization/sauvola_threshold_image_debug.hh: Remove. * src/binarization/Makefile.am, * src/binarization/sauvola_debug.cc, * src/binarization/sauvola_ms_debug.cc: Improve debug outputs. * src/binarization/pgm_sauvola_threshold_image.cc: New. --- scribo/ChangeLog | 23 +++++++++++++++++ .../{sauvola.cc => pgm_sauvola_threshold_image.cc} | 26 +++++++++---------- 2 files changed, 35 insertions(+), 14 deletions(-) copy scribo/src/binarization/{sauvola.cc => pgm_sauvola_threshold_image.cc} (77%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index eceb1ba..e2c4883 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -19,6 +19,29 @@ * src/binarization/sauvola_debug.cc, * src/binarization/sauvola_ms_debug.cc: Improve debug outputs. + * src/binarization/pgm_sauvola_threshold_image.cc: New. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Improve debug management and outputs for Sauvola. + + * scribo/binarization/internal/compute_sauvola_threshold.hh: + New. Move sauvola_threshold related routines here. + + * scribo/binarization/internal/first_pass_functor.hh, + * scribo/binarization/sauvola.hh, + * scribo/binarization/sauvola_ms.hh, + * scribo/binarization/sauvola_threshold_image.hh: Move debug + variables... + + * scribo/binarization/internal/sauvola_debug.hh: ... here. New. + + * scribo/binarization/sauvola_threshold_image_debug.hh: Remove. + + * src/binarization/Makefile.am, + * src/binarization/sauvola_debug.cc, + * src/binarization/sauvola_ms_debug.cc: Improve debug outputs. + 2010-08-06 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> Add arrows shortcuts. diff --git a/scribo/src/binarization/sauvola.cc b/scribo/src/binarization/pgm_sauvola_threshold_image.cc similarity index 77% copy from scribo/src/binarization/sauvola.cc copy to scribo/src/binarization/pgm_sauvola_threshold_image.cc index fb07b0d..a38784a 100644 --- a/scribo/src/binarization/sauvola.cc +++ b/scribo/src/binarization/pgm_sauvola_threshold_image.cc @@ -1,5 +1,4 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,17 +23,16 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#include <mln/io/magick/load.hh> -#include <mln/io/pbm/save.hh> +#include <mln/io/pgm/all.hh> #include <scribo/binarization/sauvola.hh> #include <scribo/debug/usage.hh> const char *args_desc[][2] = { - { "input.*", "An image." }, - { "output.pbm", "A binary image." }, - { "w", "Window size (default 51)." }, + { "input.pgm", "A graylevel image." }, + { "output.pgm", "A threshold image." }, + { "w", "Window size (default 101)." }, { "k", "Sauvola's formulae parameter (default 0.34)." }, {0, 0} }; @@ -46,8 +44,8 @@ int main(int argc, char *argv[]) if (argc != 5 && argc != 4 && argc != 3) return scribo::debug::usage(argv, - "Binarization based on Sauvola's algorithm.", - "input.* output.pbm <w> <k>", + "Compute a threshold image based on Sauvola's algorithm.", + "input.pgm output.pgm <w> <k>", args_desc); trace::entering("main"); @@ -56,7 +54,7 @@ int main(int argc, char *argv[]) if (argc >= 4) w = atoi(argv[3]); else - w = 51; + w = 101; double k; if (argc >= 5) @@ -66,13 +64,13 @@ int main(int argc, char *argv[]) std::cout << "Using w=" << w << " and k=" << k << std::endl; - image2d<value::rgb8> input; - io::magick::load(input, argv[1]); + image2d<value::int_u8> input; + io::pgm::load(input, argv[1]); - image2d<bool> out = scribo::binarization::sauvola(input, w, k); + image2d<value::int_u8> out = scribo::binarization::sauvola_threshold_image(input, w, k); - io::pbm::save(out, argv[2]); + io::pgm::save(out, argv[2]); trace::exiting("main"); -- 1.5.6.5

1 0

last-svn-commit-582-g3081130 Improve debug management and outputs for Sauvola.
by Guillaume Lazzara 15 Nov '10

15 Nov '10

* scribo/binarization/internal/compute_sauvola_threshold.hh: New. Move sauvola_threshold related routines here. * scribo/binarization/internal/first_pass_functor.hh, * scribo/binarization/sauvola.hh, * scribo/binarization/sauvola_ms.hh, * scribo/binarization/sauvola_threshold_image.hh: Move debug variables... * scribo/binarization/internal/sauvola_debug.hh: ... here. New. * scribo/binarization/sauvola_threshold_image_debug.hh: Remove. * src/binarization/Makefile.am, * src/binarization/sauvola_debug.cc, * src/binarization/sauvola_ms_debug.cc: Improve debug outputs. * src/binarization/pgm_sauvola_threshold_image.cc: New. --- scribo/ChangeLog | 23 +++++++++++++++++ .../{sauvola.cc => pgm_sauvola_threshold_image.cc} | 26 +++++++++---------- 2 files changed, 35 insertions(+), 14 deletions(-) copy scribo/src/binarization/{sauvola.cc => pgm_sauvola_threshold_image.cc} (77%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index eceb1ba..e2c4883 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -19,6 +19,29 @@ * src/binarization/sauvola_debug.cc, * src/binarization/sauvola_ms_debug.cc: Improve debug outputs. + * src/binarization/pgm_sauvola_threshold_image.cc: New. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Improve debug management and outputs for Sauvola. + + * scribo/binarization/internal/compute_sauvola_threshold.hh: + New. Move sauvola_threshold related routines here. + + * scribo/binarization/internal/first_pass_functor.hh, + * scribo/binarization/sauvola.hh, + * scribo/binarization/sauvola_ms.hh, + * scribo/binarization/sauvola_threshold_image.hh: Move debug + variables... + + * scribo/binarization/internal/sauvola_debug.hh: ... here. New. + + * scribo/binarization/sauvola_threshold_image_debug.hh: Remove. + + * src/binarization/Makefile.am, + * src/binarization/sauvola_debug.cc, + * src/binarization/sauvola_ms_debug.cc: Improve debug outputs. + 2010-08-06 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> Add arrows shortcuts. diff --git a/scribo/src/binarization/sauvola.cc b/scribo/src/binarization/pgm_sauvola_threshold_image.cc similarity index 77% copy from scribo/src/binarization/sauvola.cc copy to scribo/src/binarization/pgm_sauvola_threshold_image.cc index fb07b0d..a38784a 100644 --- a/scribo/src/binarization/sauvola.cc +++ b/scribo/src/binarization/pgm_sauvola_threshold_image.cc @@ -1,5 +1,4 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,17 +23,16 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#include <mln/io/magick/load.hh> -#include <mln/io/pbm/save.hh> +#include <mln/io/pgm/all.hh> #include <scribo/binarization/sauvola.hh> #include <scribo/debug/usage.hh> const char *args_desc[][2] = { - { "input.*", "An image." }, - { "output.pbm", "A binary image." }, - { "w", "Window size (default 51)." }, + { "input.pgm", "A graylevel image." }, + { "output.pgm", "A threshold image." }, + { "w", "Window size (default 101)." }, { "k", "Sauvola's formulae parameter (default 0.34)." }, {0, 0} }; @@ -46,8 +44,8 @@ int main(int argc, char *argv[]) if (argc != 5 && argc != 4 && argc != 3) return scribo::debug::usage(argv, - "Binarization based on Sauvola's algorithm.", - "input.* output.pbm <w> <k>", + "Compute a threshold image based on Sauvola's algorithm.", + "input.pgm output.pgm <w> <k>", args_desc); trace::entering("main"); @@ -56,7 +54,7 @@ int main(int argc, char *argv[]) if (argc >= 4) w = atoi(argv[3]); else - w = 51; + w = 101; double k; if (argc >= 5) @@ -66,13 +64,13 @@ int main(int argc, char *argv[]) std::cout << "Using w=" << w << " and k=" << k << std::endl; - image2d<value::rgb8> input; - io::magick::load(input, argv[1]); + image2d<value::int_u8> input; + io::pgm::load(input, argv[1]); - image2d<bool> out = scribo::binarization::sauvola(input, w, k); + image2d<value::int_u8> out = scribo::binarization::sauvola_threshold_image(input, w, k); - io::pbm::save(out, argv[2]); + io::pgm::save(out, argv[2]); trace::exiting("main"); -- 1.5.6.5

1 0