Olena-patches May 2013

olena-patches@lrde.epita.fr

6 participants
133 discussions

olena: olena-2.0-488-gf37b603 NEWS: Add entry for labeling::values.

by Guillaume Lazzara

--- ChangeLog | 4 ++++ NEWS | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 96dc75f..55a2f97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ + 2013-04-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + * NEWS: Add entry for labeling::values. + 2013-04-12 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/Makefile.am: Remove duplicate '/' in path. diff --git a/NEWS b/NEWS index 26ce3c0..43b9dcb 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,8 @@ * Speed up I/O accesses with ImageMagick/GraphicsMagick. + * Add labeling::values to label gray-level images. + * Scribo * New logger class. -- 1.7.2.5

11 years

olena: olena-2.0-554-g958a4e2 Regen auto-generated files.

by Guillaume Lazzara

* 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 fa11e51..20d4c55 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2013-05-13 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen auto-generated files. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + +2013-05-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/labeling/values.hh: Labeling algorithm for gray-level images. diff --git a/milena/headers.mk b/milena/headers.mk index 95778bd..480cd93 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -758,6 +758,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 c79f929..bae868a 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -801,6 +801,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

11 years

olena: olena-2.0-487-ge9454b5 Regen auto-generated files.

by Guillaume Lazzara

* headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 7 +++++++ milena/headers.mk | 1 + milena/tests/unit_test/unit-tests.mk | 3 +++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4314a02..9144857 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2013-05-13 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen auto-generated files. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + +2013-05-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/labeling/values.hh: Labeling algorithm for gray-level images. diff --git a/milena/headers.mk b/milena/headers.mk index 95778bd..480cd93 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -758,6 +758,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..bae868a 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -609,6 +609,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 \ @@ -799,6 +801,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

11 years

olena: olena-2.0-553-gbeb556f mln/labeling/values.hh: Labeling algorithm for gray-level images.

by Guillaume Lazzara

--- milena/ChangeLog | 5 ++ milena/mln/labeling/{value.hh => values.hh} | 55 ++++++++++++-------------- 2 files changed, 30 insertions(+), 30 deletions(-) copy milena/mln/labeling/{value.hh => values.hh} (70%) diff --git a/milena/ChangeLog b/milena/ChangeLog index edf3a65..fa11e51 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2013-05-13 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/labeling/values.hh: Labeling algorithm for gray-level + images. + 2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/mln/convert.dox: Fix from_to_ module name. diff --git a/milena/mln/labeling/value.hh b/milena/mln/labeling/values.hh similarity index 70% copy from milena/mln/labeling/value.hh copy to milena/mln/labeling/values.hh index 6a60ee5..b5e74cb 100644 --- a/milena/mln/labeling/value.hh +++ b/milena/mln/labeling/values.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and -// Development Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,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_LABELING_VALUE_HH -# define MLN_LABELING_VALUE_HH +#ifndef MLN_LABELING_VALUES_HH +# define MLN_LABELING_VALUES_HH /// \file /// @@ -45,20 +44,19 @@ namespace mln { /*! \brief Connected component labeling of the image sites at a - given value. + given values. - \param[in] input The input image. - \param[in] val The value to consider. - \param[in] nbh The connectivity of components. - \param[out] nlabels The number of labels. - \return The label image. + \param[in] input The input image. + \param[in] nbh The connectivity of components. + \param[out] nlabels The number of labels. + \return The label image. - \ingroup labeling + \ingroup labeling */ template <typename I, typename N, typename L> mln_ch_value(I, L) - value(const Image& input, const mln_value(I)& val, - const Neighborhood<N>& nbh, L& nlabels); + values(const Image& input, + const Neighborhood<N>& nbh, L& nlabels); # ifndef MLN_INCLUDE_ONLY @@ -71,14 +69,13 @@ namespace mln template <typename I, typename N, typename L> void - value_tests(const Image& input, const mln_value(I)& val, const Neighborhood<N>& nbh, + values_tests(const Image& input, const Neighborhood<N>& nbh, L& nlabels) { mln_precondition(exact(input).is_valid()); mln_precondition(exact(nbh).is_valid()); (void) input; - (void) val; (void) nbh; (void) nlabels; } @@ -93,12 +90,11 @@ namespace mln // Generic functor. template <typename I, typename L> - struct value_functor + struct values_functor { typedef mln_psite(I) P; const I& input; - const mln_value(I)& val; // Requirements from mln::canvas::labeling. @@ -107,8 +103,8 @@ namespace mln // Generic implementation void init() {} - bool handles(const P& p) const { return input(p) == val; } - bool equiv(const P& n, const P&) const { return input(n) == val; } + bool handles(const P& p) const { return true; } + bool equiv(const P& n, const P& p) const { return input(n) == input(p); } bool labels(const P&) const { return true; } void do_no_union(const P&, const P&) {} void init_attr(const P&) {} @@ -120,8 +116,8 @@ namespace mln // Fastest implementation void init_() {} - bool handles_(unsigned p) const { return input.element(p) == val; } - bool equiv_(unsigned n, unsigned) const { return input.element(n) == val; } + bool handles_(unsigned p) const { return true; } + bool equiv_(unsigned n, unsigned p) const { return input.element(n) == input.element(p); } bool labels_(unsigned) const { return true; } void do_no_union_(unsigned, unsigned) {} void init_attr_(unsigned) {} @@ -132,9 +128,8 @@ namespace mln // end of Requirements. - value_functor(const Image& input_, const mln_value(I)& val) - : input(exact(input_)), - val(val) + values_functor(const Image& input_) + : input(exact(input_)) { } }; @@ -148,15 +143,15 @@ namespace mln template <typename I, typename N, typename L> mln_ch_value(I, L) - value(const Image& input, const mln_value(I)& val, - const Neighborhood<N>& nbh, L& nlabels) + values(const Image& input, + const Neighborhood<N>& nbh, L& nlabels) { - mln_trace("labeling::value"); + mln_trace("labeling::values"); - internal::value_tests(input, val, nbh, nlabels); + internal::values_tests(input, nbh, nlabels); mln_ch_value(I, L) output; - impl::value_functor<I,L> f(input, val); + impl::values_functor<I,L> f(input); output = canvas::labeling::video(input, nbh, nlabels, f); return output; @@ -169,4 +164,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_LABELING_VALUE_HH +#endif // ! MLN_LABELING_VALUES_HH -- 1.7.2.5

