April 2013 - Olena-patches

olena-2.0-533-g9cf87e5 Add labeling module in documentation.
by Guillaume Lazzara 17 Apr '13

17 Apr '13

* doc/mln/labeling/labeling.dox: New. Introduce labeling module. * mln/labeling/background.hh, * mln/labeling/colorize.hh, * mln/labeling/compute.hh, * mln/labeling/compute_image.hh, * mln/labeling/flat_zones.hh, * mln/labeling/foreground.hh, * mln/labeling/mean_values.hh, * mln/labeling/pack.hh, * mln/labeling/regional_maxima.hh, * mln/labeling/regional_minima.hh, * mln/labeling/relabel.hh, * mln/labeling/superpose.hh, * mln/labeling/value.hh, * mln/labeling/value_and_compute.hh, * mln/labeling/wrap.hh: Set documentation as part of the labeling group. --- milena/ChangeLog | 23 +++++++ milena/doc/mln/labeling/labeling.dox | 6 ++ milena/mln/labeling/background.hh | 4 +- milena/mln/labeling/colorize.hh | 42 ++++++++----- milena/mln/labeling/compute.hh | 100 ++++++++++++++++------------- milena/mln/labeling/compute_image.hh | 74 ++++++++++++---------- milena/mln/labeling/flat_zones.hh | 18 +++--- milena/mln/labeling/foreground.hh | 8 ++- milena/mln/labeling/mean_values.hh | 11 +++- milena/mln/labeling/pack.hh | 34 +++++++--- milena/mln/labeling/regional_maxima.hh | 19 +++--- milena/mln/labeling/regional_minima.hh | 19 +++--- milena/mln/labeling/relabel.hh | 71 ++++++++++++--------- milena/mln/labeling/superpose.hh | 5 +- milena/mln/labeling/value.hh | 24 ++++--- milena/mln/labeling/value_and_compute.hh | 22 ++++--- milena/mln/labeling/wrap.hh | 35 ++++++---- 17 files changed, 314 insertions(+), 201 deletions(-) create mode 100644 milena/doc/mln/labeling/labeling.dox diff --git a/milena/ChangeLog b/milena/ChangeLog index 706b503..3275cd1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,28 @@ 2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Add labeling module in documentation. + + * doc/mln/labeling/labeling.dox: New. Introduce labeling module. + + * mln/labeling/background.hh, + * mln/labeling/colorize.hh, + * mln/labeling/compute.hh, + * mln/labeling/compute_image.hh, + * mln/labeling/flat_zones.hh, + * mln/labeling/foreground.hh, + * mln/labeling/mean_values.hh, + * mln/labeling/pack.hh, + * mln/labeling/regional_maxima.hh, + * mln/labeling/regional_minima.hh, + * mln/labeling/relabel.hh, + * mln/labeling/superpose.hh, + * mln/labeling/value.hh, + * mln/labeling/value_and_compute.hh, + * mln/labeling/wrap.hh: Set documentation as part of the labeling + group. + +2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Add documentation for mln_concrete and mln_ch_value. * mln/trait/ch_value.hh, diff --git a/milena/doc/mln/labeling/labeling.dox b/milena/doc/mln/labeling/labeling.dox new file mode 100644 index 0000000..c0b09c4 --- /dev/null +++ b/milena/doc/mln/labeling/labeling.dox @@ -0,0 +1,6 @@ +/*! \defgroup labeling Image Labeling + * + * \brief All labeling routines provided in Milena. + * + * \ingroup modroutines + */ diff --git a/milena/mln/labeling/background.hh b/milena/mln/labeling/background.hh index 7441504..b60dbb2 100644 --- a/milena/mln/labeling/background.hh +++ b/milena/mln/labeling/background.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -54,6 +55,7 @@ namespace mln * value set to \c false. * * \see mln::labeling::value + * \ingroup labeling */ template <typename I, typename N, typename L> mln_ch_value(I, L) diff --git a/milena/mln/labeling/colorize.hh b/milena/mln/labeling/colorize.hh index 52a76fd..1e39e78 100644 --- a/milena/mln/labeling/colorize.hh +++ b/milena/mln/labeling/colorize.hh @@ -57,17 +57,19 @@ namespace mln } - /// Create a new color image from a labeled image and fill each component - /// with a random color. - /*! - * litera::black is used for component 0, e.g. the background. - * Min and max values for RGB values can be set through the global - * variables mln::labeling::colorize_::min_value and - * mln::labeling::colorize_::max_value. - * - * \param[in] value value type used in the returned image. - * \param[in] labeled_image A labeled image (\sa labeling::blobs). - * \param[in] nlabels Number of labels. + /*! \brief Create a new color image from a labeled image and fill each component + with a random color. + + litera::black is used for component 0, e.g. the background. + Min and max values for RGB values can be set through the global + variables mln::labeling::colorize_::min_value and + mln::labeling::colorize_::max_value. + + \param[in] value value type used in the returned image. + \param[in] labeled_image A labeled image (\sa labeling::blobs). + \param[in] nlabels Number of labels. + + \ingroup labeling */ template <typename V, typename L> mln_ch_value(L, V) @@ -76,16 +78,26 @@ namespace mln const mln_value(L)& nlabels); - /// \overload - // + /*! \overload + The number of labels is re-computed. + + \warning Computing the number of labels shall add extra + computation time. + + \ingroup labeling + */ template <typename V, typename L> mln_ch_value(L, V) colorize(const V& value, const Image<L>& labeled_image); - /// \overload - // + /*! \overload + + Colorize labeled image with value::rgb8. + + \ingroup labeling + */ template <typename L> mln_ch_value(L, mln::value::rgb8) colorize(const Image<L>& input, diff --git a/milena/mln/labeling/compute.hh b/milena/mln/labeling/compute.hh index cc4c234..cd7d727 100644 --- a/milena/mln/labeling/compute.hh +++ b/milena/mln/labeling/compute.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2008, 2009, 2010, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010, 2012, 2013 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -60,15 +60,17 @@ namespace mln namespace labeling { - /// Compute an accumulator onto the pixel values of the image \p input. - /// for each component of the image \p label. - /// - /// \param[in] a An accumulator. - /// \param[in] input The input image. - /// \param[in] label The labeled image. - /// \param[in] nlabels The number of labels in \p label. - /// \return A util::array of accumulator result (one result per label). - // + /*! \brief Compute an accumulator onto the pixel values of the image \p input. + for each component of the image \p label. + + \param[in] a An accumulator. + \param[in] input The input image. + \param[in] label The labeled image. + \param[in] nlabels The number of labels in \p label. + \return A util::array of accumulator result (one result per label). + + \ingroup labeling + */ template <typename A, typename I, typename L> util::array<mln_result(A)> compute(const Accumulator<A>& a, @@ -77,15 +79,17 @@ namespace mln const mln_value(L)& nlabels); - /// Compute an accumulator onto the pixel values of the image \p input. - /// for each component of the image \p label. - /// - /// \param[in] a A meta-accumulator. - /// \param[in] input The input image. - /// \param[in] label The labeled image. - /// \param[in] nlabels The number of labels in \p label. - /// \return A util::array of accumulator result (one result per label). - // + /*! \brief Compute an accumulator onto the pixel values of the image \p input. + for each component of the image \p label. + + \param[in] a A meta-accumulator. + \param[in] input The input image. + \param[in] label The labeled image. + \param[in] nlabels The number of labels in \p label. + \return A util::array of accumulator result (one result per label). + + \ingroup labeling + */ template <typename A, typename I, typename L> util::array<mln_meta_accu_result(A, mln_value(I))> compute(const Meta_Accumulator<A>& a, @@ -94,14 +98,16 @@ namespace mln const mln_value(L)& nlabels); - /// Compute an accumulator onto the pixel sites of each component domain of - /// \p label. - /// - /// \param[in] a An accumulator. - /// \param[in] label The labeled image. - /// \param[in] nlabels The number of labels in \p label. - /// \return A util::array of accumulator result (one result per label). - // + /*! Compute an accumulator onto the pixel sites of each component domain of + \p label. + + \param[in] a An accumulator. + \param[in] label The labeled image. + \param[in] nlabels The number of labels in \p label. + \return A util::array of accumulator result (one result per label). + + \ingroup labeling + */ template <typename A, typename L> util::array<mln_result(A)> compute(const Accumulator<A>& a, @@ -109,14 +115,16 @@ namespace mln const mln_value(L)& nlabels); - /// Compute an accumulator onto the pixel sites of each component domain of - /// \p label. - /// - /// \param[in] a A meta-accumulator. - /// \param[in] label The labeled image. - /// \param[in] nlabels The number of labels in \p label. - /// \return A util::array of accumulator result (one result per label). - // + /*! \brief Compute an accumulator onto the pixel sites of each component domain of + \p label. + + \param[in] a A meta-accumulator. + \param[in] label The labeled image. + \param[in] nlabels The number of labels in \p label. + \return A util::array of accumulator result (one result per label). + + \ingroup labeling + */ template <typename A, typename L> util::array<mln_meta_accu_result(A, mln_psite(L))> compute(const Meta_Accumulator<A>& a, @@ -124,15 +132,17 @@ namespace mln const mln_value(L)& nlabels); - /// Compute an accumulator onto the pixel values of the image \p input. - /// for each component of the image \p label. - /// - /// \param[in] a An array of accumulator. - /// \param[in] input The input image. - /// \param[in] label The labeled image. - /// \param[in] nlabels The number of labels in \p label. - /// \return A util::array of accumulator result (one result per label). - // + /*! \brief Compute an accumulator onto the pixel values of the image \p input. + for each component of the image \p label. + + \param[in] a An array of accumulator. + \param[in] input The input image. + \param[in] label The labeled image. + \param[in] nlabels The number of labels in \p label. + \return A util::array of accumulator result (one result per label). + + \ingroup labeling + */ template <typename A, typename I, typename L> util::array<mln_result(A)> compute(util::array<A>& a, diff --git a/milena/mln/labeling/compute_image.hh b/milena/mln/labeling/compute_image.hh index 4baea29..6de1d88 100644 --- a/milena/mln/labeling/compute_image.hh +++ b/milena/mln/labeling/compute_image.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -49,16 +50,19 @@ namespace mln namespace labeling { - /// Compute an accumulator onto the pixel values of the image \p input. - /// for each component of the image \p label. - /// - /// \param[in] a The mln::p_array of accumulator result. - /// \param[in] input The input image (values). - /// \param[in] labels The label image. - /// \param[in] nlabels The count of labels. - /// - /// \return The image where labels are replaced by the result of - /// the accumulator. + /*! Compute an accumulator onto the pixel values of the image \p input. + for each component of the image \p label. + + \param[in] a The mln::p_array of accumulator result. + \param[in] input The input image (values). + \param[in] labels The label image. + \param[in] nlabels The count of labels. + + \return The image where labels are replaced by the result of + the accumulator. + + \ingroup labeling + */ template <typename A, typename I, typename L> mln_ch_value(L, mln_result(A)) compute_image(const util::array<mln_result(A)>& a, @@ -66,17 +70,19 @@ namespace mln const Image<L>& labels, const mln_value(L)& nlabels); - /// Compute an accumulator onto the pixel values of the image \p input. - /// for each component of the image \p label. - /// - /// \param[in] accu The accumulator. - /// \param[in] input The input image (values). - /// \param[in] labels The label image. - /// \param[in] nlabels The count of labels. - /// - /// \return The image where labels are replaced by the result of - /// the accumulator. - /// + /*! \brief Compute an accumulator onto the pixel values of the + image \p input. for each component of the image \p label. + + \param[in] accu The accumulator. + \param[in] input The input image (values). + \param[in] labels The label image. + \param[in] nlabels The count of labels. + + \return The image where labels are replaced by the result of + the accumulator. + + \ingroup labeling + */ template <typename A, typename I, typename L> inline mln_ch_value(L, mln_result(A)) @@ -86,17 +92,19 @@ namespace mln const mln_value(L)& nlabels); - /// Compute an accumulator onto the pixel values of the image \p input. - /// for each component of the image \p label. - /// - /// \param[in] accu The meta-accumulator. - /// \param[in] input The input image (values). - /// \param[in] labels The label image. - /// \param[in] nlabels The count of labels. - /// - /// \return The image where labels are replaced by the result of - /// the accumulator. - /// + /*! \brief Compute an accumulator onto the pixel values of the + image \p input. for each component of the image \p label. + + \param[in] accu The meta-accumulator. + \param[in] input The input image (values). + \param[in] labels The label image. + \param[in] nlabels The count of labels. + + \return The image where labels are replaced by the result of + the accumulator. + + \ingroup labeling + */ template <typename A, typename I, typename L> inline mln_ch_value(L, mln_meta_accu_result(A, mln_value(I))) diff --git a/milena/mln/labeling/flat_zones.hh b/milena/mln/labeling/flat_zones.hh index 683a17d..2d32eb4 100644 --- a/milena/mln/labeling/flat_zones.hh +++ b/milena/mln/labeling/flat_zones.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and +// Copyright (C) 2007, 2008, 2009, 2010, 2011, 2013 EPITA Research and // Development Laboratory (LRDE) // // This file is part of Olena. @@ -42,13 +42,15 @@ namespace mln namespace labeling { - /// Connected component labeling of the flat zones of an image. - /// - /// \param[in] input The input image. - /// \param[in] nbh The connexity of the flat zones. - /// \param[out] nlabels The number of labels. - /// \return The label image. - /// + /*! \brief Connected component labeling of the flat zones of an image. + + \param[in] input The input image. + \param[in] nbh The connexity of the flat zones. + \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) flat_zones(const Image& input, const Neighborhood<N>& nbh, diff --git a/milena/mln/labeling/foreground.hh b/milena/mln/labeling/foreground.hh index cb9c891..06bc148 100644 --- a/milena/mln/labeling/foreground.hh +++ b/milena/mln/labeling/foreground.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -40,8 +41,8 @@ namespace mln namespace labeling { - /*! Connected component labeling of the object part in a binary - * image. + /*! \brief Connected component labeling of the object part in a + * binary image. * * \param[in] input The input image. * \param[in] nbh The connexity of the foreground. @@ -54,6 +55,7 @@ namespace mln * value set to \c true. * * \see mln::labeling::value + * \ingroup labeling */ template <typename I, typename N, typename L> mln_ch_value(I, L) diff --git a/milena/mln/labeling/mean_values.hh b/milena/mln/labeling/mean_values.hh index b8cef49..6bb4cd0 100644 --- a/milena/mln/labeling/mean_values.hh +++ b/milena/mln/labeling/mean_values.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -60,6 +61,14 @@ namespace mln namespace labeling { + /*! \brief Construct an image of mean values from a labeled image. + + \param[in] input An image. + \param[in] lbl A labeled image. + \param[in] nlabels The number of computed labels. + + \ingroup labeling + */ template <typename I, typename L> mln_concrete(I) mean_colors(const Image& input, diff --git a/milena/mln/labeling/pack.hh b/milena/mln/labeling/pack.hh index 999f129..1f10ef8 100644 --- a/milena/mln/labeling/pack.hh +++ b/milena/mln/labeling/pack.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -48,21 +49,34 @@ namespace mln namespace labeling { - /// Relabel a labeled image in order to have a contiguous labeling. - /// - /// \param[in] label The labeled image. - /// \param[out] new_nlabels The number of labels after relabeling. - /// \param[out] repack_fun The function used to repack the labels. - /// - /// \return The relabeled image. - // + /*! \brief Relabel a labeled image in order to have a contiguous + labeling. + + \param[in] label The labeled image. + \param[out] new_nlabels The number of labels after relabeling. + \param[out] repack_fun The function used to repack the labels. + + \return The relabeled image. + + \ingroup labeling + */ template <typename I> mln_concrete(I) pack(const Image& label, mln_value(I)& new_nlabels, fun::i2v::array<mln_value(I)>& repack_fun); - /// \overload + /*! \overload + + Rely on a default relabeling function that guaranty contiguous + labeling. + + \warning Don't expect any label from \p label to be preserved. + + \sa make::relabelfun + + \ingroup labeling + */ template <typename I> mln_concrete(I) pack(const Image& label, mln_value(I)& new_nlabels); diff --git a/milena/mln/labeling/regional_maxima.hh b/milena/mln/labeling/regional_maxima.hh index 568fde8..da2a4c3 100644 --- a/milena/mln/labeling/regional_maxima.hh +++ b/milena/mln/labeling/regional_maxima.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -44,14 +44,15 @@ namespace mln namespace labeling { - /*! Connected component labeling of the regional maxima of an - * image. - * - * \param[in] input The input image. - * \param[in] nbh The connexity of the regional maxima. - * \param[out] nlabels The number of labeled regions. - * \return The label image. - * + /*! \brief Connected component labeling of the regional maxima of an + image. + + \param[in] input The input image. + \param[in] nbh The connexity of the regional maxima. + \param[out] nlabels The number of labeled regions. + \return The label image. + + \ingroup labeling */ template <typename I, typename N, typename L> mln_ch_value(I, L) diff --git a/milena/mln/labeling/regional_minima.hh b/milena/mln/labeling/regional_minima.hh index 5a6271e..ffc4de6 100644 --- a/milena/mln/labeling/regional_minima.hh +++ b/milena/mln/labeling/regional_minima.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -44,14 +44,15 @@ namespace mln namespace labeling { - /*! Connected component labeling of the regional minima of an - * image. - * - * \param[in] input The input image. - * \param[in] nbh The connexity of the regional minima. - * \param[out] nlabels The number of labeled regions. - * \return The label image. - * + /*! \brief Connected component labeling of the regional minima of + an image. + + \param[in] input The input image. + \param[in] nbh The connexity of the regional minima. + \param[out] nlabels The number of labeled regions. + \return The label image. + + \ingroup labeling */ template <typename I, typename N, typename L> mln_ch_value(I, L) diff --git a/milena/mln/labeling/relabel.hh b/milena/mln/labeling/relabel.hh index 7f304ee..1683e7d 100644 --- a/milena/mln/labeling/relabel.hh +++ b/milena/mln/labeling/relabel.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -47,15 +47,18 @@ namespace mln namespace labeling { - /// Remove components and relabel a labeled image. - /// \param[in] label the labeled image. - /// \param[in] nlabels the number of labels in \p label. - /// \param[out] new_nlabels the number of labels after relabeling. - /// \param[in] fv2b function returning whether a label must be replaced - /// by the background. - /// - /// \return the relabeled image. - // + /*! \brief Remove components and relabel a labeled image. + + \param[in] label the labeled image. + \param[in] nlabels the number of labels in \p label. + \param[out] new_nlabels the number of labels after relabeling. + \param[in] fv2b function returning whether a label must be replaced + by the background. + + \return the relabeled image. + + \ingroup labeling + */ template <typename I, typename F> mln_concrete(I) relabel(const Image& label, @@ -64,14 +67,16 @@ namespace mln const Function_v2b<F>& fv2b); - /// Remove components and relabel a labeled image. - /// \param[in] label the labeled image. - /// \param[in] nlabels the number of labels in \p label. - /// \param[in] fv2v function returning the new component id for each pixel - /// value. - /// - /// \return the relabeled image. - // + /*! \brief Remove components and relabel a labeled image. + + \param[in] label the labeled image. + \param[in] nlabels the number of labels in \p label. + \param[in] fv2v function returning the new component id for each pixel + value. + + \return the relabeled image. + \ingroup labeling + */ template <typename I, typename F> mln_concrete(I) relabel(const Image& label, @@ -79,12 +84,15 @@ namespace mln const Function_v2v<F>& fv2v); - /// Remove components and relabel a labeled image inplace. - /// \param[in, out] label the labeled image. - /// \param[in] nlabels the number of labels in \p label. - /// \param[in] fv2b function returning whether a label must be replaced - /// by the background. - // + /*! \brief Remove components and relabel a labeled image inplace. + + \param[in, out] label the labeled image. + \param[in] nlabels the number of labels in \p label. + \param[in] fv2b function returning whether a label must be replaced + by the background. + + \ingroup labeling + */ template <typename I, typename F> void relabel_inplace(Image& label, @@ -92,12 +100,15 @@ namespace mln const Function_v2b<F>& fv2b); - /// Remove components and relabel a labeled image inplace. - /// \param[in, out] label the labeled image. - /// \param[in] nlabels the number of labels in \p label. - /// \param[in] fv2v function returning the new component id for each - /// pixel value. - // + /*! \brief Remove components and relabel a labeled image inplace. + + \param[in, out] label the labeled image. + \param[in] nlabels the number of labels in \p label. + \param[in] fv2v function returning the new component id for each + pixel value. + + \ingroup labeling + */ template <typename I, typename F> void relabel_inplace(Image& label, diff --git a/milena/mln/labeling/superpose.hh b/milena/mln/labeling/superpose.hh index 641b4bb..2b4a7d7 100644 --- a/milena/mln/labeling/superpose.hh +++ b/milena/mln/labeling/superpose.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -66,6 +66,7 @@ namespace mln @pre \p rhs and lhs must have the same domain. @pre \p The value type of rhs must be convertible towards lhs's. + \ingroup labeling */ template <typename I, typename J> mln_concrete(I) diff --git a/milena/mln/labeling/value.hh b/milena/mln/labeling/value.hh index 069b2a1..6a60ee5 100644 --- a/milena/mln/labeling/value.hh +++ b/milena/mln/labeling/value.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -44,15 +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. - // + /*! \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 + */ template <typename I, typename N, typename L> mln_ch_value(I, L) value(const Image& input, const mln_value(I)& val, diff --git a/milena/mln/labeling/value_and_compute.hh b/milena/mln/labeling/value_and_compute.hh index 4619e1a..913d571 100644 --- a/milena/mln/labeling/value_and_compute.hh +++ b/milena/mln/labeling/value_and_compute.hh @@ -46,16 +46,18 @@ 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. - /// \param[in] accu The accumulator to be computed. - /// \return The label image. - // + /*! \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. + \param[in] accu The accumulator to be computed. + \return The label image. + + \ingroup labeling + */ template <typename I, typename N, typename L, typename A> util::couple<mln_ch_value(I,L), util::couple<util::array<mln_result(A)>, diff --git a/milena/mln/labeling/wrap.hh b/milena/mln/labeling/wrap.hh index 76426f2..1c5b64f 100644 --- a/milena/mln/labeling/wrap.hh +++ b/milena/mln/labeling/wrap.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -45,23 +46,29 @@ namespace mln namespace labeling { - /// Wrap labels such as 0 -> 0 and [1, lmax] maps to [1, - /// Lmax] (using modulus). - /// - /// \param[in] value_type The type used to wrap the label type. - /// \param[in] input The label image. - /// - /// \return A new image with values wrapped with type V. + /*! \brief Wrap labels such as 0 -> 0 and [1, lmax] maps to [1, + Lmax] (using modulus). + + \param[in] value_type The type used to wrap the label type. + \param[in] input The label image. + + \return A new image with values wrapped with type V. + + \ingroup labeling + */ template <typename V, typename I> mln_ch_value(I,V) wrap(const V& value_type, const Image& input); - /// Wrap labels such as 0 -> 0 and [1, lmax] maps to [1, - /// Lmax] (using modulus). Use label_8 as label type. - /// - /// \param[in] input The label image. - /// - /// \return A new image with values wrapped with type label_8. + /*! \brief Wrap labels such as 0 -> 0 and [1, lmax] maps to [1, + Lmax] (using modulus). Use label_8 as label type. + + \param[in] input The label image. + + \return A new image with values wrapped with type label_8. + + \ingroup labeling + */ template <typename I> mln_ch_value(I, mln::value::label_8) wrap(const Image& input); -- 1.7.2.5

