Olena-patches April 2013

olena-patches@lrde.epita.fr

7 participants
363 discussions

olena-2.0-487-g2294b8c mln/binarization/tmms_hysteresis.hh: Add missing template.

by Jonathan Fabrizio

--- milena/mln/binarization/tmms_hysteresis.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/milena/mln/binarization/tmms_hysteresis.hh b/milena/mln/binarization/tmms_hysteresis.hh index 39bea97..948fa22 100644 --- a/milena/mln/binarization/tmms_hysteresis.hh +++ b/milena/mln/binarization/tmms_hysteresis.hh @@ -65,7 +65,7 @@ namespace mln \author J. Fabrizio */ - + template<typename I, typename W> mln_concrete(I) tmms_hysteresis(const Image& in_image_, const Window<W>& struct_element, const mln_value(I)& c_min_low, const mln_value(I)& c_min_high, -- 1.7.2.5

11 years, 8 months

olena-2.0-527-g22f1827 distrib/macports/Portfile.in: Cosmetic changes.

by Roland Levillain

--- ChangeLog | 4 ++++ distrib/macports/Portfile.in | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53d7229..ce20298 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-16 Roland Levillain <roland(a)lrde.epita.fr> + + * distrib/macports/Portfile.in: Cosmetic changes. + 2013-04-15 Roland Levillain <roland(a)lrde.epita.fr> * configure.ac (AC_INIT): Add URL to Olena's Web site. diff --git a/distrib/macports/Portfile.in b/distrib/macports/Portfile.in index c15c44f..5ab5f6c 100644 --- a/distrib/macports/Portfile.in +++ b/distrib/macports/Portfile.in @@ -10,9 +10,9 @@ platforms darwin license GPL-2 maintainers lrde.epita.fr:olena description Software platform for efficient and generic image processing -long_description It is composed of a Generic and efficient C++ image \ +long_description It is composed of a generic and efficient C++ image \ processing library, a framework for Document Image \ - Analysis and Python bindings. + Analysis, and some Python bindings. homepage http://olena.lrde.epita.fr master_sites http://www.lrde.epita.fr/dload/olena/ -- 1.7.2.5

11 years, 8 months

olena-2.0-526-g733ef50 tests/unit_test/unit-tests.mk: Regen.

by Roland Levillain

--- milena/ChangeLog | 4 ++++ milena/tests/unit_test/unit-tests.mk | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 59bc2bc..63e7a73 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-04-16 Roland Levillain <roland(a)lrde.epita.fr> + * tests/unit_test/unit-tests.mk: Regen. + +2013-04-16 Roland Levillain <roland(a)lrde.epita.fr> + Fix build issues in Milena's documentation. * doc/Makefile.am ($(srcdir)/img/small.png): New rule. diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 3af0a98..c79f929 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 \ -- 1.7.2.5

11 years, 8 months

olena-2.0-525-g02fa89b Fix build issues in Milena's documentation.

by Roland Levillain

* doc/Makefile.am ($(srcdir)/img/small.png): New rule. --- milena/ChangeLog | 6 ++++++ milena/doc/Makefile.am | 7 +++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 07681b0..59bc2bc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2013-04-16 Roland Levillain <roland(a)lrde.epita.fr> + + Fix build issues in Milena's documentation. + + * doc/Makefile.am ($(srcdir)/img/small.png): New rule. + 2013-04-12 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/Makefile.am: Remove duplicate '/' in path. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 9b4cce3..0ba5e58 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -89,6 +89,13 @@ PNG_FIGURES = \ EXTRA_DIST += $(PNG_FIGURES) MAINTAINERCLEANFILES += $(PNG_FIGURES) +# Prevent make from trying to regenerate img/small.png from +# img/small.pbm through suffix rule `.pbm.png', as they are not +# related, by providing the following dummy rule. A better way would +# be to rename one these files to break this spurious dependency. +$(srcdir)/img/small.png: + @: + # --------------- # # Other figures. # # --------------- # -- 1.7.2.5

11 years, 8 months

olena-2.0-488-gb9d1611 Merge branch 'exp/tmms' into exp/TL

by Jonathan Fabrizio

This is a merge commit message of the following branches: Merge: cc5739a e6fde5b milena/mln/binarization/tmms.hh | 139 ++++++++++++ milena/mln/binarization/tmms_hysteresis.hh | 319 ++++++++++++++++++++++++++++ 2 files changed, 458 insertions(+), 0 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 8 months

olena: olena-2.0-554-gfaba80f Add tmms and tmms combined with hysteresis.

by Jonathan Fabrizio

* mln/binarization/tmms.hh, * mln/binarization/tmms_hysteresis.hh: Here. --- milena/mln/binarization/tmms.hh | 139 ++++++++++++ milena/mln/binarization/tmms_hysteresis.hh | 319 ++++++++++++++++++++++++++++ 2 files changed, 458 insertions(+), 0 deletions(-) create mode 100644 milena/mln/binarization/tmms.hh create mode 100644 milena/mln/binarization/tmms_hysteresis.hh diff --git a/milena/mln/binarization/tmms.hh b/milena/mln/binarization/tmms.hh new file mode 100644 index 0000000..5d177dc --- /dev/null +++ b/milena/mln/binarization/tmms.hh @@ -0,0 +1,139 @@ +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef MLN_BINARIZATION_TMMS_HH +# define MLN_BINARIZATION_TMMS_HH + +# include <mln/morpho/all.hh> +# include <mln/labeling/values.hh> + + +/// \file +/// +/// \brief Binarization using TMMS algorithm (see "Text Segmentation +/// in Natural Scenes Using Toggle-Mapping" from icip09 for more +/// details). + + +namespace mln +{ + + namespace binarization + { + + /** + Binarize \p in_image by the use of TMMS algorithm (see "Text + Segmentation in Natural Scenes Using Toggle-Mapping" from icip09 + for more details). + \tparam image_in_ the input image (not modified by the algorithm. + + \tparam struct_element the structuring element used to compute + erosion and dilation of input image (During TMMS algorithm, input + image is mapped over two fuctions: an erosion and a dilation of + the input image). + + \param c_min the min contrast allowed to extract feature. + + \return an image with "foreground" marked with the highest + possible color (hc), the "background" marked with the lower + possible color (lc) and homogeneous regions of the image marked + with the color (hc+lc)/2. (This will fail with two colors images, + but it seems to be a bit stupid to try to binarize two color + images?) + + \author J. Fabrizio + */ + template<typename I, typename W> + mln_concrete(I) + tmms(const Image& in_image_, const Window<W>& struct_element, + const mln_value(I)& c_min, const mln_value(I)& min_level, + const mln_value(I)& med_level, const mln_value(I)& max_level, + int pourcent); + + template<typename I, typename W> + mln_concrete(I) + tmms(const Image& in_image_, const Window<W>& struct_element, + const mln_value(I)& c_min); + +# ifndef MLN_INCLUDE_ONLY + + template<typename I, typename W> + mln_concrete(I) + tmms(const Image& in_image_, const Window<W>& struct_element, + const mln_value(I)& c_min, const mln_value(I)& min_level, + const mln_value(I)& med_level, const mln_value(I)& max_level, + int pourcent) + { + mln_trace("binarization::tmms"); + + const I& in_image = exact(in_image_); + mln_concrete(I) out_image; + + mln_concrete(I) dilation = mln::morpho::dilation(in_image, struct_element); + mln_concrete(I) erosion = mln::morpho::erosion(in_image, struct_element); + + typedef mln_value(I) V; + //V min_level = mln_min(V); //background + //V max_level = mln_max(V); //foreground + //V med_level = (max_level + min_level) / 2; //homogeneous + + mln_piter(I) p(in_image.domain()); + + initialize(out_image, in_image); + for_all(p) + { + V dil = dilation(p); // by def : dil>=ima>=ero + V ero = erosion(p); + V ima = in_image(p); + out_image(p) = ( (V)(dil - ero) >= c_min)? + ( ((dil - ima) < pourcent*(dil - ero)/100) ? max_level : min_level ) : med_level; + } + + return out_image; + } + + template<typename I, typename W> + mln_concrete(I) + tmms(const Image& in_image_, const Window<W>& struct_element, + const mln_value(I)& c_min) + { + typedef mln_value(I) V; + V min_level = mln_min(V); //background + V max_level = mln_max(V); //foreground + V med_level = (max_level + min_level) / 2; //homogeneous + return tmms(in_image_, struct_element, c_min, + min_level, med_level, max_level, 50); + } + + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::binarization + + +} // end of namespace mln + +#endif // ! MLN_BINARIZATION_TMMS_HH diff --git a/milena/mln/binarization/tmms_hysteresis.hh b/milena/mln/binarization/tmms_hysteresis.hh new file mode 100644 index 0000000..39bea97 --- /dev/null +++ b/milena/mln/binarization/tmms_hysteresis.hh @@ -0,0 +1,319 @@ +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef MLN_BINARIZATION_TMMS_HH +# define MLN_BINARIZATION_TMMS_HH + +# include <mln/morpho/all.hh> +# include <mln/labeling/values.hh> + + +/// \file +/// +/// \brief Binarization using TMMS algorithm (see "Text Segmentation +/// in Natural Scenes Using Toggle-Mapping" from icip09 for more +/// details) combined with hysteresis. + + +namespace mln +{ + + namespace binarization + { + + /** + Binarize \p in_image by the use of TMMS algorithm (see "Text + Segmentation in Natural Scenes Using Toggle-Mapping" from icip09 + for more details). + \tparam image_in_ the input image (not modified by the algorithm. + + \tparam struct_element the structuring element used to compute + erosion and dilation of input image (During TMMS algorithm, input + image is mapped over two fuctions: an erosion and a dilation of + the input image). + + \param c_min the min contrast allowed to extract feature. + + \return an image with "foreground" marked with the highest + possible color (hc), the "background" marked with the lower + possible color (lc) and homogeneous regions of the image marked + with the color (hc+lc)/2. (This will fail with two colors images, + but it seems to be a bit stupid to try to binarize two color + images?) + + \author J. Fabrizio + */ + + mln_concrete(I) + tmms_hysteresis(const Image& in_image_, const Window<W>& struct_element, + const mln_value(I)& c_min_low, const mln_value(I)& c_min_high, + const mln_value(I)& min_level, + const mln_value(I)& med_level, + const mln_value(I)& max_level, + const int pourcent); + +# ifndef MLN_INCLUDE_ONLY + + namespace impl + { + + namespace generic + { + + template<typename I, typename W> + mln_concrete(I) + tmms_hysteresis(const Image& in_image_, const Window<W>& struct_element, + const mln_value(I)& c_min_low, const mln_value(I)& c_min_high, + const mln_value(I)& min_level, + const mln_value(I)& med_level, + const mln_value(I)& max_level, + const int pourcent) + { + mln_trace("binarization::tmms"); + + const I& in_image = exact(in_image_); + + mln_concrete(I) low_image; + mln_concrete(I) high_image; + + mln_concrete(I) dilation = mln::morpho::dilation(in_image, struct_element); + mln_concrete(I) erosion = mln::morpho::erosion(in_image, struct_element); + + unsigned int nlabels; + + mln_piter(I) p(in_image.domain()); + + initialize(low_image, in_image); + initialize(high_image, in_image); + + typedef mln_value(I) V; + for_all(p) + { + V dil = dilation(p); // by def : dil>=ima>=ero + V ero = erosion(p); + V ima = in_image(p); + + if ((V)(dil - ero)<c_min_low) low_image(p) = high_image(p) = med_level; + else if ((V)(dil - ero)<c_min_high) { + low_image(p) = med_level; + if ( (V)(dil - ima) < pourcent*((V)(dil - ero))/100 ) + high_image(p) = max_level; + else + high_image(p) = min_level; + } else { + if ( (V)(dil - ima) < pourcent*((V)(dil - ero))/100 ) + low_image(p) = high_image(p) = max_level; + else + low_image(p) = high_image(p) = min_level; + } + + } + + mln_ch_value(I, unsigned int) labels_high_images; + labels_high_images = mln::labeling::values(high_image, + mln::c4(), nlabels); + V *values = new V[nlabels]; + + for(unsigned int i=0;i<nlabels;i++) { + values[i]=med_level; + } + + for_all(p) { + if (low_image(p)!=med_level) { + values[labels_high_images(p)]=low_image(p); + } + } + + for_all(p) { + if (low_image(p)==med_level) { + low_image(p)=values[labels_high_images(p)]; + } + } + delete(values); + + return low_image; + } + + } // end of namespace mln::binarization::impl::generic + + template<typename I, typename W> + mln_concrete(I) + tmms_hysteresis(const Image& in_image_, const Window<W>& struct_element, + const mln_value(I)& c_min_low, const mln_value(I)& c_min_high, + const mln_value(I)& min_level, + const mln_value(I)& med_level, + const mln_value(I)& max_level, + const int pourcent) + { + mln_trace("binarization::tmms"); + + const I& in_image = exact(in_image_); + + mln_concrete(I) low_image; + mln_concrete(I) high_image; + + mln_concrete(I) dilation = mln::morpho::dilation(in_image, struct_element); + mln_concrete(I) erosion = mln::morpho::erosion(in_image, struct_element); + + unsigned int nlabels; + + initialize(low_image, in_image); + initialize(high_image, in_image); + border::resize(dilation, in_image.border()); + border::resize(erosion, in_image.border()); + + if (in_image.border()!=dilation.border() || + in_image.border()!=erosion.border()) + { + std::abort(); + } + + typedef mln_value(I) V; + + unsigned nrows = geom::nrows(in_image); + unsigned ncols = geom::ncols(in_image); + for (row = 0; row < nrows; row += 1) + { + V *p_in_image=&(in_image.at_(row, 0)); + V *p_dilation=&(dilation.at_(row, 0))); + V *p_erosion=&(erosion.at_(row, 0)); + V *p_low_image=&(low_image.at_(row, 0)); + V *p_high_image=&(high_image.at_(row, 0)); + + for (unsigned col = 0; col < ncols; col += 1) + + { + V dil = *p_dilation; // by def : dil>=ima>=ero + V ero = *p_erosion; + V ima = *p_in_image; + + if ((V)(dil - ero)<c_min_low) (*p_low_image) = (*p_high_image) = med_level; + else if ((V)(dil - ero)<c_min_high) { + (*p_low_image) = med_level; + if ( (V)(dil - ima) < pourcent*((V)(dil - ero))/100 ) + (*p_high_image) = max_level; + else + (*p_high_image) = min_level; + } else { + if ( (V)(dil - ima) < pourcent*((V)(dil - ero))/100 ) + (*p_low_image) = (*p_high_image) = max_level; + else + (*p_low_image) = (*p_high_image) = min_level; + } + } + + mln_ch_value(I, unsigned int) labels_high_images; + labels_high_images = mln::labeling::values(high_image, + mln::c4(), nlabels); + V *values = new V[nlabels]; + + for(unsigned int i=0;i<nlabels;i++) { + values[i]=med_level; + } + + mln_piter(I) p(in_image.domain()); + for_all(p) { + if (low_image(p)!=med_level) { + values[labels_high_images(p)]=low_image(p); + } + } + + for_all(p) { + if (low_image(p)==med_level) { + low_image(p)=values[labels_high_images(p)]; + } + } + delete(values); + + return low_image; + } + + }// end of namespace mln::binarization::impl + + namespace internal + { + + template<typename I, typename W> + mln_concrete(I) + tmms_hysteresis_dispatch(const I& ima, const W& struct_element, + const I& c_min_low, const I& c_min_high, + const I& min_level, const I& med_level, const I& max_level, + const int pourcent, mln::trait::image::speed::any) + { + return mnl::binarization::impl::generic::tmms_hysteresis(ima, + struct_element, c_min_low, c_min_high, + min_level, med_level, max_level, pourcent); + } + + template<typename I, typename W> + mln_concrete(I) + tmms_hysteresis_dispatch(const I& ima, const W& struct_element, + const I& c_min_low, const I& c_min_high, + const I& min_level, const I& med_level, const I& max_level, + const int pourcent, mln::trait::image::speed::fastest) + { + return mln::binarization::impl::tmms_hysteresis_fastest(ima, + struct_element, c_min_low, c_min_high, + min_level, med_level, max_level, pourcent); + } + + template<typename I, typename W> + mln_concrete(I) + tmms_dispatch(const I& ima, const W& struct_element, + const I& c_min_low, const I& c_min_high, + const I& min_level, const I& med_level, const I& max_level, + const int pourcent) + { + return tmms_hysteresis_dispatch(ima, + struct_element, c_min_low, c_min_high, + min_level, med_level, max_level, pourcent, + mln_trait_image_speed(I)); + } + + } //end of namespace internal + + template<typename I, typename W> + mln_concrete(I) + tmms(const Image& in_image_, const Window<W>& struct_element, + const mln_value(I)& c_min_low, const mln_value(I)& c_min_high, + const mln_value(I)& min_level, + const mln_value(I)& med_level, + const mln_value(I)& max_level, + const int pourcent) + { + const I& ima = exact(in_image_); + const W& win = exact(struct_element); + return mln::binarization::internal::tmms_hysteresis_displatch(ima, + win, min_level, med_level, max_level, pourcent); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::binarization + + +} // end of namespace mln + +#endif // ! MLN_BINARIZATION_TMMS_HH -- 1.7.2.5

11 years, 8 months

olena-2.0-486-ge6fde5b Add tmms and tmms combined with hysteresis.

by Jonathan Fabrizio

11 years, 8 months

branch exp/values created: olena-2.0-486-gcc5739a

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/values has been created at cc5739adc63641001c47bb6c849519071a3f8cda (commit) - Log ----------------------------------------------------------------- cc5739a mln/labeling/values.hh: Add labeling. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 8 months

olena: olena-2.0-553-g727ba19 mln/labeling/values.hh: Add labeling.

by Jonathan Fabrizio

--- milena/mln/labeling/{value.hh => values.hh} | 56 ++++++++++++--------------- 1 files changed, 25 insertions(+), 31 deletions(-) copy milena/mln/labeling/{value.hh => values.hh} (71%) diff --git a/milena/mln/labeling/value.hh b/milena/mln/labeling/values.hh similarity index 71% copy from milena/mln/labeling/value.hh copy to milena/mln/labeling/values.hh index 6a60ee5..0031eae 100644 --- a/milena/mln/labeling/value.hh +++ b/milena/mln/labeling/values.hh @@ -1,5 +1,5 @@ -// 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 +24,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,20 +44,17 @@ 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. - - \ingroup labeling - */ + /// \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. + // template <typename I, typename N, typename L> mln_ch_value(I, L) - value(const Image& input, const mln_value(I)& val, + values(const Image& input, const Neighborhood<N>& nbh, L& nlabels); @@ -71,14 +68,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 +89,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 +102,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 +115,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 +127,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 +142,15 @@ namespace mln template <typename I, typename N, typename L> mln_ch_value(I, L) - value(const Image& input, const mln_value(I)& val, + values(const Image& input, const Neighborhood<N>& nbh, L& nlabels) { mln_trace("labeling::value"); - 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 +163,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_LABELING_VALUE_HH +#endif // ! MLN_LABELING_VALUES_HH -- 1.7.2.5

11 years, 8 months

olena-2.0-486-gcc5739a mln/labeling/values.hh: Add labeling.

by Jonathan Fabrizio

--- milena/mln/labeling/{value.hh => values.hh} | 38 ++++++++++++--------------- 1 files changed, 17 insertions(+), 21 deletions(-) copy milena/mln/labeling/{value.hh => values.hh} (78%) diff --git a/milena/mln/labeling/value.hh b/milena/mln/labeling/values.hh similarity index 78% copy from milena/mln/labeling/value.hh copy to milena/mln/labeling/values.hh index 069b2a1..0031eae 100644 --- a/milena/mln/labeling/value.hh +++ b/milena/mln/labeling/values.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -24,8 +24,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,17 +45,16 @@ namespace mln { /// \brief Connected component labeling of the image sites at a given - /// value. + /// 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. // template <typename I, typename N, typename L> mln_ch_value(I, L) - value(const Image& input, const mln_value(I)& val, + values(const Image& input, const Neighborhood<N>& nbh, L& nlabels); @@ -69,14 +68,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 +89,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 +102,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 +115,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 +127,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 +142,15 @@ namespace mln template <typename I, typename N, typename L> mln_ch_value(I, L) - value(const Image& input, const mln_value(I)& val, + values(const Image& input, const Neighborhood<N>& nbh, L& nlabels) { mln_trace("labeling::value"); - 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 +163,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_LABELING_VALUE_HH +#endif // ! MLN_LABELING_VALUES_HH -- 1.7.2.5

11 years, 8 months

← Newer
1
...
23
24
25
26
27
28
29
...
37
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 April 2013