11 years

olena: olena-2.0-486-g42c92be mln/labeling/values.hh: Labeling algorithm for gray-level images.

by Guillaume Lazzara

--- milena/ChangeLog | 5 ++ milena/mln/labeling/{value.hh => values.hh} | 61 +++++++++++++-------------- 2 files changed, 34 insertions(+), 32 deletions(-) copy milena/mln/labeling/{value.hh => values.hh} (69%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0b6c2ae..4314a02 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2013-05-13 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/labeling/values.hh: Labeling algorithm for gray-level + images. + 2013-04-12 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/Makefile.am: Remove duplicate '/' in path. diff --git a/milena/mln/labeling/value.hh b/milena/mln/labeling/values.hh similarity index 69% copy from milena/mln/labeling/value.hh copy to milena/mln/labeling/values.hh index 069b2a1..b5e74cb 100644 --- a/milena/mln/labeling/value.hh +++ b/milena/mln/labeling/values.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,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_LABELING_VALUE_HH -# define MLN_LABELING_VALUE_HH +#ifndef MLN_LABELING_VALUES_HH +# define MLN_LABELING_VALUES_HH /// \file /// @@ -44,19 +43,20 @@ namespace mln namespace labeling { - /// \brief Connected component labeling of the image sites at a given - /// value. - /// - /// \param[in] input The input image. - /// \param[in] val The value to consider. - /// \param[in] nbh The connectivity of components. - /// \param[out] nlabels The number of labels. - /// \return The label image. - // + /*! \brief Connected component labeling of the image sites at a + given values. + + \param[in] input The input image. + \param[in] nbh The connectivity of components. + \param[out] nlabels The number of labels. + \return The label image. + + \ingroup labeling + */ template <typename I, typename N, typename L> mln_ch_value(I, L) - value(const Image& input, const mln_value(I)& val, - const Neighborhood<N>& nbh, L& nlabels); + values(const Image& input, + const Neighborhood<N>& nbh, L& nlabels); # ifndef MLN_INCLUDE_ONLY @@ -69,14 +69,13 @@ namespace mln template <typename I, typename N, typename L> void - value_tests(const Image& input, const mln_value(I)& val, const Neighborhood<N>& nbh, + values_tests(const Image& input, const Neighborhood<N>& nbh, L& nlabels) { mln_precondition(exact(input).is_valid()); mln_precondition(exact(nbh).is_valid()); (void) input; - (void) val; (void) nbh; (void) nlabels; } @@ -91,12 +90,11 @@ namespace mln // Generic functor. template <typename I, typename L> - struct value_functor + struct values_functor { typedef mln_psite(I) P; const I& input; - const mln_value(I)& val; // Requirements from mln::canvas::labeling. @@ -105,8 +103,8 @@ namespace mln // Generic implementation void init() {} - bool handles(const P& p) const { return input(p) == val; } - bool equiv(const P& n, const P&) const { return input(n) == val; } + bool handles(const P& p) const { return true; } + bool equiv(const P& n, const P& p) const { return input(n) == input(p); } bool labels(const P&) const { return true; } void do_no_union(const P&, const P&) {} void init_attr(const P&) {} @@ -118,8 +116,8 @@ namespace mln // Fastest implementation void init_() {} - bool handles_(unsigned p) const { return input.element(p) == val; } - bool equiv_(unsigned n, unsigned) const { return input.element(n) == val; } + bool handles_(unsigned p) const { return true; } + bool equiv_(unsigned n, unsigned p) const { return input.element(n) == input.element(p); } bool labels_(unsigned) const { return true; } void do_no_union_(unsigned, unsigned) {} void init_attr_(unsigned) {} @@ -130,9 +128,8 @@ namespace mln // end of Requirements. - value_functor(const Image& input_, const mln_value(I)& val) - : input(exact(input_)), - val(val) + values_functor(const Image& input_) + : input(exact(input_)) { } }; @@ -146,15 +143,15 @@ namespace mln template <typename I, typename N, typename L> mln_ch_value(I, L) - value(const Image& input, const mln_value(I)& val, - const Neighborhood<N>& nbh, L& nlabels) + values(const Image& input, + const Neighborhood<N>& nbh, L& nlabels) { - mln_trace("labeling::value"); + mln_trace("labeling::values"); - internal::value_tests(input, val, nbh, nlabels); + internal::values_tests(input, nbh, nlabels); mln_ch_value(I, L) output; - impl::value_functor<I,L> f(input, val); + impl::values_functor<I,L> f(input); output = canvas::labeling::video(input, nbh, nlabels, f); return output; @@ -167,4 +164,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_LABELING_VALUE_HH +#endif // ! MLN_LABELING_VALUES_HH -- 1.7.2.5

11 years

olena: branch exp/newdoc updated: olena-2.0-605-gf4024c0

by git＠lrde.epita.fr

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 discards 53d161004998be99b1fdd1ea0b9c9628f9ff96fe (commit) via f4024c0f648bac243f0cb60c04ae3e895a9e08d3 (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 (53d161004998be99b1fdd1ea0b9c9628f9ff96fe) \ N -- N -- N (f4024c0f648bac243f0cb60c04ae3e895a9e08d3) 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 ----------------------------------------------------------------- f4024c0 doc/mln/labeling/labeling.dox: Write general documentation on labeling. ----------------------------------------------------------------------- Summary of changes: milena/doc/mln/labeling/labeling.dox | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years

olena: olena-2.0-605-gf4024c0 doc/mln/labeling/labeling.dox: Write general documentation on labeling.

by Guillaume Lazzara

--- milena/ChangeLog | 5 ++++ milena/doc/mln/labeling/labeling.dox | 39 +++++++++++++++++++++++++++++---- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c18309f..89d615b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2013-05-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/mln/labeling/labeling.dox: Write general documentation on + labeling. + +2013-05-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/ref-guide.tex: Mention *_without_localization routines in reference guide. diff --git a/milena/doc/mln/labeling/labeling.dox b/milena/doc/mln/labeling/labeling.dox index c0b09c4..ae841c5 100644 --- a/milena/doc/mln/labeling/labeling.dox +++ b/milena/doc/mln/labeling/labeling.dox @@ -1,6 +1,35 @@ /*! \defgroup labeling Image Labeling - * - * \brief All labeling routines provided in Milena. - * - * \ingroup modroutines - */ + + \brief All labeling-related routines provided in Milena. + + Olena provides both labeling routines and routines working on + labeled image to massively process each label. + + labeling::blobs(), labeling::value(), labeling::foreground(), + labeling::flat_zones(), and labeling::background() can be used to + label binary or gray-level images. Labeled images produced by + these algorithms are made of a continuous labeling starting from + index 1. Output image may contain value '0' which is considered in + Milena as a non-label and is usually used for background. + + \warning In all labeling functions returning the number of labels, + (usually named as \c nlabels), the number of label only refers to + the labels different from '0' (which is considered as no-label + value). A labeled image may contain \c nlabels + 1 different + values. + + labeling::compute_image(), labeling::compute(), + labeling::mean_colors, massively compute attribute on labeled + image. + + labeling::pack and labeling::relabel() relabel already labeled + images with respect to specific rules. + + labeling::value_and_compute() performs both labeling and attribute + computation at the same time. + + labeling::wrap(), labeling::superpose(), and labeling::colorize() + are usually used for debugging purpose to output labeled images. + + \ingroup modroutines +*/ -- 1.7.2.5

11 years

olena: branch exp/newdoc updated: olena-2.0-605-g53d1610

by git＠lrde.epita.fr

11 years

olena: olena-2.0-605-g53d1610 doc/mln/labeling/labeling.dox: Write general documentation on labeling.

by Guillaume Lazzara

--- milena/ChangeLog | 5 ++++ milena/doc/mln/labeling/labeling.dox | 35 +++++++++++++++++++++++++++++---- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c18309f..89d615b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2013-05-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/mln/labeling/labeling.dox: Write general documentation on + labeling. + +2013-05-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/ref-guide.tex: Mention *_without_localization routines in reference guide. diff --git a/milena/doc/mln/labeling/labeling.dox b/milena/doc/mln/labeling/labeling.dox index c0b09c4..3ae56df 100644 --- a/milena/doc/mln/labeling/labeling.dox +++ b/milena/doc/mln/labeling/labeling.dox @@ -1,6 +1,31 @@ /*! \defgroup labeling Image Labeling - * - * \brief All labeling routines provided in Milena. - * - * \ingroup modroutines - */ + + \brief All labeling-related routines provided in Milena. + + Olena provides both labeling routines and routines working on + labeled image to massively process each label. + + labeling::blobs, labeling::value, labeling::foreground, + labeling::flat_zones, and labeling::background can be used to label + binary or gray-level images. Labeled images produced by these + algorithms are made of a continuous labeling starting from index + 1. Output image may contain value '0' which is considered in + Milena as a non-label and is usually used for background. + + \warning In all labeling functions returning the number of labels, + (usually named as \c nlabels), the number of label only refers to + the labels different from '0' (which is considered as no-label + value). A labeled image may contain \c nlabels + 1 different + values. + + labeling::compute_image, labeling::compute, labeling::mean_colors, + massively compute attribute on labeled image. + + labeling::value_and_compute performs both labeling and attribute + computation at the same time. + + labeling::wrap, labeling::superpose, and labeling::colorize are + usually used for debugging purpose to output labeled images. + + \ingroup modroutines +*/ -- 1.7.2.5

11 years

olena: branch exp/newdoc updated: olena-2.0-604-g899735d

by git＠lrde.epita.fr

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 899735d56c85aa43f081a0fb183d0b7d7698cf70 (commit) via f6801ca6b20d3439a2c79cbddb64d703c5b27e60 (commit) from 81f1b95ffa4a93800125ac751de2086893bf4f0d (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 ----------------------------------------------------------------- 899735d doc/ref-guide.tex: Mention *_without_localization routines in reference guide. f6801ca Document sub_image morpher. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 25 +++++++++++ milena/doc/examples-outputs.mk | 18 ++++++++ milena/doc/examples.dox | 9 ++-- milena/doc/examples.mk | 1 + milena/doc/examples/sub_image.cc | 46 ++++++++++++++++++++ milena/doc/figures.mk | 13 ++++++ .../figures/{logical-not-1.pbm => sub_image-1.pbm} | 2 +- .../figures/{logical-not-1.pbm => sub_image-2.pbm} | Bin 117 -> 115 bytes milena/doc/outputs.mk | 1 + ...{accu-right-instantiation.txt => sub_image.txt} | 0 milena/doc/programs-examples.mk | 2 + milena/doc/ref-guide.tex | 37 ++++++++++------ milena/mln/core/image/dmorph/sub_image.hh | 37 +++++++++++++--- 13 files changed, 166 insertions(+), 25 deletions(-) create mode 100644 milena/doc/examples/sub_image.cc copy milena/doc/figures/{logical-not-1.pbm => sub_image-1.pbm} (95%) copy milena/doc/figures/{logical-not-1.pbm => sub_image-2.pbm} (92%) copy milena/doc/outputs/{accu-right-instantiation.txt => sub_image.txt} (100%) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years

← Newer
1
...
4
5
6
7
8
9
10
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches May 2013