1 0

olena-2.0-532-gce86917 Add documentation for mln_concrete and mln_ch_value.
by Guillaume Lazzara 17 Apr '13

17 Apr '13

* mln/trait/ch_value.hh, * mln/trait/concrete.hh: Here. --- milena/ChangeLog | 7 ++++ milena/mln/trait/ch_value.hh | 66 +++++++++++++++++++++++++++++++++++++++++- milena/mln/trait/concrete.hh | 65 ++++++++++++++++++++++++++++++++++++++++- 3 files changed, 135 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 76aef9a..706b503 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Add documentation for mln_concrete and mln_ch_value. + + * mln/trait/ch_value.hh, + * mln/trait/concrete.hh: Here. + +2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Add explanations on compilation with multiple files. * doc/examples/multi_files_f1.cc.raw, diff --git a/milena/mln/trait/ch_value.hh b/milena/mln/trait/ch_value.hh index eb120a1..87afc0a 100644 --- a/milena/mln/trait/ch_value.hh +++ b/milena/mln/trait/ch_value.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -36,7 +36,16 @@ # include <mln/trait/ch_function_value.hh> +/*! Macros provided for convenience. Should be used in a templated + function only. + \relates mln::trait::ch_value +*/ # define mln_ch_value(I, V) typename mln::trait::ch_value< I, V >::ret + +/*! Macros provided for convenience. Should be used in a + non-templated function only. + \relates mln::trait::ch_value +*/ # define mln_ch_value_(I, V) mln::trait::ch_value< I, V >::ret @@ -217,6 +226,61 @@ namespace mln } // end of namespace mln::trait::impl + + /*! \brief Compute the concrete type of an image type and change + the value type. + + \tparam I An image type. + + This macro is used to compute the most appropriate concrete image + type to be used to store a copy of an image of type I. + + A concrete image type is an image type storing all its site + values in a single memory buffer. For instance, mln::image1d, + mln::image2d, mln::image3d are considered as concrete types. + Image morphers are not concrete types since they can alter, on + the fly, the domain and the values. + + This macro is usually used while writing generic algorithms to + handle all possible cases while image morphers and concrete images + are interacting. + + Compared to mln::trait::concrete, this trait can change the + value type of the computed image type. + + Few examples: + \code + mln_ch_value(mln::image2d<int>,int) => mln::image2d<int> + mln_ch_value(mln::image2d<int>,bool) => mln::image2d<bool> + \endcode + + Therefore, you can safely write the following code: + \code + template<typename I> + mln_ch_value(I,bool) my_function(const Image& ima) + { + mln_ch_value(I,bool) output; + ... + return output; + } + + int main() + { + image2d<int> ima; + image2d<bool> result = my_function(ima); + } + \endcode + + Computing a type with trait::concrete can be done using macros + mln_ch_value() and mln_ch_value_(). + + Note that, due to C++ syntax ambiguities, mln_ch_value() should + be used in a templated function whereas mln_ch_value_() shoud be + used in a non-templated function. + + If you are not sure of the concrete type that should be returned + by the macro, take a look at mln_var() which can guess it for you. + */ template <typename I, typename V> struct ch_value { diff --git a/milena/mln/trait/concrete.hh b/milena/mln/trait/concrete.hh index 935cc9a..590409c 100644 --- a/milena/mln/trait/concrete.hh +++ b/milena/mln/trait/concrete.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -32,8 +33,16 @@ # include <mln/trait/ch_value.hh> - +/*! Macros provided for convenience. Should be used in a templated + function only. + \relates mln::trait::concrete +*/ # define mln_concrete(I) typename mln::trait::concrete::ret + +/*! Macros provided for convenience. Should be used in a + non-templated function only. + \relates mln::trait::concrete +*/ # define mln_concrete_(I) mln::trait::concrete::ret @@ -43,6 +52,58 @@ namespace mln namespace trait { + /*! + \brief Compute the concrete type of an image type. + + \tparam I An image type. + + This macro is used to compute the most appropriate concrete image + type to be used to store a copy of an image of type I. + + A concrete image type is an image type storing all its site + values in a single memory buffer. For instance, mln::image1d, + mln::image2d, mln::image3d are considered as concrete types. + Image morphers are not concrete types since they can alter, on + the fly, the domain and the values. + + This macro is usually used while writing generic algorithms to + handle all possible cases while image morphers and concrete images + are interacting. + + Few examples: + + \code + mln_concrete(mln::image2d<int>) => mln::image2d<int> + mln_concrete(mln::extended<mln::image2d<int> >) => mln::image2d<int> + \endcode + + Therefore, you can safely write the following code: + \code + template<typename I> + mln_concrete(I) my_function(const Image& ima) + { + mln_ch_value(I,bool) output; + ... + return output; + } + + int main() + { + image2d<int> ima; + image2d<int> result = my_function(ima); + } + \endcode + + Computing a type with trait::concrete can be done using macros + mln_concrete() and mln_concrete_(). + + Note that, due to C++ syntax ambiguities, mln_concrete() should + be used in a templated function whereas mln_concrete_() shoud be + used in a non-templated function. + + If you are not sure of the concrete type that should be returned + by the macro, take a look at mln_var() which can guess it for you. + */ template <typename I> struct concrete { -- 1.7.2.5

