April 2013 - Olena-patches

olena: olena-2.0-504-g62f325a Regen generated files in Milena.
by Guillaume Lazzara 26 Apr '13

26 Apr '13

* headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 7 +++++++ milena/headers.mk | 5 +++++ milena/tests/unit_test/unit-tests.mk | 7 +++++++ 3 files changed, 19 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index dd1386a..ffc1c49 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen generated files in Milena. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + +2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix an invalid test in data::stretch* routines. * mln/data/stretch.hh: Fix an invalid test. diff --git a/milena/headers.mk b/milena/headers.mk index 95778bd..002f3bd 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -100,6 +100,8 @@ mln/binarization/binarization.hh \ mln/binarization/essential.hh \ mln/binarization/includes.hh \ mln/binarization/threshold.hh \ +mln/binarization/tmms.hh \ +mln/binarization/tmms_hysteresis.hh \ mln/border/adjust.hh \ mln/border/all.hh \ mln/border/duplicate.hh \ @@ -456,6 +458,7 @@ mln/data/sort_offsets.hh \ mln/data/sort_psites.hh \ mln/data/split.hh \ mln/data/stretch.hh \ +mln/data/stretch_inplace.hh \ mln/data/to_enc.hh \ mln/data/transform.hh \ mln/data/transform.spe.hh \ @@ -738,6 +741,7 @@ mln/io/tiff/load.hh \ mln/io/txt/all.hh \ mln/io/txt/save.hh \ mln/labeling/all.hh \ +mln/labeling/all_blobs.hh \ mln/labeling/background.hh \ mln/labeling/blobs.hh \ mln/labeling/blobs_and_compute.hh \ @@ -758,6 +762,7 @@ mln/labeling/superpose.hh \ mln/labeling/value.hh \ mln/labeling/value.spe.hh \ mln/labeling/value_and_compute.hh \ +mln/labeling/values.hh \ mln/labeling/wrap.hh \ mln/linear/all.hh \ mln/linear/ch_convolve.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 3af0a98..3c27771 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -188,6 +188,8 @@ mln_binarization_binarization \ mln_binarization_essential \ mln_binarization_includes \ mln_binarization_threshold \ +mln_binarization_tmms \ +mln_binarization_tmms_hysteresis \ mln_border_adjust \ mln_border_all \ mln_border_duplicate \ @@ -518,6 +520,7 @@ mln_data_sort_offsets \ mln_data_sort_psites \ mln_data_split \ mln_data_stretch \ +mln_data_stretch_inplace \ mln_data_to_enc \ mln_data_transform \ mln_data_transform_inplace \ @@ -609,6 +612,8 @@ mln_fun_stat_all \ mln_fun_stat_mahalanobis \ mln_fun_unary \ mln_fun_v2b_all \ +mln_fun_v2b_always_false \ +mln_fun_v2b_always_true \ mln_fun_v2b_essential \ mln_fun_v2b_lnot \ mln_fun_v2b_threshold_ge \ @@ -780,6 +785,7 @@ mln_io_raw_save \ mln_io_txt_all \ mln_io_txt_save \ mln_labeling_all \ +mln_labeling_all_blobs \ mln_labeling_background \ mln_labeling_blobs \ mln_labeling_blobs_and_compute \ @@ -799,6 +805,7 @@ mln_labeling_relabel \ mln_labeling_superpose \ mln_labeling_value \ mln_labeling_value_and_compute \ +mln_labeling_values \ mln_labeling_wrap \ mln_linear_all \ mln_linear_ch_convolve \ -- 1.7.2.5

1 0

olena: branch exp/magick-improvements updated: olena-2.0-556-g36798c2
by git＠lrde.epita.fr 26 Apr '13

