[Olena-patches] oln 10.127: Clean olena

Index: olena/ChangeLog from Niels Van Vliet &lt;niels(a)lrde.epita.fr&gt; * olena/oln/core/image1d.hh: Return exact_type in clone_. * olena/oln/core/image2d.hh: Likewise. * olena/oln/core/image3d.hh: Likewise. * olena/oln/core/neighborhood2d.hh: Remove a FIXME. Remove operator=. * olena/oln/core/window2d.hh: Likewise. * olena/oln/core/w_window2d.hh: Add comments. * olena/oln/level/cc.hh: Remove headers. * olena/oln/morpho/top_hat.inc: Remove a FIXME. * olena/tests/morpher/tests/sq_morph: New file, contains sub quantifying morpher tests. * olena/tests/morpher/tests/color_morph: New file, contains color Index: olena/oln/core/image1d.hh --- olena/oln/core/image1d.hh Fri, 12 Mar 2004 20:17:58 +0100 thivol_d (oln/c/47_image1d.hh 1.28.1.2 640) +++ olena/oln/core/image1d.hh Fri, 02 Apr 2004 12:27:27 +0200 van-vl_n (oln/c/47_image1d.hh 1.28.1.2 640) @@ -208,19 +208,11 @@ protected: - /*! \brief Return a deep copy of the current image. - ** - ** \warning It may be really dangerous to instantiate a self_type - ** and not an exact_type if Exact != mlc::final. - ** - ** \todo FIXME: It may be really dangerous to instantiate a self_type - ** and not an exact_type if Exact != mlc::final. - */ - - self_type - clone_() const // deep copy + /// Return a deep copy of the current image. + exact_type + clone_() const { - self_type output(this->ncols(), this->border()); + exact_type output(this->ncols(), this->border()); clone_to(output.impl()); return output; } Index: olena/oln/core/image2d.hh --- olena/oln/core/image2d.hh Fri, 12 Mar 2004 20:17:58 +0100 thivol_d (oln/c/45_image2d.hh 1.30.1.2 640) +++ olena/oln/core/image2d.hh Fri, 02 Apr 2004 12:28:23 +0200 van-vl_n (oln/c/45_image2d.hh 1.30.1.2 640) @@ -210,19 +210,11 @@ protected: - /*! \brief Return a deep copy of the current image. - ** - ** \warning It may be really dangerous to instantiate a self_type - ** and not an exact_type if Exact != mlc::final. - ** - ** \todo FIXME: It may be really dangerous to instantiate a self_type - ** and not an exact_type is Exact != mlc::final. - */ - - self_type - clone_() const // deep copy + /// Return a deep copy of the current image. + exact_type + clone_() const { - self_type output(this->nrows(), this->ncols(), this->border()); + exact_type output(this->nrows(), this->ncols(), this->border()); clone_to(output.impl()); return output; } Index: olena/oln/core/image3d.hh --- olena/oln/core/image3d.hh Fri, 12 Mar 2004 20:17:58 +0100 thivol_d (oln/c/43_image3d.hh 1.27.1.2 640) +++ olena/oln/core/image3d.hh Fri, 02 Apr 2004 12:28:17 +0200 van-vl_n (oln/c/43_image3d.hh 1.27.1.2 640) @@ -208,19 +208,12 @@ protected: - /*! \brief Return a deep copy of the current image. - ** - ** \warning It may be really dangerous to instantiate a self_type - ** and not an exact_type if Exact != mlc::final. - ** - ** \todo FIXME: It may be really dangerous to instantiate a self_type - ** and not an exact_type is Exact != mlc::final. - */ - - self_type - clone_() const // deep copy + /// Return a deep copy of the current image. + exact_type + clone_() const { - self_type output(this->nslices(), this->nrows(), this->ncols(), this->border()); + exact_type output(this->nslices(), this->nrows(), + this->ncols(), this->border()); clone_to(output.impl()); return output; } Index: olena/oln/core/neighborhood2d.hh --- olena/oln/core/neighborhood2d.hh Mon, 29 Mar 2004 09:53:11 +0200 odou_s (oln/c/36_neighborho 1.20 640) +++ olena/oln/core/neighborhood2d.hh Fri, 02 Apr 2004 13:28:46 +0200 van-vl_n (oln/c/36_neighborho 1.20 640) @@ -141,24 +141,12 @@ add(dpoint_type(crd[i], crd[i+1])); } - // io - /*! - ** \todo FIXME: it doesn't seem useful. We may remove it - */ + // Constructor used in io functions. neighborhood2d(const io::internal::anything& r) : super_type() { r.assign(*this); } - /*! - ** \todo FIXME: it doesn't seem useful. We may remove it - */ - neighborhood2d& - operator=(const io::internal::anything& r) - { - return r.assign(*this); - } - /// Return the name of the type. static std::string name() Index: olena/oln/core/window2d.hh --- olena/oln/core/window2d.hh Mon, 29 Mar 2004 09:53:11 +0200 odou_s (oln/c/14_window2d.h 1.21 640) +++ olena/oln/core/window2d.hh Fri, 02 Apr 2004 15:47:03 +0200 van-vl_n (oln/c/14_window2d.h 1.21 640) @@ -142,24 +142,12 @@ add(dpoint_type(crd[i], crd[i+1])); } - // io - /*! - ** \todo FIXME: it doesn't seem useful. We may remove it - */ + // This constructor is used by functions of io window2d(const io::internal::anything& r) : super_type() { r.assign(*this); } - /*! - ** \todo FIXME: it doesn't seem useful. We may remove it - */ - window2d& - operator=(const io::internal::anything& r) - { - return r.assign(*this); - } - /// Return the name of the type. static std::string name() Index: olena/oln/core/w_window2d.hh --- olena/oln/core/w_window2d.hh Mon, 29 Mar 2004 09:53:11 +0200 odou_s (oln/c/18_w_window2d 1.6.1.15 640) +++ olena/oln/core/w_window2d.hh Fri, 02 Apr 2004 15:47:40 +0200 van-vl_n (oln/c/18_w_window2d 1.6.1.15 640) @@ -115,6 +115,7 @@ ** \arg arr The array of elements. ** \todo FIXME: this constructor is not in w_window1d.hh nor w_window3d.hh. ** Is it really useful ? + ** This constructor is used to build a chamfer distance. */ template<class I, class T2> w_window2d(const mlc::array2d<I, T2 >& arr) : Index: olena/oln/level/cc.hh --- olena/oln/level/cc.hh Tue, 23 Mar 2004 13:37:46 +0100 van-vl_n (oln/e/20_cc.hh 1.11.1.15 640) +++ olena/oln/level/cc.hh Fri, 02 Apr 2004 11:58:33 +0200 van-vl_n (oln/e/20_cc.hh 1.11.1.15 640) @@ -32,19 +32,12 @@ Connected components. */ -# include <oln/basics.hh> -// FIXME: really need all ? # include <oln/arith/ops.hh> -# include <mlc/optional.hh> -# include <ntg/all.hh> +# include <oln/core/image.hh> # include <oln/level/fill.hh> -# include <oln/level/invert.hh> -# include <oln/level/compare.hh> # include <set> -# include <ntg/core/macros.hh> -# include <mlc/is_a.hh> namespace oln { /*! \brief Level algorithm implementation. Index: olena/oln/morpho/top_hat.inc --- olena/oln/morpho/top_hat.inc Thu, 18 Mar 2004 18:24:14 +0100 van-vl_n (oln/39_top_hat.in 1.16 640) +++ olena/oln/morpho/top_hat.inc Fri, 02 Apr 2004 15:15:20 +0200 van-vl_n (oln/39_top_hat.in 1.16 640) @@ -375,7 +375,6 @@ ** \image html oln_morpho_fast_top_hat_contrast_op_overload.png ** \image latex oln_morpho_fast_top_hat_contrast_op_overload.png ** -** \todo FIXME: Seems not to work with convert::force converter. */ template<class I, class E> oln_concrete_type(I)