1 0

olena-2.0-531-g9df9980 Add explanations on compilation with multiple files.
by Guillaume Lazzara 17 Apr '13

17 Apr '13

* doc/examples/multi_files_f1.cc.raw, * doc/examples/multi_files_f2.cc.raw, * doc/examples/multi_files_main.cc.raw, * doc/examples/multiple_def.cc.raw, * doc/examples/typenametemplate.cc.raw, * doc/examples/undef_global_vars.cc.raw, * doc/examples/wrongvaluetype.cc.raw: New. * doc/ref-guide.tex: Add a new section. --- milena/ChangeLog | 14 +++++ milena/doc/examples/multi_files_f1.cc.raw | 6 ++ milena/doc/examples/multi_files_f2.cc.raw | 6 ++ milena/doc/examples/multi_files_main.cc.raw | 16 ++++++ milena/doc/examples/multiple_def.cc.raw | 9 +++ milena/doc/examples/typenametemplate.cc.raw | 1 + milena/doc/examples/undef_global_vars.cc.raw | 1 + milena/doc/examples/wrongvaluetype.cc.raw | 2 + milena/doc/ref-guide.tex | 69 +++++++++++++++++++++----- 9 files changed, 112 insertions(+), 12 deletions(-) create mode 100644 milena/doc/examples/multi_files_f1.cc.raw create mode 100644 milena/doc/examples/multi_files_f2.cc.raw create mode 100644 milena/doc/examples/multi_files_main.cc.raw create mode 100644 milena/doc/examples/multiple_def.cc.raw create mode 100644 milena/doc/examples/typenametemplate.cc.raw create mode 100644 milena/doc/examples/undef_global_vars.cc.raw create mode 100644 milena/doc/examples/wrongvaluetype.cc.raw diff --git a/milena/ChangeLog b/milena/ChangeLog index 17521bf..76aef9a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Add explanations on compilation with multiple files. + + * doc/examples/multi_files_f1.cc.raw, + * doc/examples/multi_files_f2.cc.raw, + * doc/examples/multi_files_main.cc.raw, + * doc/examples/multiple_def.cc.raw, + * doc/examples/typenametemplate.cc.raw, + * doc/examples/undef_global_vars.cc.raw, + * doc/examples/wrongvaluetype.cc.raw: New. + + * doc/ref-guide.tex: Add a new section. + +2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/Doxyfile.in: Expand more macros. 2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/doc/examples/multi_files_f1.cc.raw b/milena/doc/examples/multi_files_f1.cc.raw new file mode 100644 index 0000000..57e17bd --- /dev/null +++ b/milena/doc/examples/multi_files_f1.cc.raw @@ -0,0 +1,6 @@ +#include <mln/core/image/image2d.hh> + +void f1() +{ + +} diff --git a/milena/doc/examples/multi_files_f2.cc.raw b/milena/doc/examples/multi_files_f2.cc.raw new file mode 100644 index 0000000..730ae3f --- /dev/null +++ b/milena/doc/examples/multi_files_f2.cc.raw @@ -0,0 +1,6 @@ +#include <mln/core/image/image2d.hh> + +void f2() +{ + +} diff --git a/milena/doc/examples/multi_files_main.cc.raw b/milena/doc/examples/multi_files_main.cc.raw new file mode 100644 index 0000000..f131099 --- /dev/null +++ b/milena/doc/examples/multi_files_main.cc.raw @@ -0,0 +1,16 @@ +#undef MLN_WO_GLOBAL_VARS + +// This include is needed here to compile the global variables with +// this file. We include that file because it is used in other parts +// of the project. +#include <mln/core/image/image2d.hh> + +// Forward declarations +void f1(); +void f2(); + +int main() +{ + f1(); + f2(); +} diff --git a/milena/doc/examples/multiple_def.cc.raw b/milena/doc/examples/multiple_def.cc.raw new file mode 100644 index 0000000..741273c --- /dev/null +++ b/milena/doc/examples/multiple_def.cc.raw @@ -0,0 +1,9 @@ +fidji\% g++ main.cc f1.cc f2.cc -I$OLN/milena +/tmp/ccZLOEyG.o:(.data+0x0): multiple definition of `mln::debug::trace::quiet' +/tmp/ccqHhSP3.o:(.data+0x0): first defined here +/tmp/ccZLOEyG.o:(.bss+0x0): multiple definition of `mln::debug::trace::tab' +/tmp/ccqHhSP3.o:(.bss+0x0): first defined here +/tmp/ccZLOEyG.o:(.bss+0x4): multiple definition of `mln::debug::trace::full_trace' +/tmp/ccqHhSP3.o:(.bss+0x4): first defined here +/tmp/ccZLOEyG.o:(.bss+0x20): multiple definition of `mln::debug::trace::start_times_' +/tmp/ccqHhSP3.o:(.bss+0x20): first defined here diff --git a/milena/doc/examples/typenametemplate.cc.raw b/milena/doc/examples/typenametemplate.cc.raw new file mode 100644 index 0000000..4ec2d50 --- /dev/null +++ b/milena/doc/examples/typenametemplate.cc.raw @@ -0,0 +1 @@ +error: using 'typename' outside of template \ No newline at end of file diff --git a/milena/doc/examples/undef_global_vars.cc.raw b/milena/doc/examples/undef_global_vars.cc.raw new file mode 100644 index 0000000..92c506f --- /dev/null +++ b/milena/doc/examples/undef_global_vars.cc.raw @@ -0,0 +1 @@ +#undef MLN_WO_GLOBAL_VARS diff --git a/milena/doc/examples/wrongvaluetype.cc.raw b/milena/doc/examples/wrongvaluetype.cc.raw new file mode 100644 index 0000000..7ed1a68 --- /dev/null +++ b/milena/doc/examples/wrongvaluetype.cc.raw @@ -0,0 +1,2 @@ +error: 'check' is not a member of 'mln::metal::not_equal<bool, bool>} +error: 'check' is not a member of 'mln::metal::converts_to<mln::value::rgb<8u>, unsigned int>' \ No newline at end of file diff --git a/milena/doc/ref-guide.tex b/milena/doc/ref-guide.tex index 6e4a790..b26929a 100644 --- a/milena/doc/ref-guide.tex +++ b/milena/doc/ref-guide.tex @@ -245,21 +245,60 @@ Olena's tarball is structured as follow: Before writing your first program, please be aware of these hints: \begin{itemize} - \item By default, Olena enables a lot of internal pre and post conditions. - Usually, this is a useful feature and it \should be enabled. However, it can heavily - slow down a program though so these tests can be disabled by compiling - using \code{-DNDEBUG}. + \item By default, Olena enables a lot of internal pre and post + conditions. Usually, this is a useful feature and it \should be + enabled. However, it can heavily slow down a program though so + these tests can be disabled by compiling using \code{-DNDEBUG}. \begin{verbatim} -$ g++ -DNDEBUG -Ipath/to/mln my_program.cc +$ g++ -O2 -DNDEBUG -Ipath/to/mln my_program.cc \end{verbatim} %$ - \item If you decide to use optimization flags to compile for debugging, - prefer using \code{-O1}. It is much faster to compile and it gives good - performance results. + \item If you decide to use optimization flags to compile for + debugging, prefer using \code{-O1}. It is much faster to compile + and it gives good performance results. +\end{itemize} + + +\doxysection{multicompile}{Compiling a multiple files program with Olena} + +In case of a large project, Olena may be used in several source +files. Even if compilation is fine, you may encounter the following +linking error: + +\doxyrawcode{multiple_def} +These multiple symbol definitions are due to some global variables +used in Olena. They are built in each source file which includes Olena +headers and are therefore duplicated, causing linking errors. + +An easy way to override this issue is to compile all the source files +of your project passing -DMLN\_WO\_GLOBAL\_VARS. +Then, at the top of one of the files which includes Olena headers, add: + +\doxyrawcode{undef_global_vars} + +Here is a small example. + +\begin{itemize} + \item main.cc + \doxyrawcode{multi_files_main} + \item f1.cc + \doxyrawcode{multi_files_f1} + \item f2.cc + \doxyrawcode{multi_files_f2} \end{itemize} +This example can be compiled with the following command: + \begin{verbatim} +$ g++ -DNDEBUG -O2 -DMLN_WO_GLOBAL_VARS -Ipath/to/mln main.cc f1.cc f2.cc + \end{verbatim} +%$ + +Note that the file where MLN\_WO\_GLOBAL\_VARS is undefined must +include olena headers to declare and compile the global variables. + + %==================================== %\clearpage @@ -721,7 +760,7 @@ Note that: %================================================ -%\doxysection{imamorphed}{Morphed images} +\doxysection{imamorphed}{Morphed images} %//FIXME: Write it! %// Pas concrete, light, how to concrete % @@ -1990,8 +2029,7 @@ In this section, the most common compilation errors are gathered and explained. \begin{itemize} \item - \textbf{error: 'check' is not a member of 'mln::metal::not\_equal$<$bool, bool$>$} \\ - \textbf{error: 'check' is not a member of 'mln::metal::converts\_to$<$mln::value::rgb$<$8u$>$, unsigned int$>$'} \\ + \doxyrawcode{wrongvaluetype} The routine does not support a given image with such a value type or an automatic conversion from the image value type to the @@ -1999,13 +2037,20 @@ In this section, the most common compilation errors are gathered and explained. \item - \textbf{error: using 'typename' outside of template} \\ + \doxyrawcode{typenametemplate} Macros like \code{mln\_site} or \code{mln\_domain} can only be used in templated functions. In order to use them in a non-templated function, a `\_' must be appended to the macro name. For instance : \code{mln\_site\_} and \code{mln\_domain\_}. + \item + \doxyrawcode{multiple_def} + + This is because, by default, Milena does not support compilation + with multiple .cc files. Section \doxyref{multicompile} describes + how to do that. + \end{itemize} -- 1.7.2.5

