- Olena-patches

olena-2.0-1-gcd24fef Add implicit conversion between types of different quantizations. i.e rgb<n> => rgb<m>, int_u<n> => int_u<m>...
by Edwin Carlinet 03 May '12

03 May '12

* mln/algebra/vec.hh, * mln/value/int_u.hh, * mln/value/rgb.hh: Interopability with different quantizations. --- milena/mln/algebra/vec.hh | 11 +++++++++++ milena/mln/value/int_u.hh | 15 +++++++++++++++ milena/mln/value/rgb.hh | 27 +++++++++++++++++++++++++-- 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/milena/mln/algebra/vec.hh b/milena/mln/algebra/vec.hh index 22ebc02..598c318 100644 --- a/milena/mln/algebra/vec.hh +++ b/milena/mln/algebra/vec.hh @@ -198,6 +198,8 @@ namespace mln vec& operator=(const literal::origin_t&); /// \} + vec(const literal::one_t&); + vec(const vec<n, T>& rhs); template <typename U> @@ -448,6 +450,13 @@ namespace mln { this->set_all(0); } + + template <unsigned n, typename T> + inline + vec<n,T>::vec(const literal::one_t&) + { + this->set_all(1); + } template <unsigned n, typename T> inline @@ -474,6 +483,8 @@ namespace mln return *this; } + + template <unsigned n, typename T> inline vec<n,T>::vec(const vec<n,T>& rhs) diff --git a/milena/mln/value/int_u.hh b/milena/mln/value/int_u.hh index f3786f9..bf0b139 100644 --- a/milena/mln/value/int_u.hh +++ b/milena/mln/value/int_u.hh @@ -181,6 +181,12 @@ namespace mln int_u& operator=(const mln::literal::one_t&); /// \} + template <unsigned m> + int_u(const int_u<m>& other) + { + this->handle_() = static_cast<enc_>(other.to_enc()); + } + /// Conversion to an unsigned integer. operator unsigned() const; @@ -262,6 +268,15 @@ namespace mln to_ = static_cast<double>(from); } + template <unsigned n, unsigned n2> + inline + void + from_to_(const value::int_u<n>& from, value::int_u<n2>& to_) + { + to_ = static_cast<unsigned>(from); + } + + } // end of namespace mln::convert::over_load diff --git a/milena/mln/value/rgb.hh b/milena/mln/value/rgb.hh index c9d2f53..d1729a7 100644 --- a/milena/mln/value/rgb.hh +++ b/milena/mln/value/rgb.hh @@ -283,7 +283,9 @@ namespace mln /// Constructor from a algebra::vec. rgb<n>(const algebra::vec<3, int>& rhs); rgb<n>(const algebra::vec<3, unsigned>& rhs); - rgb<n>(const algebra::vec<3, int_u<n> >& rhs); + + template <unsigned m> + rgb<n>(const algebra::vec<3, int_u<m> >& rhs); rgb<n>(const algebra::vec<3, float>& rhs); // Conversion to the interoperation type. @@ -316,10 +318,16 @@ namespace mln /// \} /// Assignment. + template <unsigned m> + rgb<n>& operator=(const rgb<m>& rhs); + rgb<n>& operator=(const rgb<n>& rhs); /// Zero value. static const rgb<n> zero; + + // friend class access + template <unsigned> friend struct rgb; }; @@ -438,8 +446,9 @@ namespace mln } template <unsigned n> + template <unsigned m> inline - rgb<n>::rgb(const algebra::vec<3, int_u<n> >& v) + rgb<n>::rgb(const algebra::vec<3, int_u<m> >& v) { this->v_ = v; } @@ -639,6 +648,18 @@ namespace mln this->v_[2] = 0; } + + + template <unsigned n> + template <unsigned m> + inline + rgb<n>& + rgb<n>::operator=(const rgb<m>& rhs) + { + this->v_ = rhs.v_; + return *this; + } + template <unsigned n> inline rgb<n>& @@ -650,6 +671,8 @@ namespace mln return *this; } + + template <unsigned n> const rgb<n> rgb<n>::zero(0,0,0); -- 1.7.2.5

2 1

branch master updated: olena-2.0-2-gb9968d1
by git＠lrde.epita.fr 03 May '12

