April 2013 - Olena-patches

olena: olena-2.0-578-g8299246 mln/core/internal/image_base.hh: Add more documentation for destroy() method.
by Guillaume Lazzara 26 Apr '13

26 Apr '13

--- milena/ChangeLog | 5 +++++ milena/mln/core/internal/image_base.hh | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 49afff7..364f90b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/core/internal/image_base.hh: Add more documentation for + destroy() method. + 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/mln/topo/topo.dox: New. Introduce mathematical topology diff --git a/milena/mln/core/internal/image_base.hh b/milena/mln/core/internal/image_base.hh index 1b068ca..94f727b 100644 --- a/milena/mln/core/internal/image_base.hh +++ b/milena/mln/core/internal/image_base.hh @@ -163,7 +163,14 @@ namespace mln /// \endcond - /// Detach data from an image (free it if nobody else hold it). + /*! + + \brief Detach data from an image (free it if nobody else hold + it). + + This method can be safely called several times. + After calling destroy(), is_valid() always returns False. + */ void destroy(); protected: -- 1.7.2.5

1 0

olena: branch exp/magick-improvements updated: olena-2.0-555-gb60f594
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 b60f594ead92a2aba349b0ef9982160526edc2da (commit) from 4376a9cc3724123c1a73c893d82746dfd8c873c3 (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 ----------------------------------------------------------------- b60f594 mln/convert/impl/from_value_to_value.hh: Improve from_value_to_value dispatch for types with identical equiv type. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 5 ++ milena/mln/convert/impl/from_value_to_value.hh | 62 ++++++++++++++---------- 2 files changed, 41 insertions(+), 26 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-558-g17edd9c mln/convert/impl/from_value_to_value.hh: Improve from_value_to_value dispatch for types with identical equiv type.
by Guillaume Lazzara 26 Apr '13

26 Apr '13

--- milena/ChangeLog | 5 ++ milena/mln/convert/impl/from_value_to_value.hh | 62 ++++++++++++++---------- 2 files changed, 41 insertions(+), 26 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4b4c4a9..41ca209 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +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. + 2013-04-24 Guillaume Lazzara <z(a)lrde.epita.fr> Handle 16 bits value types with io::magick. diff --git a/milena/mln/convert/impl/from_value_to_value.hh b/milena/mln/convert/impl/from_value_to_value.hh index 9c93e5a..8d1afc9 100644 --- a/milena/mln/convert/impl/from_value_to_value.hh +++ b/milena/mln/convert/impl/from_value_to_value.hh @@ -65,38 +65,48 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - // We want to disable this code since it prevents types of - // different quantification to rely on from_to_ overload and - // handle specific conversions. (ex: rgb16 towards rgb8) - - // // Case 1: - - // template <typename V, typename W> - // void - // from_value_to_value_(const mln::value::Vectorial<V>& from, - // mln::value::Vectorial<W>& to) - // { - // exact(to) = exact(from).to_equiv(); - // } - - // // Case 2: - - // template <typename V, typename W> - // void - // from_value_to_value_(const mln::value::Scalar<V>& from, - // mln::value::Scalar<W>& to) - // { - // exact(to) = exact(from).to_equiv(); - // } + // Case 1: Same equiv type. + + template <typename V, typename W, typename EV> + void + from_value_to_value_(const mln::value::Vectorial<V>& from, + mln::value::Vectorial<W>& to, + const EV&, const EV&) + { + exact(to) = exact(from).to_equiv(); + } + + template <typename V, typename W, typename EV> + void + from_value_to_value_(const mln::value::Scalar<V>& from, + mln::value::Scalar<W>& to, + const EV&, const EV&) + { + exact(to) = exact(from).to_equiv(); + } + + // Case 2: Different equiv type. No concept based + // conversions. Trying to find more specific conversions with + // other from_to_ overloads. + template <typename V, typename W, typename EV1, typename EV2> + inline + void + from_value_to_value_(const Value<V>& from, Value<W>& to, + const EV1&, const EV2&) + { + from_to_(exact(from), exact(to)); + } + template <typename V, typename W> inline void from_value_to_value_(const Value<V>& from, Value<W>& to) { - // No concept based conversion. Trying to find more specific - // conversion with other from_to overloads. - from_to_(exact(from), exact(to)); + /// Checking if V and W have the same equivalent type. + typedef mln_equiv(V) V_equiv; + typedef mln_equiv(W) W_equiv; + from_value_to_value_(exact(from), exact(to), V_equiv(), W_equiv()); } -- 1.7.2.5

1 0

olena: olena-2.0-555-gb60f594 mln/convert/impl/from_value_to_value.hh: Improve from_value_to_value dispatch for types with identical equiv type.
by Guillaume Lazzara 26 Apr '13

26 Apr '13

--- milena/ChangeLog | 5 ++ milena/mln/convert/impl/from_value_to_value.hh | 62 ++++++++++++++---------- 2 files changed, 41 insertions(+), 26 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4b4c4a9..41ca209 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +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. + 2013-04-24 Guillaume Lazzara <z(a)lrde.epita.fr> Handle 16 bits value types with io::magick. diff --git a/milena/mln/convert/impl/from_value_to_value.hh b/milena/mln/convert/impl/from_value_to_value.hh index 9c93e5a..8d1afc9 100644 --- a/milena/mln/convert/impl/from_value_to_value.hh +++ b/milena/mln/convert/impl/from_value_to_value.hh @@ -65,38 +65,48 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - // We want to disable this code since it prevents types of - // different quantification to rely on from_to_ overload and - // handle specific conversions. (ex: rgb16 towards rgb8) - - // // Case 1: - - // template <typename V, typename W> - // void - // from_value_to_value_(const mln::value::Vectorial<V>& from, - // mln::value::Vectorial<W>& to) - // { - // exact(to) = exact(from).to_equiv(); - // } - - // // Case 2: - - // template <typename V, typename W> - // void - // from_value_to_value_(const mln::value::Scalar<V>& from, - // mln::value::Scalar<W>& to) - // { - // exact(to) = exact(from).to_equiv(); - // } + // Case 1: Same equiv type. + + template <typename V, typename W, typename EV> + void + from_value_to_value_(const mln::value::Vectorial<V>& from, + mln::value::Vectorial<W>& to, + const EV&, const EV&) + { + exact(to) = exact(from).to_equiv(); + } + + template <typename V, typename W, typename EV> + void + from_value_to_value_(const mln::value::Scalar<V>& from, + mln::value::Scalar<W>& to, + const EV&, const EV&) + { + exact(to) = exact(from).to_equiv(); + } + + // Case 2: Different equiv type. No concept based + // conversions. Trying to find more specific conversions with + // other from_to_ overloads. + template <typename V, typename W, typename EV1, typename EV2> + inline + void + from_value_to_value_(const Value<V>& from, Value<W>& to, + const EV1&, const EV2&) + { + from_to_(exact(from), exact(to)); + } + template <typename V, typename W> inline void from_value_to_value_(const Value<V>& from, Value<W>& to) { - // No concept based conversion. Trying to find more specific - // conversion with other from_to overloads. - from_to_(exact(from), exact(to)); + /// Checking if V and W have the same equivalent type. + typedef mln_equiv(V) V_equiv; + typedef mln_equiv(W) W_equiv; + from_value_to_value_(exact(from), exact(to), V_equiv(), W_equiv()); } -- 1.7.2.5

1 0

olena: branch exp/newdoc updated: olena-2.0-577-g237e7b8
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 237e7b8998aae98e107f9cd47d70ccb6f00d2326 (commit) from 5cb37e9a4f3ba10c7345fbffe835a2dbaa5c65ca (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 ----------------------------------------------------------------- 237e7b8 doc/Doxyfile.in: Disable QHP generation. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 4 ++++ scribo/doc/Doxyfile.in | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-577-g237e7b8 doc/Doxyfile.in: Disable QHP generation.
by Guillaume Lazzara 26 Apr '13

26 Apr '13

--- scribo/ChangeLog | 4 ++++ scribo/doc/Doxyfile.in | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a3d6325..86b7802 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/Doxyfile.in: Disable QHP generation. + 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> * src/text_in_picture.cc: Add more descriptions in usage. diff --git a/scribo/doc/Doxyfile.in b/scribo/doc/Doxyfile.in index 904121c..2214874 100644 --- a/scribo/doc/Doxyfile.in +++ b/scribo/doc/Doxyfile.in @@ -373,7 +373,7 @@ DOT_CLEANUP = YES #--------------------------------------------------------------------------- SEARCHENGINE = YES -GENERATE_QHP = yes +GENERATE_QHP = no QHP_NAMESPACE = "fr.epita.lrde.olena.scribo" QHP_VIRTUAL_FOLDER = "scribo-2.0" QCH_FILE = "@builddir@/scribo.qch" -- 1.7.2.5

1 0

olena: branch exp/newdoc updated: olena-2.0-576-g5cb37e9
by git＠lrde.epita.fr 25 Apr '13

25 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 5cb37e9a4f3ba10c7345fbffe835a2dbaa5c65ca (commit) from 8113851467f0e6512b9c17f11f0c30d409a63c3f (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 ----------------------------------------------------------------- 5cb37e9 doc/mln/topo/topo.dox: New. Introduce mathematical topology module. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 5 +++++ milena/doc/mln/topo/topo.dox | 6 ++++++ 2 files changed, 11 insertions(+), 0 deletions(-) create mode 100644 milena/doc/mln/topo/topo.dox hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-576-g5cb37e9 doc/mln/topo/topo.dox: New. Introduce mathematical topology module.
by Guillaume Lazzara 25 Apr '13

25 Apr '13

--- milena/ChangeLog | 5 +++++ milena/doc/mln/topo/topo.dox | 6 ++++++ 2 files changed, 11 insertions(+), 0 deletions(-) create mode 100644 milena/doc/mln/topo/topo.dox diff --git a/milena/ChangeLog b/milena/ChangeLog index 989e483..49afff7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/mln/topo/topo.dox: New. Introduce mathematical topology + module. + +2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Add more "See also" statement in function documentation. * mln/fun/v2b/always_false.hh, diff --git a/milena/doc/mln/topo/topo.dox b/milena/doc/mln/topo/topo.dox new file mode 100644 index 0000000..85179cb --- /dev/null +++ b/milena/doc/mln/topo/topo.dox @@ -0,0 +1,6 @@ +/*! \defgroup mlntopo Mathematical Topology + * + * \brief Algorithms dedicated to Mathematical Topology. + * + * \ingroup modroutines + */ -- 1.7.2.5

1 0

olena: branch exp/newdoc updated: olena-2.0-575-g8113851
by git＠lrde.epita.fr 25 Apr '13

25 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 8113851467f0e6512b9c17f11f0c30d409a63c3f (commit) via feca97c579cabd8c220b49e9ad76db4abdfee5d5 (commit) via 8a63cd516c9d9cce4a7e2ce5a2ee0e7da4227312 (commit) via 61b6d4e0189709d6bce5eb2f4b9de63364a3af45 (commit) from 1712786ce30c5b090ec7791afa60895afd55d3cf (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 ----------------------------------------------------------------- 8113851 Cite papers in documentation. feca97c doc/doc.bib: Add more references. 8a63cd5 Add more "See also" statement in function documentation. 61b6d4e mln/make/relabelfun.hh: Fix bad variable replacement. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 11 ++++ doc/doc.bib | 30 +++++++++-- milena/ChangeLog | 55 +++++++++++++++++++ milena/mln/fun/v2b/always_false.hh | 7 ++- milena/mln/fun/v2b/always_true.hh | 7 ++- milena/mln/fun/v2b/lnot.hh | 10 +++- milena/mln/fun/v2b/threshold_ge.hh | 14 ++++- milena/mln/fun/v2b/threshold_le.hh | 14 ++++- milena/mln/fun/v2v/abs.hh | 1 + milena/mln/fun/v2v/all_to.hh | 1 + milena/mln/fun/v2v/array.hh | 1 + milena/mln/fun/v2v/cast.hh | 1 + milena/mln/fun/v2v/ch_function_value.hh | 1 + milena/mln/fun/v2v/component.hh | 1 + milena/mln/fun/v2v/convert.hh | 4 +- milena/mln/fun/v2v/dec.hh | 2 + milena/mln/fun/v2v/enc.hh | 1 + milena/mln/fun/v2v/hsl_to_rgb.hh | 12 +++- milena/mln/fun/v2v/id.hh | 1 + milena/mln/fun/v2v/inc.hh | 2 + milena/mln/fun/v2v/index_of_value.hh | 1 + milena/mln/fun/v2v/linear.hh | 1 + milena/mln/fun/v2v/mahalanobis.hh | 7 ++- milena/mln/fun/v2v/norm.hh | 6 +- milena/mln/fun/v2v/projection.hh | 1 + milena/mln/fun/v2v/qt_rgb_to_int_u.hh | 3 + milena/mln/fun/v2v/rgb8_to_rgbn.hh | 6 ++- milena/mln/fun/v2v/rgb_to_hsl.hh | 3 + milena/mln/fun/v2v/rgb_to_int_u.hh | 3 + milena/mln/fun/v2v/rgb_to_luma.hh | 3 + milena/mln/fun/v2v/round.hh | 2 + milena/mln/fun/v2v/round_sat.hh | 1 + milena/mln/fun/v2v/saturate.hh | 1 + milena/mln/fun/v2v/value_at_index.hh | 1 + milena/mln/fun/v2v/wrap.hh | 1 + milena/mln/fun/vv2b/eq.hh | 2 + milena/mln/fun/vv2b/ge.hh | 1 + milena/mln/fun/vv2b/gt.hh | 2 + milena/mln/fun/vv2b/implies.hh | 2 + milena/mln/fun/vv2b/le.hh | 1 + milena/mln/fun/vv2b/lt.hh | 1 + milena/mln/fun/vv2v/diff_abs.hh | 10 +++- milena/mln/fun/vv2v/land.hh | 10 +++- milena/mln/fun/vv2v/land_not.hh | 10 +++- milena/mln/fun/vv2v/lor.hh | 10 +++- milena/mln/fun/vv2v/lxor.hh | 10 +++- milena/mln/fun/vv2v/max.hh | 10 +++- milena/mln/fun/vv2v/min.hh | 10 +++- milena/mln/fun/vv2v/vec.hh | 10 +++- milena/mln/linear/log.hh | 4 +- milena/mln/make/relabelfun.hh | 2 +- milena/mln/topo/skeleton/crest.hh | 91 ++++++++++++++++--------------- 52 files changed, 312 insertions(+), 90 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-575-g8113851 Cite papers in documentation.
by Guillaume Lazzara 25 Apr '13

25 Apr '13

* mln/linear/log.hh, * mln/topo/skeleton/crest.hh: Here. --- ChangeLog | 7 +++ milena/mln/linear/log.hh | 4 +- milena/mln/topo/skeleton/crest.hh | 91 +++++++++++++++++++------------------ 3 files changed, 56 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d8e4c0..15e019f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Cite papers in documentation. + + * mln/linear/log.hh, + * mln/topo/skeleton/crest.hh: Here. + +2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/doc.bib: Add more references. 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/mln/linear/log.hh b/milena/mln/linear/log.hh index 865f571..824cf94 100644 --- a/milena/mln/linear/log.hh +++ b/milena/mln/linear/log.hh @@ -46,7 +46,7 @@ namespace mln /*! \brief Laplacian of Gaussian. - LoG_5x5 (Cf. Sonka et al., pages 85-86). + LoG_5x5 (Cf. Sonka et al., pages 85-86, \cite sonka1999image). This is also a "mexican hat". \ingroup mlnlinear @@ -77,7 +77,7 @@ namespace mln /*! \brief Laplacian of Gaussian. - LoG 17x17 (Cf. Sonka et al., pages 85-86). + LoG 17x17 (Cf. Sonka et al., pages 85-86, \cite sonka1999image). \ingroup mlnlinear */ diff --git a/milena/mln/topo/skeleton/crest.hh b/milena/mln/topo/skeleton/crest.hh index 351ec66..863bc77 100644 --- a/milena/mln/topo/skeleton/crest.hh +++ b/milena/mln/topo/skeleton/crest.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -48,54 +48,57 @@ namespace mln { - /// Compute skeletization constraints. - /// - /// \param[in] input A binary image. - /// \param[in] dist_map A distance map of \p input. Contains the - /// inner object distance map. - /// \param[in] nbh A neighborhood. - /// \param[in] psi_threshold Keep sites having a Point - /// Superiority Index greated or equal - /// to \p psi_threshold. - /// - /// \result A binary image. - // - /*! - * - * This implementation is based on the following article: - * K. W. Kang, J. W. Suh, and J. H. Kim. Skeletonization of grayscale - * character images using pixel superiority index. In Proc. 3rd IAPR - * Workshop on Document Analysis Systems, pages 326-335, Nagano, - * Japan, 1998. - * - * Abstract: - * "In this paper, we present pixel superiority index as a tool for - * designing a skeletonization algorithm which utilizes topographic - * features efficiently. We clarify a relationship between pixel - * superiority index and topographic features. Then, using the - * relationship, we transform a problem of skeletonization into a - * problem of skeleton growing. [...]" - * - * - * In Milena, the Pixel Superiority index is defined as follow: - * Let v = p.val(), the Pixel superiority index of p is the number of - * neighbor pixels having their value/level inferior or equal to - * p.val(). - * - * This algorithm keeps sites having their pixel superiority index - * greater than \p psi_threshold (6 by default). - * - * For good results with 2D images, we advice you to use c8() as - * neighborhood. - * - */ + /*! \brief Compute skeletization constraints. + + \param[in] input A binary image. + \param[in] dist_map A distance map of \p input. Contains the + inner object distance map. + \param[in] nbh A neighborhood. + \param[in] psi_threshold Keep sites having a Point + Superiority Index greated or equal + to \p psi_threshold. + + \result A binary image. + + + This implementation is based on the following paper: + K. W. Kang, J. W. Suh, and J. H. Kim. Skeletonization of grayscale + character images using pixel superiority index. In Proc. 3rd IAPR + Workshop on Document Analysis Systems, pages 326-335, Nagano, + Japan, 1998. (\cite kang1998iapr) + + Abstract: + "In this paper, we present pixel superiority index as a tool for + designing a skeletonization algorithm which utilizes topographic + features efficiently. We clarify a relationship between pixel + superiority index and topographic features. Then, using the + relationship, we transform a problem of skeletonization into a + problem of skeleton growing. [...]" + + + In Milena, the Pixel Superiority index is defined as follow: + Let v = p.val(), the Pixel superiority index of p is the number of + neighbor pixels having their value/level inferior or equal to + p.val(). + + This algorithm keeps sites having their pixel superiority index + greater than \p psi_threshold (6 by default). + + For good results with 2D images, we advice you to use c8() as + neighborhood. + + \ingroup modtopo + */ template <typename I, typename D, typename N> mln_concrete(I) crest(const Image<I>& input, const Image<D>& dist_map, const Neighborhood<N>& nbh, unsigned psi_threshold); - /// \overload - /// psi_threshold is set to 6. + /*! \overload + psi_threshold is set to 6. + + \ingroup modtopo + */ template <typename I, typename D, typename N> mln_concrete(I) crest(const Image<I>& input, const Image<D>& dist_map, -- 1.7.2.5

1 0