1 0

olena-2.0-530-g002e0e9 doc/Doxyfile.in: Expand more macros.
by Guillaume Lazzara 17 Apr '13

17 Apr '13

--- milena/ChangeLog | 4 ++++ milena/doc/Doxyfile.in | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b4c62db..17521bf 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/Doxyfile.in: Expand more macros. + +2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/Doxyfile.in: Exclude internal symbols. 2013-04-16 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index 5b05848..67830b6 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -1706,7 +1706,12 @@ PREDEFINED = MLN_INCLUDE_ONLY \ "mln_is_fastest_IW(I, W)=mlc_and(mlc_is(mln_trait_image_speed(I), \ trait::image::speed::fastest), \ mln_is_simple_window(W))" \ - "BOOST_PP_LOCAL_ITERATE()=<boost/preprocessor/iteration/detail/local.hpp>" + "BOOST_PP_LOCAL_ITERATE()=<boost/preprocessor/iteration/detail/local.hpp>" \ + "mln_ch_convolve(I, W)=typename mln::linear::ch_convolve<I, W>::ret" \ + "mln_ch_convolve_(I, W)=mln::linear::ch_convolve<I, W>::ret" \ + "mln_ch_convolve_grad(I, W)=typename mln::trait::ch_value< I, algebra::vec< I::site::dim, typename mln::linear::ch_convolve<I,W>::ret::value > >::ret" \ + "mln_ch_convolve_grad_(I, W)=mln::trait::ch_value< I, algebra::vec< I::site::dim, mln::linear::ch_convolve<I,W>::ret::value > >::ret" + # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. -- 1.7.2.5

