April 2012 - Olena-patches

[Olena] #218: Check for unnecessary includes.
by Olena Trac 29 Nov '12

29 Nov '12

#218: Check for unnecessary includes. ---------------------+------------------------------------------------------ Reporter: lazzara | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Olena 1.1 Component: Milena | Version: 1.0 Keywords: | ---------------------+------------------------------------------------------ Few files may includes unnecessary files. Write a program and include these files: #include <mln/core/var.hh> #include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> #include <mln/pw/image.hh> You will be able to use p_array and sub_image without including their related files. Unnecessary includes slow down compilation and is damaging. -- Ticket URL: <https://trac.lrde.org/olena/ticket/218> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 1

[Olena] #195: Organize accumulators in subdirectories
by Olena Trac 29 Nov '12

29 Nov '12

#195: Organize accumulators in subdirectories -------------------------+-------------------------------------------------- Reporter: theo | Owner: Olena Team Type: enhancement | Status: new Priority: critical | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- For instance: * `accu/stats/` * ... * What else? -- Ticket URL: <https://trac.lrde.org/olena/ticket/195> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 3

[Olena] #251: Document how to compile with multiple files
by Olena Trac 29 Nov '12

29 Nov '12

#251: Document how to compile with multiple files -------------------------+-------------------------------------------------- Reporter: lazzara | Owner: lazzara Type: enhancement | Status: new Priority: minor | Milestone: Olena 2.1 Component: Milena | Version: 2.0 Keywords: | -------------------------+-------------------------------------------------- Add a chapter in the user reference guide. - MLN_INCLUDE_ONLY - MLN_WO_GLOBAL_VARS - Compilation with automake - Compilation with QMake - Common error messages (duplicated symbols, undefined symbols) -- Ticket URL: <https://trac.lrde.org/olena/ticket/251> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

1 2

[Olena] #208: Fix dependencies of the HTML documentation generation?
by Olena Trac 29 Nov '12

29 Nov '12

#208: Fix dependencies of the HTML documentation generation? ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: defect | Status: new Priority: minor | Milestone: Olena 1.1 Component: Milena | Version: 1.0 Keywords: doc | ----------------------+----------------------------------------------------- The generation of the HTML documentation requires a file named `html.sty`, which is not provided by HeVeA, but by latex2html. Is that right? I thought we only had a dependency on the former, not the latter. -- Ticket URL: <https://trac.lrde.org/olena/ticket/208> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 1

[Olena] #219: Add \internal in the documentation of internal code
by Olena Trac 29 Nov '12

29 Nov '12

#219: Add \internal in the documentation of internal code ---------------------+------------------------------------------------------ Reporter: lazzara | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Olena 1.1 Component: Milena | Version: 1.0 Keywords: | ---------------------+------------------------------------------------------ Currently, in order to not expose the internal code in the user documentation, everything in the internal and trait namespaces is ignored during the doc generation. The main issue is that inherited members are not shown in the documentation of the classes exposed to the user. The only way to ask Doxygen to show inherited members and not to show internal documentation is to add \internal in the documentation of internal code. -- Ticket URL: <https://trac.lrde.org/olena/ticket/219> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 2

[Olena] #235: Support GraphicsMagick++ and drop support for ImageMagick++
by Olena Trac 29 Nov '12

29 Nov '12

#235: Support GraphicsMagick++ and drop support for ImageMagick++ -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: proposal | Status: new Priority: major | Milestone: Olena 1.1 Component: Milena | Version: 1.0 Keywords: io external | -------------------------+-------------------------------------------------- !GraphicsMagick (http://www.graphicsmagick.org/) seems to provide a framework more modern than !ImageMagick's (http://www.imagemagick.org) in particular regarding multi-core support. Moreover Fabien has discovered weird behaviors (#210) and Buildbot has also recently exhibited run time errors that did not surface before (https://buildfarm.lrde.org/buildfarm/oln/builders/i486-linux-gnu- gcc-4.1/builds/539/steps/check/logs/stdio) -- though I don't know who's the culprit here. -- Ticket URL: <https://trac.lrde.org/olena/ticket/235> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 2

olena-2.0-2-gb9968d1 Disable postcondition on neighborhood.
by Edwin Carlinet 03 May '12

03 May '12

* mln/core/alias/neighb2d.hh: Disable postcondition on neighborhood. --- milena/mln/core/alias/neighb2d.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/milena/mln/core/alias/neighb2d.hh b/milena/mln/core/alias/neighb2d.hh index ee86509..642d112 100644 --- a/milena/mln/core/alias/neighb2d.hh +++ b/milena/mln/core/alias/neighb2d.hh @@ -233,7 +233,7 @@ namespace mln mlc_bool((2 * h + 1) * (2 * h + 1) == S)::check(); window2d& win = nbh.hook_win_(); convert::from_to(values, win); - mln_postcondition(win.is_neighbable_()); + //mln_postcondition(win.is_neighbable_()); } template <unsigned R, unsigned C> -- 1.7.2.5

2 1

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