I uncommented some lines in attributes.hh. Why were they commented? olena/tests/convol does not pass make check (due to errors in the gaussian). Index: olena/ChangeLog from Niels Van Vliet &lt;niels(a)lrde.epita.fr&gt; * olena/oln/utils/histogram.hh: Change the return type of `at' method to const value_type. * olena/oln/morpho/attributes.hh: Uncomment some lines. * olena/oln/convol/nagao.hh: Correct comments. * olena/oln/convol/nagao.hxx: Likewise. * olena/oln/utils/se_stat.hh: Likewise. * olena/oln/utils/se_stat.hxx: Likewise. Index: olena/oln/utils/histogram.hh --- olena/oln/utils/histogram.hh Fri, 19 Mar 2004 11:53:50 +0100 van-vl_n (oln/10_histogram. 1.6.1.14.1.11 640) +++ olena/oln/utils/histogram.hh Sat, 27 Mar 2004 15:51:26 +0100 van-vl_n (oln/10_histogram. 1.6.1.14.1.11 640) @@ -122,7 +122,7 @@ this->exact().clear_impl(); } /// Read the number of occurrence of \a v. - const cpt_type& + const cpt_type operator[](const value_type &v)const { return this->exact().at(v); @@ -256,7 +256,7 @@ } /// operator[] should be called. - const cpt_type& + const cpt_type at(const T &v)const { return img_[v2p_(v)]; @@ -404,7 +404,7 @@ min_(ntg_min_val(value_type)), max_(ntg_max_val(value_type)) {} /// operator[] should be called. - const cpt_type& + const cpt_type at(const value_type& i) const { adjust(i); @@ -503,7 +503,7 @@ upper_type(input, v2p), min_(ntg_min_val(value_type)) {} /// operator[] should be called. - const cpt_type& + const cpt_type at(const value_type& i) const { return img_[v2p_(i)]; @@ -594,7 +594,7 @@ upper_type(input, v2p),max_(ntg_max_val(value_type)) {} /// operator[] should be called. - const cpt_type& + const cpt_type at(const value_type& i) const { return img_[v2p_(i)]; Index: olena/oln/morpho/attributes.hh --- olena/oln/morpho/attributes.hh Thu, 25 Mar 2004 15:00:37 +0100 palma_g (oln/j/45_attributes 1.10 644) +++ olena/oln/morpho/attributes.hh Sat, 27 Mar 2004 15:51:59 +0100 van-vl_n (oln/j/45_attributes 1.10 644) @@ -1213,11 +1213,11 @@ ** ** \arg p Point to consider in the image. */ - dist_type(//const im_type&, + dist_type(const im_type&, const point_type &p, - const env_type &) //: - // value_(ntg_zero_val(value_type)), - //center_(p) + const env_type &): + value_(ntg_zero_val(value_type)), + center_(p) { }; Index: olena/oln/convol/nagao.hh --- olena/oln/convol/nagao.hh Fri, 26 Mar 2004 20:56:28 +0100 van-vl_n (oln/m/22_nagao.hh 1.1 600) +++ olena/oln/convol/nagao.hh Sat, 27 Mar 2004 15:48:41 +0100 van-vl_n (oln/m/22_nagao.hh 1.1 600) @@ -127,7 +127,7 @@ /*! A Nagao filter generalized. ** - ** Each point in the input correspond to the mean of the + ** Each point in the input corresponds to the mean of the ** window in which has the smallest variance. ** ** \paran in Input image. Index: olena/oln/utils/se_stat.hh --- olena/oln/utils/se_stat.hh Fri, 26 Mar 2004 20:56:28 +0100 van-vl_n (oln/m/23_se_stat.hh 1.1 644) +++ olena/oln/utils/se_stat.hh Sat, 27 Mar 2004 15:50:13 +0100 van-vl_n (oln/m/23_se_stat.hh 1.1 644) @@ -96,16 +96,16 @@ ** \param Sum type used to compute the sum and the average. ** \param Var type used to compute the variance. ** - ** \note There is two parameters because for vectorial types the sum + ** \note There are two parameters because for vectorial types the sum ** is usually a vector, and the variance a non vectorial type. */ template <typename Sum = ntg::float_s, typename Var = ntg::float_s> class se_stat { public: - /// type of used to sum the value (usually floating point values) + /// type of used to sum values (usually floating point values) typedef Sum sum_type; - /// type of used for the variance (usually floating point values) + /// type of the variance (usually floating point values) typedef Var variance_type; /*! Build a se stat. @@ -121,7 +121,7 @@ compute(im, p, s); } - /// Computes the mean and the variance. + /// Compute the mean and the variance. template <class I, class S> se_stat & compute(const oln::abstract::image<I> &im, Index: olena/oln/utils/se_stat.hxx --- olena/oln/utils/se_stat.hxx Fri, 26 Mar 2004 20:56:28 +0100 van-vl_n (oln/m/24_se_stat.hx 1.1 644) +++ olena/oln/utils/se_stat.hxx Sat, 27 Mar 2004 15:50:23 +0100 van-vl_n (oln/m/24_se_stat.hx 1.1 644) @@ -32,7 +32,7 @@ namespace oln { namespace utils { - /// Computes the mean and the variance. + /// Compute the mean and the variance. template <typename Sum, typename Var> template <class I, class S> inline se_stat<Sum, Var> &