1 0

olena-2.0-529-g592a168 doc/Doxyfile.in: Expand more macros.
by Guillaume Lazzara 17 Apr '13

17 Apr '13

--- milena/ChangeLog | 4 ++++ milena/doc/Doxyfile.in | 24 ++++++++++-------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 63e7a73..b4c62db 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/Doxyfile.in: Exclude internal symbols. + 2013-04-16 Roland Levillain <roland(a)lrde.epita.fr> * tests/unit_test/unit-tests.mk: Regen. diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index d8c4324..5b05848 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -739,29 +739,25 @@ EXCLUDE_SYMBOLS = mln::*_check* \ mln::internal::subject_impl \ mln::internal::subject_point_impl<* \ mln::internal::subject_point_impl \ + mln::trait::bkd_* \ + mln::trait::accumulator::* \ mln::trait::accumulator_<* \ + mln::trait::image::* \ mln::trait::image_<* \ + mln::trait::neighborhood::* \ mln::trait::op_*< \ + mln::trait::op::* \ mln::trait::impl::ch_value_<* \ + mln::trait::site_set::* \ mln::trait::site_set_<* \ mln::trait::set_* \ + mln::trait::value::* \ mln::trait::value_* \ + mln::trait::window::* \ mln::trait::window_<* \ - mln::trait::internal::merge_triplet_<* \ - mln::trait::next::set_binary_<* \ - mln::trait::next::set_unary_<* \ - mln::trait::next::helper_get_unary_<* \ - mln::trait::next::helper_get_binary_<* \ - mln::trait::next::helper_solve_binary_<* \ - mln::trait::next::helper_solver_unary_<* \ - mln::trait::next::internal::helper_get_unary_<* \ - mln::trait::next::internal::helper_get_binary_<* \ - mln::trait::next::internal::set_unary_<* \ - mln::trait::next::internal::set_binary_<* \ - mln::trait::next::internal::helper_solve_binary_<* \ - mln::trait::next::internal::helper_solver_unary_<* \ + mln::trait::internal::* \ + mln::trait::next::* \ mln::metal::* \ - mln::trait::* \ mln::doc::* \ mln::io::*::internal::* \ mln::internal::exact_* \ -- 1.7.2.5

