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/khalimsky has been updated
via 5ee0431581d8905678c4823763e8c929f9cbe1d2 (commit)
via 1900032a893ee9b05c63d3f0bf4a2708dd71f80a (commit)
via e9f27f7cb1ea8838b14cb139485867936c1a8d9b (commit)
from 79013f593d29d76f1cedd81e2b82b592456bb16e (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 -----------------------------------------------------------------
5ee0431 mln/world/kn/fill_0_from_1_faces.hh: Add an overload with functions.
1900032 Cleanup code.
e9f27f7 Add kn::border::compute_1_faces.
-----------------------------------------------------------------------
Summary of changes:
milena/ChangeLog | 27 ++++++
milena/mln/world/k1/fill_0_from_1_faces.hh | 6 +-
milena/mln/world/k1/fill_1_from_2_faces.hh | 3 +
.../{duplicate_2_faces.hh => compute_1_faces.hh} | 85 ++++++++------------
milena/mln/world/kn/border/duplicate_2_faces.hh | 2 +-
milena/mln/world/kn/fill_0_from_1_faces.hh | 25 ++++++-
milena/mln/world/kn/fill_0_from_2_faces.hh | 7 +-
milena/mln/world/kn/fill_1_from_2_faces.hh | 3 +
milena/mln/world/kn/fill_1_from_aux_2_faces.hh | 3 +
milena/mln/world/kn/fill_2_from_1_faces.hh | 7 +-
10 files changed, 103 insertions(+), 65 deletions(-)
copy milena/mln/world/kn/border/{duplicate_2_faces.hh => compute_1_faces.hh} (57%)
hooks/post-receive
--
Olena, a generic and efficient image processing platform
* mln/fun/vvvv2v/max.hh,
* mln/fun/vvvv2v/mean.hh,
* mln/fun/vvvv2v/median.hh,
* mln/fun/vvvv2v/min.hh: Here.
---
milena/ChangeLog | 9 +++++++++
milena/mln/fun/vvvv2v/max.hh | 7 +++----
milena/mln/fun/vvvv2v/mean.hh | 7 +++----
milena/mln/fun/vvvv2v/median.hh | 6 ++----
milena/mln/fun/vvvv2v/min.hh | 7 +++----
5 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 15a9193..678fb09 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,14 @@
2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr>
+ Add missing typedef in functions.
+
+ * mln/fun/vvvv2v/max.hh,
+ * mln/fun/vvvv2v/mean.hh,
+ * mln/fun/vvvv2v/median.hh,
+ * mln/fun/vvvv2v/min.hh: Here.
+
+2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr>
+
Add sum functions.
* mln/fun/vv2v/sum.hh,
diff --git a/milena/mln/fun/vvvv2v/max.hh b/milena/mln/fun/vvvv2v/max.hh
index 311bcfe..cf315c7 100644
--- a/milena/mln/fun/vvvv2v/max.hh
+++ b/milena/mln/fun/vvvv2v/max.hh
@@ -28,7 +28,7 @@
/// \file
///
-/// Functor that computes the max of two values.
+/// Functor that computes the max of four values.
# include <mln/core/concept/function.hh>
# include <mln/math/max.hh>
@@ -43,13 +43,12 @@ namespace mln
namespace vvvv2v
{
- // FIXME: Doc.
-
- /// \brief A functor computing the max of two values.
+ /// \brief A functor computing the max of four values.
template <typename T, typename R=T>
struct max : public Function_vvvv2v< max<T> >
{
typedef R result;
+ typedef T argument;
R operator()(const T& v1, const T& v2, const T& v3, const T& v4) const;
};
diff --git a/milena/mln/fun/vvvv2v/mean.hh b/milena/mln/fun/vvvv2v/mean.hh
index 7cc14e9..1016d47 100644
--- a/milena/mln/fun/vvvv2v/mean.hh
+++ b/milena/mln/fun/vvvv2v/mean.hh
@@ -28,7 +28,7 @@
/// \file
///
-/// Functor that computes the mean of two values.
+/// Functor that computes the mean of four values.
# include <mln/core/concept/function.hh>
# include <mln/trait/routine/mean.hh>
@@ -44,13 +44,12 @@ namespace mln
namespace vvvv2v
{
- // FIXME: Doc.
-
- /// \brief A functor computing the mean of two values.
+ /// \brief A functor computing the mean of four values.
template <typename T, typename R = mln_trait_routine_mean(4,T) >
struct mean : public Function_vvvv2v< mean<T> >
{
typedef R result;
+ typedef T argument;
R operator()(const T& v1, const T& v2, const T& v3, const T& v4) const;
};
diff --git a/milena/mln/fun/vvvv2v/median.hh b/milena/mln/fun/vvvv2v/median.hh
index e08dabd..b1c0652 100644
--- a/milena/mln/fun/vvvv2v/median.hh
+++ b/milena/mln/fun/vvvv2v/median.hh
@@ -28,7 +28,7 @@
/// \file
///
-/// Functor that computes the median of two values.
+/// Functor that computes the median of four values.
# include <mln/core/concept/function.hh>
# include <mln/trait/routine/median.hh>
@@ -44,9 +44,7 @@ namespace mln
namespace vvvv2v
{
- // FIXME: Doc.
-
- /// \brief A functor computing the median of two values.
+ /// \brief A functor computing the median of four values.
template <typename T, typename R = mln_trait_routine_median(T) >
struct median : public Function_vvvv2v< median<T> >
{
diff --git a/milena/mln/fun/vvvv2v/min.hh b/milena/mln/fun/vvvv2v/min.hh
index f0c4b63..2d24be1 100644
--- a/milena/mln/fun/vvvv2v/min.hh
+++ b/milena/mln/fun/vvvv2v/min.hh
@@ -28,7 +28,7 @@
/// \file
///
-/// Functor that computes the min of two values.
+/// Functor that computes the min of four values.
# include <mln/core/concept/function.hh>
# include <mln/math/min.hh>
@@ -43,13 +43,12 @@ namespace mln
namespace vvvv2v
{
- // FIXME: Doc.
-
- /// \brief A functor computing the min of two values.
+ /// \brief A functor computing the min of four values.
template <typename T, typename R=T>
struct min : public Function_vvvv2v< min<T> >
{
typedef R result;
+ typedef T argument;
R operator()(const T& v1, const T& v2, const T& v3, const T& v4) const;
};
--
1.7.2.5