26 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/magick-improvements has been updated via 36798c2d16e786c1cfd3460a0df738a9341eb607 (commit) from b60f594ead92a2aba349b0ef9982160526edc2da (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 ----------------------------------------------------------------- 36798c2 Regen auto-generated files. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 7 +++++++ milena/headers.mk | 1 + milena/tests/unit_test/unit-tests.mk | 1 + 3 files changed, 9 insertions(+), 0 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-559-gf5465f7 Regen auto-generated files.
by Guillaume Lazzara 26 Apr '13

26 Apr '13

* headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 7 +++++++ milena/headers.mk | 1 + milena/tests/unit_test/unit-tests.mk | 1 + 3 files changed, 9 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 41ca209..82512e8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen auto-generated files. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + +2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/convert/impl/from_value_to_value.hh: Improve from_value_to_value dispatch for types with identical equiv type. diff --git a/milena/headers.mk b/milena/headers.mk index 95778bd..56dfc40 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -691,6 +691,7 @@ mln/io/fld/max_components.hh \ mln/io/fld/save.hh \ mln/io/fld/write_header.hh \ mln/io/magick/all.hh \ +mln/io/magick/get_header.hh \ mln/io/magick/internal/init_magick.hh \ mln/io/magick/load.hh \ mln/io/magick/save.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index c79f929..a3d940f 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -742,6 +742,7 @@ mln_io_fld_load_header \ mln_io_fld_max_components \ mln_io_fld_save \ mln_io_fld_write_header \ +mln_io_magick_get_header \ mln_io_off_all \ mln_io_off_load \ mln_io_off_save \ -- 1.7.2.5

1 0

olena: olena-2.0-556-g36798c2 Regen auto-generated files.
by Guillaume Lazzara 26 Apr '13

26 Apr '13

* headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 7 +++++++ milena/headers.mk | 1 + milena/tests/unit_test/unit-tests.mk | 1 + 3 files changed, 9 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 41ca209..82512e8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen auto-generated files. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + +2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/convert/impl/from_value_to_value.hh: Improve from_value_to_value dispatch for types with identical equiv type. diff --git a/milena/headers.mk b/milena/headers.mk index 95778bd..56dfc40 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -691,6 +691,7 @@ mln/io/fld/max_components.hh \ mln/io/fld/save.hh \ mln/io/fld/write_header.hh \ mln/io/magick/all.hh \ +mln/io/magick/get_header.hh \ mln/io/magick/internal/init_magick.hh \ mln/io/magick/load.hh \ mln/io/magick/save.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index c79f929..a3d940f 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -742,6 +742,7 @@ mln_io_fld_load_header \ mln_io_fld_max_components \ mln_io_fld_save \ mln_io_fld_write_header \ +mln_io_magick_get_header \ mln_io_off_all \ mln_io_off_load \ mln_io_off_save \ -- 1.7.2.5

1 0

olena: branch exp/stretch_inplace updated: olena-2.0-503-ge760fce
by git＠lrde.epita.fr 26 Apr '13

26 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/stretch_inplace has been updated via e760fce0a57482b723240b980041a9bda176b612 (commit) from dc1f54f779ecc6955603ee0f8a4570d62e82370d (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 ----------------------------------------------------------------- e760fce Fix an invalid test in data::stretch* routines. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 8 ++++++ milena/mln/data/stretch.hh | 2 +- milena/mln/data/stretch_inplace.hh | 48 +++++++++++++++++------------------ 3 files changed, 32 insertions(+), 26 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-566-g5e497a2 Fix an invalid test in data::stretch* routines.
by Guillaume Lazzara 26 Apr '13

26 Apr '13

* mln/data/stretch.hh: Fix an invalid test. * mln/data/stretch_inplace.hh: Fix an invalid test and re-indent. --- milena/ChangeLog | 8 ++++++ milena/mln/data/stretch.hh | 2 +- milena/mln/data/stretch_inplace.hh | 48 +++++++++++++++++------------------ 3 files changed, 32 insertions(+), 26 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d9a8d2b..6e75bc4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix an invalid test in data::stretch* routines. + + * mln/data/stretch.hh: Fix an invalid test. + + * mln/data/stretch_inplace.hh: Fix an invalid test and re-indent. + 2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> Add a labeling routine working on grayscale images. diff --git a/milena/mln/data/stretch.hh b/milena/mln/data/stretch.hh index 1738341..e8a6d09 100644 --- a/milena/mln/data/stretch.hh +++ b/milena/mln/data/stretch.hh @@ -91,7 +91,7 @@ namespace mln mln_value(I) min_, max_; estim::min_max(input, min_, max_); - if (max_ != min_ && (mln_max(V)>max_ || mln_min(V)>min_)) + if (max_ != min_ && (mln_max(V) > max_ || mln_min(V) < min_)) { //FIXME: we would like to use float instead of double but we //can't for precision reasons. See ticket #179. diff --git a/milena/mln/data/stretch_inplace.hh b/milena/mln/data/stretch_inplace.hh index a4579f1..c0630e1 100644 --- a/milena/mln/data/stretch_inplace.hh +++ b/milena/mln/data/stretch_inplace.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2013 EPITA Research and -// Development Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -54,7 +53,6 @@ namespace mln * * \param[in,out] ima The input image. * - * * \pre input.is_valid * * \ingroup mlndata @@ -67,7 +65,7 @@ namespace mln * stored inplace. * * \param[in,out] ima The input image. - * \param[out] stretched The image has changed. + * \param[out] stretched The image has changed. * * \pre input.is_valid * @@ -81,19 +79,19 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - template <typename I> - inline - void - stretch_inplace(Image<I>& ima, bool& stretched) + template <typename I> + inline + void + stretch_inplace(Image<I>& ima, bool& stretched) + { + mln_trace("data::stretch_inplace"); + typedef mln_value(I) V; + mln_precondition(exact(ima).is_valid()); + + V min_, max_; + estim::min_max(ima, min_, max_); + if (max_ != min_ && (mln_max(V) > max_ || mln_min(V) < min_)) { - mln_trace("data::stretch_inplace"); - typedef mln_value(I) V; - mln_precondition(exact(ima).is_valid()); - - V min_, max_; - estim::min_max(ima, min_, max_); - if (max_ != min_ && (mln_max(V)>max_ || mln_min(V)>min_)) - { //FIXME: we would like to use float instead of double but we //can't for precision reasons. See ticket #179. double @@ -104,16 +102,16 @@ namespace mln m = 0.0f - 0.5f + epsilon, a = (M - m) / (max - min), b = (m * max - M * min) / (max - min); - fun::v2v::linear_sat<V, double, V> f(a, b); - data::transform_inplace(ima, f); - stretched = true; - } - else - { - stretched = false; - mln_trace_warning("output has no significative data!"); - } + fun::v2v::linear_sat<V, double, V> f(a, b); + data::transform_inplace(ima, f); + stretched = true; + } + else + { + stretched = false; + mln_trace_warning("output has no significative data!"); } + } template <typename I> void -- 1.7.2.5

1 0

olena: olena-2.0-503-ge760fce Fix an invalid test in data::stretch* routines.
by Guillaume Lazzara 26 Apr '13

26 Apr '13

* mln/data/stretch.hh: Fix an invalid test. * mln/data/stretch_inplace.hh: Fix an invalid test and re-indent. --- milena/ChangeLog | 8 ++++++ milena/mln/data/stretch.hh | 2 +- milena/mln/data/stretch_inplace.hh | 48 +++++++++++++++++------------------ 3 files changed, 32 insertions(+), 26 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ef2c151..dd1386a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix an invalid test in data::stretch* routines. + + * mln/data/stretch.hh: Fix an invalid test. + + * mln/data/stretch_inplace.hh: Fix an invalid test and re-indent. + 2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> Add a labeling routine working on grayscale images. diff --git a/milena/mln/data/stretch.hh b/milena/mln/data/stretch.hh index 1738341..e8a6d09 100644 --- a/milena/mln/data/stretch.hh +++ b/milena/mln/data/stretch.hh @@ -91,7 +91,7 @@ namespace mln mln_value(I) min_, max_; estim::min_max(input, min_, max_); - if (max_ != min_ && (mln_max(V)>max_ || mln_min(V)>min_)) + if (max_ != min_ && (mln_max(V) > max_ || mln_min(V) < min_)) { //FIXME: we would like to use float instead of double but we //can't for precision reasons. See ticket #179. diff --git a/milena/mln/data/stretch_inplace.hh b/milena/mln/data/stretch_inplace.hh index a4579f1..c0630e1 100644 --- a/milena/mln/data/stretch_inplace.hh +++ b/milena/mln/data/stretch_inplace.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2013 EPITA Research and -// Development Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -54,7 +53,6 @@ namespace mln * * \param[in,out] ima The input image. * - * * \pre input.is_valid * * \ingroup mlndata @@ -67,7 +65,7 @@ namespace mln * stored inplace. * * \param[in,out] ima The input image. - * \param[out] stretched The image has changed. + * \param[out] stretched The image has changed. * * \pre input.is_valid * @@ -81,19 +79,19 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - template <typename I> - inline - void - stretch_inplace(Image<I>& ima, bool& stretched) + template <typename I> + inline + void + stretch_inplace(Image<I>& ima, bool& stretched) + { + mln_trace("data::stretch_inplace"); + typedef mln_value(I) V; + mln_precondition(exact(ima).is_valid()); + + V min_, max_; + estim::min_max(ima, min_, max_); + if (max_ != min_ && (mln_max(V) > max_ || mln_min(V) < min_)) { - mln_trace("data::stretch_inplace"); - typedef mln_value(I) V; - mln_precondition(exact(ima).is_valid()); - - V min_, max_; - estim::min_max(ima, min_, max_); - if (max_ != min_ && (mln_max(V)>max_ || mln_min(V)>min_)) - { //FIXME: we would like to use float instead of double but we //can't for precision reasons. See ticket #179. double @@ -104,16 +102,16 @@ namespace mln m = 0.0f - 0.5f + epsilon, a = (M - m) / (max - min), b = (m * max - M * min) / (max - min); - fun::v2v::linear_sat<V, double, V> f(a, b); - data::transform_inplace(ima, f); - stretched = true; - } - else - { - stretched = false; - mln_trace_warning("output has no significative data!"); - } + fun::v2v::linear_sat<V, double, V> f(a, b); + data::transform_inplace(ima, f); + stretched = true; + } + else + { + stretched = false; + mln_trace_warning("output has no significative data!"); } + } template <typename I> void -- 1.7.2.5

1 0

olena: branch next updated: olena-2.0-552-g1935bc3
by git＠lrde.epita.fr 26 Apr '13

26 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via 1935bc36690804e3ee07a7c2344538c9d80287c8 (commit) from 51571df5ecf647d4f8d258bba3714ac78d9cf19d (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 ----------------------------------------------------------------- 1935bc3 scribo/binarization/sauvola_ms_split.hh: Make use of all arguments. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 4 ++++ scribo/scribo/binarization/sauvola_ms_split.hh | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-552-g1935bc3 scribo/binarization/sauvola_ms_split.hh: Make use of all arguments.
by Guillaume Lazzara 26 Apr '13

26 Apr '13

--- scribo/ChangeLog | 4 ++++ scribo/scribo/binarization/sauvola_ms_split.hh | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 81ed8ac..90de65c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + * scribo/binarization/sauvola_ms_split.hh: Make use of all arguments. + 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/src/text_in_picture.cc: Add more debug options fix return diff --git a/scribo/scribo/binarization/sauvola_ms_split.hh b/scribo/scribo/binarization/sauvola_ms_split.hh index 330a2cc..2701021 100644 --- a/scribo/scribo/binarization/sauvola_ms_split.hh +++ b/scribo/scribo/binarization/sauvola_ms_split.hh @@ -119,6 +119,10 @@ namespace scribo mln_ch_value(I, value::int_u8) r_i, g_i, b_i; + binarization::internal::k2 = k2; + binarization::internal::k3 = k3; + binarization::internal::k4 = k4; + // Split the rgb8 image into 3 intensity images. mln::data::split(input_1, r_i, g_i, b_i); -- 1.7.2.5

1 0

olena: branch exp/newdoc updated: olena-2.0-578-g8299246
by git＠lrde.epita.fr 26 Apr '13

26 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/newdoc has been updated via 82992465d511fd52f532c291fbe39eabe042ca2b (commit) from 237e7b8998aae98e107f9cd47d70ccb6f00d2326 (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 ----------------------------------------------------------------- 8299246 mln/core/internal/image_base.hh: Add more documentation for destroy() method. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 5 +++++ milena/mln/core/internal/image_base.hh | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0