1 0

branch next updated: olena-2.0-528-g979d54b
by git＠lrde.epita.fr 17 Apr '13

17 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 979d54b458e41fc3bac8f347742d6a42a03df2a1 (commit) from 22f1827a91aba6dd05a98e784d53d4e76a1498cd (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 ----------------------------------------------------------------- 979d54b scribo/util/component_precise_outline.hh: Check if sites are part of the image. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 5 +++++ scribo/scribo/util/component_precise_outline.hh | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-528-g979d54b scribo/util/component_precise_outline.hh: Check if sites are part of the image.
by Guillaume Lazzara 17 Apr '13

17 Apr '13

--- scribo/ChangeLog | 5 +++++ scribo/scribo/util/component_precise_outline.hh | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 5982c33..216f480 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,8 @@ +2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> + + * scribo/util/component_precise_outline.hh: Check if sites are + part of the image. + 2013-04-12 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/Makefile.am: Remove duplicate '/' in path. diff --git a/scribo/scribo/util/component_precise_outline.hh b/scribo/scribo/util/component_precise_outline.hh index cef6096..f3a02fb 100644 --- a/scribo/scribo/util/component_precise_outline.hh +++ b/scribo/scribo/util/component_precise_outline.hh @@ -124,7 +124,7 @@ namespace scribo const point2d p3(cur_pt.row() + offset[direction][7][1], cur_pt.col() + offset[direction][7][0]); - if ((input(p2) != id) && (input(p3) == id)) + if ((input.has(p2) && input(p2) != id) && (input.has(p3) && input(p3) == id)) { direction = 3; return; @@ -190,7 +190,7 @@ namespace scribo const point2d p3(cur_pt.row() + offset[direction][7][1], cur_pt.col() + offset[direction][7][0]); - if ((input(p2) != id) && (input(p3) == id)) + if ((input.has(p2) && input(p2) != id) && (input.has(p3) && input(p3) == id)) { direction = 1; return; @@ -224,7 +224,8 @@ namespace scribo const point2d p3(cur_pt.row() + offset[direction][7][1], cur_pt.col() + offset[direction][7][0]); - if ((input(p2) != id) && ((input(p1) == id) || (input(p3) == id))) + if ((input.has(p2) && input(p2) != id) + && ((input.has(p1) && input(p1) == id) || (input.has(p3) && input(p3) == id))) { direction = 2; return; @@ -268,7 +269,7 @@ namespace scribo tmp = point2d(cur_pt.row() + offset[direction][i][1], cur_pt.col() + offset[direction][i][0]); - if (input(tmp) == id) + if (input.has(tmp) && input(tmp) == id) break; } -- 1.7.2.5

1 0

branch exp/TL updated: olena-2.0-499-gc3bdf5c
by git＠lrde.epita.fr 17 Apr '13

17 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/TL has been updated via c3bdf5c8577d0abf076fb9750f8ad96ecb92ff11 (commit) via 18a58d33480cce146e8aa2f2f5edb4ccc7b75cea (commit) from ee28c0638e95109490ffb89e1b175802e6c82634 (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 ----------------------------------------------------------------- c3bdf5c Merge branch 'exp/all-blobs' into exp/TL ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 14 ++++ milena/mln/canvas/labeling/blobs.hh | 12 ++-- milena/mln/labeling/{blobs.hh => all_blobs.hh} | 68 ++++++++++---------- milena/mln/labeling/blobs.hh | 52 +++++++++------ milena/mln/labeling/blobs_and_compute.hh | 16 ++++- milena/tests/labeling/Makefile.am | 1 + .../tests/labeling/{foreground.cc => all_blobs.cc} | 48 +++++++------- 7 files changed, 121 insertions(+), 90 deletions(-) copy milena/mln/labeling/{blobs.hh => all_blobs.hh} (62%) copy milena/tests/labeling/{foreground.cc => all_blobs.cc} (68%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-499-gc3bdf5c Merge branch 'exp/all-blobs' into exp/TL
by Guillaume Lazzara 17 Apr '13

17 Apr '13

This is a merge commit message of the following branches: Merge: ee28c06 18a58d3 milena/ChangeLog | 14 +++ milena/mln/canvas/labeling/blobs.hh | 12 ++-- milena/mln/labeling/all_blobs.hh | 127 ++++++++++++++++++++++++++++++ milena/mln/labeling/blobs.hh | 52 +++++++----- milena/mln/labeling/blobs_and_compute.hh | 16 +++- milena/tests/labeling/Makefile.am | 1 + milena/tests/labeling/all_blobs.cc | 63 +++++++++++++++ 7 files changed, 253 insertions(+), 32 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch exp/all-blobs created: olena-2.0-486-g18a58d3
by git＠lrde.epita.fr 17 Apr '13

17 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/all-blobs has been created at 18a58d33480cce146e8aa2f2f5edb4ccc7b75cea (commit) - Log ----------------------------------------------------------------- 18a58d3 Add a labeling routine working on grayscale images. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0