03 May '12

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 master has been updated via b9968d11b67e760f73bb5a3ef5278f994f509a7f (commit) via cd24fef1af613a4f8d79161ff0d74e3d8cd8f6f0 (commit) from dd67b61c24dfbce6a081a8831ac9d15e6d46fdce (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 ----------------------------------------------------------------- b9968d1 Disable postcondition on neighborhood. cd24fef Add implicit conversion between types of different quantizations. i.e rgb<n> => rgb<m>, int_u<n> => int_u<m>... ----------------------------------------------------------------------- Summary of changes: milena/mln/algebra/vec.hh | 11 +++++++++++ milena/mln/core/alias/neighb2d.hh | 2 +- milena/mln/value/int_u.hh | 15 +++++++++++++++ milena/mln/value/rgb.hh | 27 +++++++++++++++++++++++++-- 4 files changed, 52 insertions(+), 3 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

2 1

branch master updated: olena-2.0
by git＠lrde.epita.fr 03 May '12

03 May '12

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 master has been updated discards b9968d11b67e760f73bb5a3ef5278f994f509a7f (commit) discards cd24fef1af613a4f8d79161ff0d74e3d8cd8f6f0 (commit) This update discarded existing revisions and left the branch pointing at a previous point in the repository history. * -- * -- N (dd67b61c24dfbce6a081a8831ac9d15e6d46fdce) \ O -- O -- O (b9968d11b67e760f73bb5a3ef5278f994f509a7f) The removed revisions are not necessarilly gone - if another reference still refers to them they will stay in the repository. No new revisions were added by this update. Summary of changes: milena/mln/algebra/vec.hh | 11 ----------- milena/mln/core/alias/neighb2d.hh | 2 +- milena/mln/value/int_u.hh | 15 --------------- milena/mln/value/rgb.hh | 27 ++------------------------- 4 files changed, 3 insertions(+), 52 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch edwin created: olena-2.0-2-gb9968d1
by git＠lrde.epita.fr 03 May '12

03 May '12

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 edwin has been created at b9968d11b67e760f73bb5a3ef5278f994f509a7f (commit) - Log ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-78-gf4ec946 Update generated .mk files.
by Guillaume Lazzara 27 Feb '12

27 Feb '12

* headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 7 +++++++ milena/headers.mk | 1 + milena/tests/unit_test/unit-tests.mk | 2 ++ 3 files changed, 10 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 31ffb7c..30bf771 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2012-02-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Update generated .mk files. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + +2012-02-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new figure on the main page. * doc/img/genericity.png, diff --git a/milena/headers.mk b/milena/headers.mk index db0c05f..1b7af21 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -33,6 +33,7 @@ mln/accu/math/all.hh \ mln/accu/math/count.hh \ mln/accu/math/essential.hh \ mln/accu/math/sum.hh \ +mln/accu/math/sumpow.hh \ mln/accu/max_site.hh \ mln/accu/nil.hh \ mln/accu/p.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 3a14188..ab8af7c 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -125,6 +125,7 @@ mln_accu_math_count \ mln_accu_math_essential \ mln_accu_math_inf \ mln_accu_math_sum \ +mln_accu_math_sumpow \ mln_accu_math_sup \ mln_accu_max_site \ mln_accu_nil \ @@ -1455,6 +1456,7 @@ mln_accu_math_count_SOURCES = mln_accu_math_count.cc mln_accu_math_essential_SOURCES = mln_accu_math_essential.cc mln_accu_math_inf_SOURCES = mln_accu_math_inf.cc mln_accu_math_sum_SOURCES = mln_accu_math_sum.cc +mln_accu_math_sumpow_SOURCES = mln_accu_math_sumpow.cc mln_accu_math_sup_SOURCES = mln_accu_math_sup.cc mln_accu_max_site_SOURCES = mln_accu_max_site.cc mln_accu_nil_SOURCES = mln_accu_nil.cc -- 1.7.2.5

1 0

olena-2.0-79-gaa02dac Fix doxygen warnings.
by Guillaume Lazzara 27 Feb '12

27 Feb '12

* mln/accu/compute.hh, * mln/convert/to_p_set.hh, * mln/data/compute.hh, * mln/debug/filename.hh, * mln/labeling/blobs.hh, * mln/morpho/tree/filter/all.hh: Here. --- milena/ChangeLog | 11 +++++++++++ milena/mln/accu/compute.hh | 4 ++-- milena/mln/convert/to_p_set.hh | 2 +- milena/mln/data/compute.hh | 12 +++++++----- milena/mln/debug/filename.hh | 4 ++-- milena/mln/labeling/blobs.hh | 10 +++++----- milena/mln/morpho/tree/filter/all.hh | 5 +++-- 7 files changed, 31 insertions(+), 17 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 30bf771..a2d5f9e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2011-12-07 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix doxygen warnings. + + * mln/accu/compute.hh, + * mln/convert/to_p_set.hh, + * mln/data/compute.hh, + * mln/debug/filename.hh, + * mln/labeling/blobs.hh, + * mln/morpho/tree/filter/all.hh: Here. + 2012-02-27 Guillaume Lazzara <z(a)lrde.epita.fr> Update generated .mk files. diff --git a/milena/mln/accu/compute.hh b/milena/mln/accu/compute.hh index 9c0e6b1..bf513f9 100644 --- a/milena/mln/accu/compute.hh +++ b/milena/mln/accu/compute.hh @@ -46,8 +46,8 @@ namespace mln /// Make an accumulator compute the pixels of the image \p input. /// - /// \param[in] input The input image. /// \param[in] a An accumulator. + /// \param[in] input The input image. /// /// This routine runs: \n /// a.take(make::pix(input, p)); @@ -62,8 +62,8 @@ namespace mln /// Make an accumulator compute the pixels of the image \p input. /// - /// \param[in] input The input image. /// \param[in] a A meta accumulator. + /// \param[in] input The input image. /// /// This routine runs: \n /// a.take(make::pix(input, p)); diff --git a/milena/mln/convert/to_p_set.hh b/milena/mln/convert/to_p_set.hh index 3f5f8c4..46cd5e7 100644 --- a/milena/mln/convert/to_p_set.hh +++ b/milena/mln/convert/to_p_set.hh @@ -69,7 +69,7 @@ namespace mln p_set<P> to_p_set(const std::set<P, C>& s); - /// Convert any site set \p ps into a 'mln::p_set' site set. + /// Convert any site set \p ps into a 'mln::p_set<>' site set. template <typename S> p_set<mln_psite(S)> to_p_set(const Site_Set<S>& ps); diff --git a/milena/mln/data/compute.hh b/milena/mln/data/compute.hh index 0ab146e..6fe4925 100644 --- a/milena/mln/data/compute.hh +++ b/milena/mln/data/compute.hh @@ -42,9 +42,9 @@ namespace mln namespace data { - /// Compute an accumulator onto the pixel values of the image \p input. - /// Be ware that the given accumulator won't be modified and won't - /// store any result. + /// \brief Compute an accumulator onto the pixel values of the + /// image \p input. Be ware that the given accumulator won't be + /// modified and won't store any result. /// /// \param[in] a An accumulator. /// \param[in] input The input image. @@ -57,7 +57,8 @@ namespace mln compute(const Accumulator<A>& a, const Image<I>& input); - /// Compute an accumulator onto the pixel values of the image \p input. + /// \brief Compute an accumulator onto the pixel values of the + /// image \p input. /// /// \param[in, out] a An accumulator. /// \param[in] input The input image. @@ -70,7 +71,8 @@ namespace mln compute(Accumulator<A>& a, const Image<I>& input); - /// Compute an accumulator onto the pixel values of the image \p input. + /// \brief Compute an accumulator onto the pixel values of the + /// image \p input. /// /// \param[in] a A meta-accumulator. /// \param[in] input The input image. diff --git a/milena/mln/debug/filename.hh b/milena/mln/debug/filename.hh index 1fc268b..954e516 100644 --- a/milena/mln/debug/filename.hh +++ b/milena/mln/debug/filename.hh @@ -50,9 +50,9 @@ namespace mln ** ** Where: ** - `filename_prefix` can be set through the global variable - ** debug::internal::filename_prefix. + ** debug::internal::filename_prefix. ** - `postfix_id` is autoincremented by default. Its value can be - forced. + forced. ** - `filename` is the given filename */ std::string diff --git a/milena/mln/labeling/blobs.hh b/milena/mln/labeling/blobs.hh index 12462c8..ce06b7d 100644 --- a/milena/mln/labeling/blobs.hh +++ b/milena/mln/labeling/blobs.hh @@ -48,11 +48,11 @@ namespace mln namespace labeling { - /// Connected component labeling of the binary objects of a binary - /// image. + /// \brief Connected component labeling of the binary objects of a + /// binary image. /// - /// \param[in] input The input image. - /// \param[in] nbh The connexity of the objects. + /// \param[in] input The input image. + /// \param[in] nbh The connexity of the objects. /// \param[out] nlabels The Number of labels. Its value is set in the /// algorithms. /// \return The label image. @@ -61,7 +61,7 @@ namespace mln /// /// A fast queue is used so that the algorithm is not recursive and /// can handle large binary objects (blobs). - /// + // template <typename I, typename N, typename L> mln_ch_value(I, L) blobs(const Image<I>& input, const Neighborhood<N>& nbh, diff --git a/milena/mln/morpho/tree/filter/all.hh b/milena/mln/morpho/tree/filter/all.hh index 1271b06..97b0e92 100644 --- a/milena/mln/morpho/tree/filter/all.hh +++ b/milena/mln/morpho/tree/filter/all.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -27,7 +28,7 @@ # define MLN_MORPHO_TREE_FILTER_ALL_HH /** -** \file mln/morpho/tree/filter.hh +** \file ** ** Methods to handle component tree filtering strategies with ** non-increasing attribute. Nevertheless, it works on increasing -- 1.7.2.5

1 0

olena-2.0-80-g125c7e3 doc/Makefile.am: Fix deprecated dist files.
by Guillaume Lazzara 27 Feb '12

27 Feb '12

--- scribo/ChangeLog | 4 ++++ scribo/doc/Makefile.am | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d44e98b..f272efe 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2011-12-07 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/Makefile.am: Fix deprecated dist files. + 2012-02-27 Guillaume Lazzara <z(a)lrde.epita.fr> Improve Scribo documentation. diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index 6469ab9..3963182 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -195,9 +195,6 @@ EXTRA_DIST += \ $(DOXYFILE).in \ doxyfuns.sty \ scribo.sty \ - tools/clearbanner.sh \ - tools/sample_utils.hh \ - tools/split_sample.sh \ tools/todoxygen.sh -- 1.7.2.5

1 0

olena-2.0-81-g6f2cda0 tests/binarization/Makefile.am (EXTRA_DIST): Fix invalid filename.
by Guillaume Lazzara 27 Feb '12

27 Feb '12

--- scribo/ChangeLog | 5 +++++ scribo/tests/binarization/Makefile.am | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f272efe..9b2c772 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,8 @@ +2011-12-08 Guillaume Lazzara <z(a)lrde.epita.fr> + + * tests/binarization/Makefile.am (EXTRA_DIST): Fix invalid + filename. + 2011-12-07 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/Makefile.am: Fix deprecated dist files. diff --git a/scribo/tests/binarization/Makefile.am b/scribo/tests/binarization/Makefile.am index a2962bb..bab3e35 100644 --- a/scribo/tests/binarization/Makefile.am +++ b/scribo/tests/binarization/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/scribo/tests/tests.mk EXTRA_DIST = \ - niblack.res.pbm \ + niblack.ref.pbm \ sauvola_ms.ref.pbm \ sauvola.ref.pbm \ otsu.ref.pbm -- 1.7.2.5

1 0

olena-2.0-82-gea3eefc doc/Makefile.am: Add missing files in EXTRA_DIST.
by Guillaume Lazzara 27 Feb '12

27 Feb '12

--- ChangeLog | 4 ++++ doc/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ff3c35..1f27ac5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-12-08 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/Makefile.am: Add missing files in EXTRA_DIST. + 2012-02-27 Guillaume Lazzara <z(a)lrde.epita.fr> Fix dependencies in Makefiles. diff --git a/doc/Makefile.am b/doc/Makefile.am index 8a45e4e..8da072b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -82,7 +82,7 @@ REFMAN_deps = $(srcdir)/footer.html \ lrde_olena.html \ $(REFMAN_IMAGES) - +EXTRA_DIST += $(REFMAN_deps) # Sed is used to generate Doxyfile from Doxyfile.in instead of # configure, because the former is way faster than the latter. -- 1.7.2.5

1 0

olena-2.0-83-g5f172d8 Change path to .bib files.
by Guillaume Lazzara 27 Feb '12

27 Feb '12

* doc/Doxyfile.in, * doc/Makefile.am: Here. --- scribo/ChangeLog | 7 +++++++ scribo/doc/Doxyfile.in | 4 ++-- scribo/doc/Makefile.am | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 9b2c772..e1d6df4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2011-12-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Change path to .bib files. + + * doc/Doxyfile.in, + * doc/Makefile.am: Here. + 2011-12-08 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/binarization/Makefile.am (EXTRA_DIST): Fix invalid diff --git a/scribo/doc/Doxyfile.in b/scribo/doc/Doxyfile.in index 1986828..bd28b0f 100644 --- a/scribo/doc/Doxyfile.in +++ b/scribo/doc/Doxyfile.in @@ -124,8 +124,8 @@ INPUT_FILTER = FILTER_PATTERNS = FILTER_SOURCE_FILES = NO INPUT_ENCODING = ISO-8859-1 -CITE_BIB_FILES = @top_srcdir@/doc/doc \ - @top_srcdir@/doc/olena +CITE_BIB_FILES = @abs_srcdir@/doc/doc \ + @abs_srcdir@/doc/olena LATEX_BIB_STYLE = plain #--------------------------------------------------------------------------- # configuration options related to source browsing diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index 3963182..bef0fa5 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -63,6 +63,7 @@ edit = sed -e "s|@ID@|$$Id|" \ -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ -e 's,@top_srcdir\@,$(top_srcdir),g' \ + -e 's,@abs_srcdir\@,$(abs_srcdir),g' \ -e 's,@top_builddir\@,$(top_builddir),g' \ -e 's,@srcdir\@,$(srcdir),g' \ -e 's,@builddir\@,$(builddir),g' -- 1.7.2.5

1 0