[Olena-patches] olena-2.0-57-gf3c06f6 scribo/subsampling/integral_single_image.hh: Fix forward declarations.

--- scribo/ChangeLog | 5 +++++ scribo/scribo/subsampling/integral_single_image.hh | 20 ++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 0d24f37..df9d036 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,8 @@ +2011-12-12 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + * scribo/subsampling/integral_single_image.hh: Fix forward + declarations. + 2011-12-01 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; * src/Makefile.am: Remove -lpthread. diff --git a/scribo/scribo/subsampling/integral_single_image.hh b/scribo/scribo/subsampling/integral_single_image.hh index b9c7a59..381f08f 100644 --- a/scribo/scribo/subsampling/integral_single_image.hh +++ b/scribo/scribo/subsampling/integral_single_image.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -53,20 +53,18 @@ namespace scribo \param[in] input An image of Scalar. \param[in] scale The scale factor. - \param[in] integral_sum Integral image of mean values. - \param[in] integral_sum_2 Integral image of squared mean values. + \param[in] integral_sum_sum_2 Integral image of mean and squared mean values. \param[in] output_domain The domain of the subscaled image. \param[in] border_thickness Border of the integral and subscaled images. - \p integral_sum, \p integral_sum_2 and output image have the same domain. + \p integral_sum_sum_2 and output image have the same domain. The output domain is set with \p output_domain. */ template <typename I, typename J> - inline mln_concrete(I) - integral(const Image<I>& input, unsigned scale, - Image<J>& integral_sum, Image<J>& integral_sum_2, + integral(const Image<I>& input_, unsigned scale, + Image<J>& integral_sum_sum_2, const mln_domain(I)& output_domain, unsigned border_thickness); /*! \overload @@ -83,10 +81,8 @@ namespace scribo template <typename I, typename J> inline mln_concrete(I) - integral(const Image<I>& input, unsigned scale, - Image<J>& integral_sum, Image<J>& integral_sum_2); - - + integral(const Image<I>& input_, unsigned scale, + Image<J>& integral_sum_sum_2); # ifndef MLN_INCLUDE_ONLY -- 1.7.2.5