https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud &lt;thierry.geraud(a)lrde.epita.fr&gt; Remove the '_' postfix in some core internals. * mln/core/internal/image_base.hh (image_base_): Rename as... (image_base_): ...this. (internal::data_): Rename as... (internal::data): ...this. * mln/core/internal/image_morpher.hh (image_morpher_): Rename as... (image_morpher): ...this. * mln/core/internal/image_primary.hh (image_primary_): Rename as... (image_primary): ...this. * mln/core/internal/image_identity.hh: . (image_identity_): Rename as... (image_identity): ...this. * mln/core/internal/image_domain_morpher.hh: . (image_domain_morpher_): Rename as... (image_domain_morpher): ...this. * mln/core/internal/image_value_morpher.hh (image_value_morpher_): Rename as... (image_value_morpher): ...this. Propagate renaming. * mln/core/translate_image.hh, * mln/core/line_graph_image.hh, * mln/core/internal/image_if_base.hh, * mln/core/internal/run_image.hh, * mln/core/interpolated.hh, * mln/core/bgraph_image.hh, * mln/core/cast_image.hh, * mln/core/graph_image.hh, * mln/core/sub_image.hh, * mln/core/image1d.hh, * mln/core/fi_adaptor.hh, * mln/core/image3d.hh, * mln/core/decorated_image.hh, * mln/core/image_if.hh, * mln/core/value_enc_image.hh, * mln/core/hexa.hh, * mln/core/tr_image.hh, * mln/core/safe.hh, * mln/core/concept/image.hh, * mln/core/plain.hh, * mln/core/image2d.hh, * mln/neighb/image.hh, * mln/value/stack.hh, * mln/border/find.hh, * mln/pw/image.hh, * sandbox/duhamel/translate_image.hh, * sandbox/duhamel/mesh_image.hh, * sandbox/nivault/plugin-gimp/src/gimp-image.hh, * sandbox/garrigues/tiled_image2d/tiled_image2d.hh, * sandbox/garrigues/image_identity/image_domain_morpher.hh, * sandbox/garrigues/image_identity/image_value_morpher.hh, * sandbox/garrigues/image_identity/interpolated.hh, * sandbox/garrigues/image_identity/image_identity.hh, * sandbox/ballas/refactorization/rle_image.hh, * sandbox/ballas/refactorization/image2d.hh, * sandbox/ballas/refactorization/internal/image_base.hh: Update. mln/border/find.hh | 2 mln/core/bgraph_image.hh | 4 - mln/core/cast_image.hh | 2 mln/core/concept/image.hh | 4 - mln/core/decorated_image.hh | 2 mln/core/fi_adaptor.hh | 2 mln/core/graph_image.hh | 4 - mln/core/hexa.hh | 2 mln/core/image1d.hh | 2 mln/core/image2d.hh | 32 +++++------ mln/core/image3d.hh | 4 - mln/core/image_if.hh | 12 ++-- mln/core/internal/image_base.hh | 42 +++++++++------ mln/core/internal/image_domain_morpher.hh | 14 ++--- mln/core/internal/image_identity.hh | 19 +++--- mln/core/internal/image_if_base.hh | 2 mln/core/internal/image_morpher.hh | 4 - mln/core/internal/image_primary.hh | 6 +- mln/core/internal/image_value_morpher.hh | 10 +-- mln/core/internal/run_image.hh | 2 mln/core/interpolated.hh | 4 - mln/core/line_graph_image.hh | 4 - mln/core/plain.hh | 4 - mln/core/safe.hh | 4 - mln/core/sub_image.hh | 12 ++-- mln/core/tr_image.hh | 4 - mln/core/translate_image.hh | 2 mln/core/value_enc_image.hh | 2 mln/neighb/image.hh | 2 mln/pw/image.hh | 12 ++-- mln/value/stack.hh | 2 sandbox/ballas/refactorization/image2d.hh | 2 sandbox/ballas/refactorization/internal/image_base.hh | 8 +- sandbox/ballas/refactorization/rle_image.hh | 2 sandbox/duhamel/mesh_image.hh | 4 - sandbox/duhamel/translate_image.hh | 2 sandbox/garrigues/image_identity/image_domain_morpher.hh | 14 ++--- sandbox/garrigues/image_identity/image_identity.hh | 8 +- sandbox/garrigues/image_identity/image_value_morpher.hh | 10 +-- sandbox/garrigues/image_identity/interpolated.hh | 4 - sandbox/garrigues/tiled_image2d/tiled_image2d.hh | 2 sandbox/nivault/plugin-gimp/src/gimp-image.hh | 2 42 files changed, 147 insertions(+), 134 deletions(-) Index: mln/core/translate_image.hh --- mln/core/translate_image.hh (revision 2057) +++ mln/core/translate_image.hh (working copy) @@ -98,7 +98,7 @@ * */ template <typename I> - struct translate_image : public mln::internal::image_identity_< I, mln_pset(I), translate_image<I> > + struct translate_image : public mln::internal::image_identity< I, mln_pset(I), translate_image<I> > { typedef mln::internal::image_morpher_< I, mln_pset(I), translate_image<I> > super_; Index: mln/core/line_graph_image.hh --- mln/core/line_graph_image.hh (revision 2057) +++ mln/core/line_graph_image.hh (working copy) @@ -108,10 +108,10 @@ /// Values are stored on the vertices of the graph. template <typename P, typename V> struct line_graph_image : - public internal::image_primary_< p_line_graph<P>, line_graph_image<P, V> > + public internal::image_primary< p_line_graph<P>, line_graph_image<P, V> > { /// Super type. - typedef mln::internal::image_base_< p_line_graph<P>, + typedef mln::internal::image_base< p_line_graph<P>, line_graph_image<P, V> > super_; /// Value associated type. Index: mln/core/internal/image_if_base.hh --- mln/core/internal/image_if_base.hh (revision 2057) +++ mln/core/internal/image_if_base.hh (working copy) @@ -99,7 +99,7 @@ * */ template <typename I, typename F, typename E> - struct image_if_base_ : public internal::image_domain_morpher_< I, pset_if<mln_pset(I),F>, E > + struct image_if_base_ : public internal::image_domain_morpher< I, pset_if<mln_pset(I),F>, E > { /// Give the definition domain. Index: mln/core/internal/run_image.hh --- mln/core/internal/run_image.hh (revision 2057) +++ mln/core/internal/run_image.hh (working copy) @@ -49,7 +49,7 @@ * Parameter \c E is the Exact type of the image. */ template <typename T, typename P, typename E> - class run_image_ : public internal::image_primary_< p_runs_<P>, E > + class run_image_ : public internal::image_primary< p_runs_<P>, E > { protected: run_image_(); Index: mln/core/internal/image_base.hh --- mln/core/internal/image_base.hh (revision 2057) +++ mln/core/internal/image_base.hh (working copy) @@ -40,6 +40,18 @@ # include <mln/util/tracked_ptr.hh> +// image_base +// ^ +// | +// --------------------------- +// | | +// image_primary image_morpher +// ^ +// | +// ----------------------------------------- +// | | | +// image_domain_morpher image_value_morpher image_identity + namespace mln { @@ -52,7 +64,7 @@ /// FIXME: Say more about it! template <typename I> - struct data_; + struct data; } // end of namespace mln::internal @@ -94,7 +106,7 @@ * */ template <typename S, typename E> - struct image_base_ + struct image_base : public image_checked_<E> @@ -134,23 +146,23 @@ /// Assignment operator. - image_base_& operator=(const image_base_& rhs); + image_base& operator=(const image_base& rhs); /// Copy constructor. - image_base_(const image_base_& rhs); + image_base(const image_base& rhs); /// Detach data from an image (free it if nobody else hold it). void destroy(); - const util::tracked_ptr< internal::data_<E> >& hook_data_() const { return data_; } + const util::tracked_ptr< internal::data<E> >& hook_data_() const { return data_; } const void* id_() const { return data_.ptr_; } protected: - image_base_(); + image_base(); // Internal data, sharable by several images. - util::tracked_ptr< internal::data_<E> > data_; + util::tracked_ptr< internal::data<E> > data_; }; @@ -159,13 +171,13 @@ template <typename S, typename E> inline - image_base_<S,E>::image_base_() + image_base<S,E>::image_base() { } template <typename S, typename E> inline - image_base_<S,E>::image_base_(const image_base_& rhs) + image_base<S,E>::image_base(const image_base& rhs) : image_checked_<E>() { mln_precondition(exact(rhs).has_data()); // FIXME: Is-it too restrictive? @@ -174,8 +186,8 @@ template <typename S, typename E> inline - image_base_<S,E>& - image_base_<S,E>::operator=(const image_base_<S,E>& rhs) + image_base<S,E>& + image_base<S,E>::operator=(const image_base<S,E>& rhs) { mln_precondition(exact(rhs).has_data()); // FIXME: Is-it too restrictive? if (& rhs == this) // || ! exact(rhs).has_data()) @@ -187,7 +199,7 @@ template <typename S, typename E> inline bool - image_base_<S,E>::has_data() const + image_base<S,E>::has_data() const { return data_ != 0; } @@ -195,7 +207,7 @@ template <typename S, typename E> inline bool - image_base_<S,E>::has(const psite& p) const + image_base<S,E>::has(const psite& p) const { mln_precondition(exact(this)->has_data()); return exact(this)->domain().has(p); @@ -204,7 +216,7 @@ template <typename S, typename E> inline std::size_t - image_base_<S,E>::nsites() const + image_base<S,E>::nsites() const { mlc_equal(mln_trait_site_set_nsites(S), mln::trait::site_set::nsites::known)::check(); @@ -215,7 +227,7 @@ template <typename S, typename E> inline void - image_base_<S,E>::destroy() + image_base<S,E>::destroy() { data_.clean_(); } Index: mln/core/internal/image_morpher.hh --- mln/core/internal/image_morpher.hh (revision 2057) +++ mln/core/internal/image_morpher.hh (working copy) @@ -49,7 +49,7 @@ * */ template <typename I, typename S, typename E> - class image_morpher_ : public image_base_<S, E> + class image_morpher_ : public image_base<S, E> { public: @@ -64,7 +64,7 @@ /* \brief Test if this image has been initialized; default impl. * * This default impl is stronger than the one inherited from - * image_base_. + * image_base. */ bool has_data() const; Index: mln/core/internal/image_primary.hh --- mln/core/internal/image_primary.hh (revision 2057) +++ mln/core/internal/image_primary.hh (working copy) @@ -47,10 +47,10 @@ * */ template <typename S, typename E> - struct image_primary_ : public image_base_<S, E> + struct image_primary : public image_base<S, E> { protected: - image_primary_(); + image_primary(); }; @@ -58,7 +58,7 @@ template <typename S, typename E> inline - image_primary_<S,E>::image_primary_() + image_primary<S,E>::image_primary() { } Index: mln/core/internal/image_identity.hh --- mln/core/internal/image_identity.hh (revision 2057) +++ mln/core/internal/image_identity.hh (working copy) @@ -48,7 +48,7 @@ * */ template <typename I, typename S, typename E> - class image_identity_ : public image_morpher_<I, S, E> + class image_identity : public image_morpher_<I, S, E> { public: @@ -81,7 +81,7 @@ protected: /// Constructor. - image_identity_(); + image_identity(); }; @@ -89,14 +89,14 @@ template <typename I, typename S, typename E> inline - image_identity_<I,S,E>::image_identity_() + image_identity<I,S,E>::image_identity() { } template <typename I, typename S, typename E> inline const mln_vset(I)& - image_identity_<I,S,E>::values() const + image_identity<I,S,E>::values() const { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->values(); @@ -105,7 +105,7 @@ template <typename I, typename S, typename E> inline mln_rvalue(I) - image_identity_<I,S,E>::operator()(const mln_psite(S)& p) const + image_identity<I,S,E>::operator()(const mln_psite(S)& p) const { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->operator()(p); @@ -113,8 +113,8 @@ template <typename I, typename S, typename E> inline - typename image_identity_<I,S,E>::lvalue - image_identity_<I,S,E>::operator()(const mln_psite(S)& p) + typename image_identity<I,S,E>::lvalue + image_identity<I,S,E>::operator()(const mln_psite(S)& p) { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->operator()(p); @@ -123,7 +123,7 @@ template <typename I, typename S, typename E> inline const mln_pset(I)& - image_identity_<I,S,E>::domain() const + image_identity<I,S,E>::domain() const { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->domain(); @@ -132,11 +132,12 @@ template <typename I, typename S, typename E> inline bool - image_identity_<I,S,E>::has(const mln_psite(I)& p) const + image_identity<I,S,E>::has(const mln_psite(I)& p) const { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->has(p); } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::internal Index: mln/core/internal/image_domain_morpher.hh --- mln/core/internal/image_domain_morpher.hh (revision 2057) +++ mln/core/internal/image_domain_morpher.hh (working copy) @@ -48,7 +48,7 @@ * */ template <typename I, typename S, typename E> - class image_domain_morpher_ : public image_morpher_<I, S, E> + class image_domain_morpher : public image_morpher_<I, S, E> { public: @@ -75,7 +75,7 @@ lvalue operator()(const mln_psite(S)& p); protected: - image_domain_morpher_(); + image_domain_morpher(); }; @@ -83,14 +83,14 @@ template <typename I, typename S, typename E> inline - image_domain_morpher_<I,S,E>::image_domain_morpher_() + image_domain_morpher<I,S,E>::image_domain_morpher() { } template <typename I, typename S, typename E> inline const mln_vset(I)& - image_domain_morpher_<I,S,E>::values() const + image_domain_morpher<I,S,E>::values() const { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->values(); @@ -99,7 +99,7 @@ template <typename I, typename S, typename E> inline mln_rvalue(I) - image_domain_morpher_<I,S,E>::operator()(const mln_psite(S)& p) const + image_domain_morpher<I,S,E>::operator()(const mln_psite(S)& p) const { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->operator()(p); @@ -107,8 +107,8 @@ template <typename I, typename S, typename E> inline - typename image_domain_morpher_<I,S,E>::lvalue - image_domain_morpher_<I,S,E>::operator()(const mln_psite(S)& p) + typename image_domain_morpher<I,S,E>::lvalue + image_domain_morpher<I,S,E>::operator()(const mln_psite(S)& p) { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->operator()(p); Index: mln/core/internal/image_value_morpher.hh --- mln/core/internal/image_value_morpher.hh (revision 2057) +++ mln/core/internal/image_value_morpher.hh (working copy) @@ -51,7 +51,7 @@ * */ template <typename I, typename E> - class image_value_morpher_ : public image_morpher_<I, mln_pset(I), E> + class image_value_morpher : public image_morpher_<I, mln_pset(I), E> { public: @@ -59,7 +59,7 @@ bool has(const mln_psite(I)& p) const; protected: - image_value_morpher_(); + image_value_morpher(); }; @@ -67,14 +67,14 @@ template <typename I, typename E> inline - image_value_morpher_<I,E>::image_value_morpher_() + image_value_morpher<I,E>::image_value_morpher() { } template <typename I, typename E> inline const mln_pset(I)& - image_value_morpher_<I,E>::domain() const + image_value_morpher<I,E>::domain() const { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->domain(); @@ -83,7 +83,7 @@ template <typename I, typename E> inline bool - image_value_morpher_<I,E>::has(const mln_psite(I)& p) const + image_value_morpher<I,E>::has(const mln_psite(I)& p) const { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->has(p); Index: mln/core/interpolated.hh --- mln/core/interpolated.hh (revision 2057) +++ mln/core/interpolated.hh (working copy) @@ -64,10 +64,10 @@ * */ template <typename I> - struct interpolated : public mln::internal::image_identity_< I, mln_pset(I), interpolated<I> > + struct interpolated : public mln::internal::image_identity< I, mln_pset(I), interpolated<I> > { - typedef mln::internal::image_identity_< I, mln_pset(I), interpolated<I> > super_; + typedef mln::internal::image_identity< I, mln_pset(I), interpolated<I> > super_; /// Point_Site associated type. typedef mln_psite(I) psite; Index: mln/core/bgraph_image.hh --- mln/core/bgraph_image.hh (revision 2057) +++ mln/core/bgraph_image.hh (working copy) @@ -94,10 +94,10 @@ */ template <typename P, typename V> struct bgraph_image : - public internal::image_primary_< p_bgraph<P>, bgraph_image<P, V> > + public internal::image_primary< p_bgraph<P>, bgraph_image<P, V> > { - typedef mln::internal::image_base_< p_bgraph<P>, bgraph_image<P, V> > + typedef mln::internal::image_base< p_bgraph<P>, bgraph_image<P, V> > super_; /// Value associated type. Index: mln/core/cast_image.hh --- mln/core/cast_image.hh (revision 2057) +++ mln/core/cast_image.hh (working copy) @@ -80,7 +80,7 @@ * */ template <typename T, typename I> - struct cast_image_ : public internal::image_value_morpher_< I, cast_image_<T,I> > + struct cast_image_ : public internal::image_value_morpher< I, cast_image_<T,I> > { /// Value associated type. typedef T value; Index: mln/core/graph_image.hh --- mln/core/graph_image.hh (revision 2057) +++ mln/core/graph_image.hh (working copy) @@ -91,10 +91,10 @@ /// Values are stored on the edges of the graph, not on its vertices. template <typename P, typename V> struct graph_image : - public internal::image_primary_< p_graph<P>, graph_image<P, V> > + public internal::image_primary< p_graph<P>, graph_image<P, V> > { /// Super type. - typedef mln::internal::image_base_< p_graph<P>, graph_image<P, V> > super_; + typedef mln::internal::image_base< p_graph<P>, graph_image<P, V> > super_; /// Value associated type. typedef V value; Index: mln/core/sub_image.hh --- mln/core/sub_image.hh (revision 2057) +++ mln/core/sub_image.hh (working copy) @@ -51,9 +51,9 @@ /// \internal Data structure for \c mln::sub_image<I,S>. template <typename I, typename S> - struct data_< sub_image<I,S> > + struct data< sub_image<I,S> > { - data_(I& ima, const S& pset); + data(I& ima, const S& pset); I ima_; S pset_; @@ -93,7 +93,7 @@ // FIXME: Doc! template <typename I, typename S> - struct sub_image : public internal::image_domain_morpher_< I, + struct sub_image : public internal::image_domain_morpher< I, S, sub_image<I,S> > { @@ -150,14 +150,14 @@ } - // internal::data_< sub_image<I,S> > + // internal::data< sub_image<I,S> > namespace internal { template <typename I, typename S> inline - data_< sub_image<I,S> >::data_(I& ima, const S& pset) + data< sub_image<I,S> >::data(I& ima, const S& pset) : ima_(ima), pset_(pset) { @@ -187,7 +187,7 @@ sub_image<I,S>::init_(I& ima, const S& pset) { mln_precondition(! this->has_data()); - this->data_ = new internal::data_< sub_image<I,S> >(ima, pset); + this->data_ = new internal::data< sub_image<I,S> >(ima, pset); } template <typename I, typename S> Index: mln/core/image1d.hh --- mln/core/image1d.hh (revision 2057) +++ mln/core/image1d.hh (working copy) @@ -112,7 +112,7 @@ * thickness before and after data. */ template <typename T> - struct image1d : public internal::image_primary_< box1d, image1d<T> > + struct image1d : public internal::image_primary< box1d, image1d<T> > { // Warning: just to make effective types appear in Doxygen: typedef box1d pset; Index: mln/core/fi_adaptor.hh --- mln/core/fi_adaptor.hh (revision 2057) +++ mln/core/fi_adaptor.hh (working copy) @@ -127,7 +127,7 @@ */ template <typename I> - struct fi_adaptor : public internal::image_primary_< box2d, fi_adaptor<I> > + struct fi_adaptor : public internal::image_primary< box2d, fi_adaptor<I> > { // Warning: just to make effective types appear in Doxygen: typedef box2d pset; Index: mln/core/image3d.hh --- mln/core/image3d.hh (revision 2057) +++ mln/core/image3d.hh (working copy) @@ -113,7 +113,7 @@ * thickness around data. */ template <typename T> - struct image3d : public internal::image_primary_< box3d, image3d<T> > + struct image3d : public internal::image_primary< box3d, image3d<T> > { // Warning: just to make effective types appear in Doxygen: typedef box3d pset; @@ -127,7 +127,7 @@ /// Super type - typedef internal::image_primary_< box3d, image3d<T> > super_; + typedef internal::image_primary< box3d, image3d<T> > super_; /// Value associated type. typedef T value; Index: mln/core/decorated_image.hh --- mln/core/decorated_image.hh (revision 2057) +++ mln/core/decorated_image.hh (working copy) @@ -83,7 +83,7 @@ template <typename I, typename D> struct decorated_image : public internal::decorated_image_impl_< I, decorated_image<I,D> >, - public internal::image_identity_< I, mln_pset(I), decorated_image<I,D> > + public internal::image_identity< I, mln_pset(I), decorated_image<I,D> > { public: typedef decorated_image<I, D> self_; Index: mln/core/image_if.hh --- mln/core/image_if.hh (revision 2057) +++ mln/core/image_if.hh (working copy) @@ -53,9 +53,9 @@ /// \internal Data structure for \c mln::image_if<I,F>. template <typename I, typename F> - struct data_< image_if<I,F> > + struct data< image_if<I,F> > { - data_(I& ima, const F& f); + data(I& ima, const F& f); I ima_; pset_if<mln_pset(I), F> pset_; @@ -89,7 +89,7 @@ * */ template <typename I, typename F> - struct image_if : public internal::image_domain_morpher_< I, + struct image_if : public internal::image_domain_morpher< I, pset_if<mln_pset(I), F>, image_if<I, F> > { @@ -151,14 +151,14 @@ # ifndef MLN_INCLUDE_ONLY - // internal::data_< image_if<I,F> > + // internal::data< image_if<I,F> > namespace internal { template <typename I, typename F> inline - data_< image_if<I,F> >::data_(I& ima, const F& f) + data< image_if<I,F> >::data(I& ima, const F& f) : ima_(ima), pset_(ima.domain() | f) { @@ -188,7 +188,7 @@ image_if<I,F>::init_(I& ima, const F& f) { mln_precondition(! this->has_data()); - this->data_ = new internal::data_< image_if<I,F> >(ima, f); + this->data_ = new internal::data< image_if<I,F> >(ima, f); } template <typename I, typename F> Index: mln/core/value_enc_image.hh --- mln/core/value_enc_image.hh (revision 2057) +++ mln/core/value_enc_image.hh (working copy) @@ -99,7 +99,7 @@ */ template <typename P, typename T> class value_enc_image : - public internal::image_primary_< pset_array< p_runs_<P> >, + public internal::image_primary< pset_array< p_runs_<P> >, value_enc_image<P, T> > { public: Index: mln/core/hexa.hh --- mln/core/hexa.hh (revision 2057) +++ mln/core/hexa.hh (working copy) @@ -116,7 +116,7 @@ * */ template <typename I> - struct hexa : public internal::image_domain_morpher_< I, box2d_h, hexa<I> > + struct hexa : public internal::image_domain_morpher< I, box2d_h, hexa<I> > { /// Skeleton. typedef hexa< tag::image_<I> > skeleton; Index: mln/core/tr_image.hh --- mln/core/tr_image.hh (revision 2057) +++ mln/core/tr_image.hh (working copy) @@ -69,12 +69,12 @@ */ template <typename T, typename I> struct tr_image : - public mln::internal::image_identity_< I, mln_pset(I), tr_image<T,I> > + public mln::internal::image_identity< I, mln_pset(I), tr_image<T,I> > { /// Super type. typedef - mln::internal::image_identity_< I, mln_pset(I), tr_image<T,I> > super_; + mln::internal::image_identity< I, mln_pset(I), tr_image<T,I> > super_; /// Point_Site associated type. typedef mln_psite(I) psite; Index: mln/core/safe.hh --- mln/core/safe.hh (revision 2057) +++ mln/core/safe.hh (working copy) @@ -66,9 +66,9 @@ // FIXME: Doc! template <typename I> - class safe_image : public internal::image_identity_< I, mln_pset(I), safe_image<I> > + class safe_image : public internal::image_identity< I, mln_pset(I), safe_image<I> > { - typedef internal::image_identity_< I, mln_pset(I), safe_image<I> > super_; + typedef internal::image_identity< I, mln_pset(I), safe_image<I> > super_; public: /// Skeleton. Index: mln/core/concept/image.hh --- mln/core/concept/image.hh (revision 2057) +++ mln/core/concept/image.hh (working copy) @@ -73,7 +73,7 @@ typedef Image<void> category; /* - // provided by internal::image_base_: + // provided by internal::image_base: typedef pset; typedef site; @@ -115,7 +115,7 @@ inline Image<E>::Image() { - // provided by internal::image_base_: + // provided by internal::image_base: typedef mln_pset(E) pset; typedef mln_site(E) site; Index: mln/core/plain.hh --- mln/core/plain.hh (revision 2057) +++ mln/core/plain.hh (working copy) @@ -66,10 +66,10 @@ * */ template <typename I> - struct plain : public mln::internal::image_identity_< I, mln_pset(I), plain<I> > + struct plain : public mln::internal::image_identity< I, mln_pset(I), plain<I> > { - typedef mln::internal::image_identity_< I, mln_pset(I), plain<I> > super_; + typedef mln::internal::image_identity< I, mln_pset(I), plain<I> > super_; /// Point_Site associated type. typedef mln_psite(I) psite; Index: mln/core/image2d.hh --- mln/core/image2d.hh (revision 2057) +++ mln/core/image2d.hh (working copy) @@ -60,10 +60,10 @@ /// \internal Data structure for \c mln::image2d<T>. template <typename T> - struct data_< image2d<T> > + struct data< image2d<T> > { - data_(const box2d& b, unsigned bdr); - ~data_(); + data(const box2d& b, unsigned bdr); + ~data(); T* buffer_; T** array_; @@ -75,7 +75,7 @@ void update_vb_(); void allocate_(); void deallocate_(); - void swap_(data_< image2d<T> >& other_); + void swap_(data< image2d<T> >& other_); void reallocate_(unsigned new_border); }; @@ -120,7 +120,7 @@ * thickness around data. */ template <typename T> - struct image2d : public internal::image_primary_< box2d, image2d<T> > + struct image2d : public internal::image_primary< box2d, image2d<T> > { /// Value associated type. typedef T value; @@ -247,13 +247,13 @@ } - // internal::data_< image2d<T> > + // internal::data< image2d<T> > namespace internal { template <typename T> inline - data_< image2d<T> >::data_(const box2d& b, unsigned bdr) + data< image2d<T> >::data(const box2d& b, unsigned bdr) : buffer_(0), array_ (0), b_ (b), @@ -264,7 +264,7 @@ template <typename T> inline - data_< image2d<T> >::~data_() + data< image2d<T> >::~data() { deallocate_(); } @@ -272,7 +272,7 @@ template <typename T> inline void - data_< image2d<T> >::update_vb_() + data< image2d<T> >::update_vb_() { vb_.pmin() = b_.pmin() - dpoint2d(all_to(bdr_)); vb_.pmax() = b_.pmax() + dpoint2d(all_to(bdr_)); @@ -281,7 +281,7 @@ template <typename T> inline void - data_< image2d<T> >::allocate_() + data< image2d<T> >::allocate_() { update_vb_(); unsigned @@ -303,7 +303,7 @@ template <typename T> inline void - data_< image2d<T> >::deallocate_() + data< image2d<T> >::deallocate_() { if (buffer_) { @@ -321,9 +321,9 @@ template <typename T> inline void - data_< image2d<T> >::swap_(data_< image2d<T> >& other_) + data< image2d<T> >::swap_(data< image2d<T> >& other_) { - data_< image2d<T> > self_ = *this; + data< image2d<T> > self_ = *this; *this = other_; other_ = self_; } @@ -331,9 +331,9 @@ template <typename T> inline void - data_< image2d<T> >::reallocate_(unsigned new_border) + data< image2d<T> >::reallocate_(unsigned new_border) { - data_< image2d<T> >& tmp = *(new data_< image2d<T> >(this->b_, new_border)); + data< image2d<T> >& tmp = *(new data< image2d<T> >(this->b_, new_border)); this->swap_(tmp); } @@ -369,7 +369,7 @@ image2d<T>::init_(const box2d& b, unsigned bdr) { mln_precondition(! this->has_data()); - this->data_ = new internal::data_< image2d<T> >(b, bdr); + this->data_ = new internal::data< image2d<T> >(b, bdr); } template <typename T> Index: mln/neighb/image.hh --- mln/neighb/image.hh (revision 2057) +++ mln/neighb/image.hh (working copy) @@ -93,7 +93,7 @@ /// \pre The domains of \c I and \c N must be compatible. template <typename I, typename N> struct image - : public internal::image_identity_ < I, mln_pset(I), image <I, N> > + : public internal::image_identity < I, mln_pset(I), image <I, N> > { /// Point_Site associated type. typedef mln_psite(I) psite; Index: mln/value/stack.hh --- mln/value/stack.hh (revision 2057) +++ mln/value/stack.hh (working copy) @@ -146,7 +146,7 @@ */ template <unsigned n, typename I> struct stack_image - : public mln::internal::image_value_morpher_< I, stack_image<n,I> > + : public mln::internal::image_value_morpher< I, stack_image<n,I> > { /// Point_Site associated type. typedef mln_psite(I) psite; Index: mln/border/find.hh --- mln/border/find.hh (revision 2057) +++ mln/border/find.hh (working copy) @@ -68,7 +68,7 @@ template <typename S, typename E> inline - unsigned find__(const mln::internal::image_base_<S,E>&) + unsigned find__(const mln::internal::image_base<S,E>&) { return 0; } Index: mln/pw/image.hh --- mln/pw/image.hh (revision 2057) +++ mln/pw/image.hh (working copy) @@ -63,9 +63,9 @@ /// \internal Data structure for mln::pw::image template <typename F, typename S> - struct data_< mln::pw::image<F,S> > + struct data< mln::pw::image<F,S> > { - data_(const F& f, const S& ps); + data(const F& f, const S& ps); F f_; S pset_; }; @@ -114,7 +114,7 @@ * */ template <typename F, typename S> - struct image : public internal::image_primary_< S, image<F,S> > + struct image : public internal::image_primary< S, image<F,S> > { /// Skeleton. typedef image< tag::function_<F>, tag::pset_<S> > skeleton; @@ -171,14 +171,14 @@ return tmp; } - // internal::data_< pw::image<F,S> > + // internal::data< pw::image<F,S> > namespace internal { /// \internal template <typename F, typename S> inline - data_< pw::image<F,S> >::data_(const F& f, const S& ps) + data< pw::image<F,S> >::data(const F& f, const S& ps) : f_(f), pset_(ps) { @@ -201,7 +201,7 @@ inline image<F,S>::image(const Function_p2v<F>& f, const Site_Set<S>& ps) { - this->data_ = new internal::data_< pw::image<F,S> >(exact(f), exact(ps)); + this->data_ = new internal::data< pw::image<F,S> >(exact(f), exact(ps)); } template <typename F, typename S> Index: sandbox/duhamel/translate_image.hh --- sandbox/duhamel/translate_image.hh (revision 2057) +++ sandbox/duhamel/translate_image.hh (working copy) @@ -86,7 +86,7 @@ * */ template <typename I> - struct translate_image : public mln::internal::image_identity_< I, mln_pset(I), translate_image<I> > + struct translate_image : public mln::internal::image_identity< I, mln_pset(I), translate_image<I> > { typedef mln::internal::image_morpher_< I, mln_pset(I), translate_image<I> > super_; Index: sandbox/duhamel/mesh_image.hh --- sandbox/duhamel/mesh_image.hh (revision 2057) +++ sandbox/duhamel/mesh_image.hh (working copy) @@ -67,10 +67,10 @@ * */ template <typename P, typename V> - struct mesh_image : public internal::image_primary_< mesh_p<P>, mesh_image<P, V> > + struct mesh_image : public internal::image_primary< mesh_p<P>, mesh_image<P, V> > { - typedef mln::internal::image_base_< mesh_p<P>, mesh_image<P, V> > super_; + typedef mln::internal::image_base< mesh_p<P>, mesh_image<P, V> > super_; /// Value associated type. typedef V value; Index: sandbox/nivault/plugin-gimp/src/gimp-image.hh --- sandbox/nivault/plugin-gimp/src/gimp-image.hh (revision 2057) +++ sandbox/nivault/plugin-gimp/src/gimp-image.hh (working copy) @@ -131,7 +131,7 @@ * */ template <GimpImageType t> - struct gimp_image : public internal::image_primary_< box2d, gimp_image<t> > + struct gimp_image : public internal::image_primary< box2d, gimp_image<t> > { // Warning: just to make effective types appear in Doxygen: typedef box2d pset; Index: sandbox/garrigues/tiled_image2d/tiled_image2d.hh --- sandbox/garrigues/tiled_image2d/tiled_image2d.hh (revision 2057) +++ sandbox/garrigues/tiled_image2d/tiled_image2d.hh (working copy) @@ -122,7 +122,7 @@ * FIXME */ template <typename T> - struct tiled_image2d : public internal::image_primary_< box2d, tiled_image2d<T> > + struct tiled_image2d : public internal::image_primary< box2d, tiled_image2d<T> > { // Warning: just to make effective types appear in Doxygen: typedef box2d pset; Index: sandbox/garrigues/image_identity/image_domain_morpher.hh --- sandbox/garrigues/image_identity/image_domain_morpher.hh (revision 2057) +++ sandbox/garrigues/image_identity/image_domain_morpher.hh (working copy) @@ -50,7 +50,7 @@ * \internal */ template <typename I, typename S, typename E> - class image_domain_morpher_ : public virtual image_morpher_<I, S, E> + class image_domain_morpher : public virtual image_morpher_<I, S, E> { public: @@ -77,20 +77,20 @@ lvalue operator()(const mln_psite(S)& p); protected: - image_domain_morpher_(); + image_domain_morpher(); }; # ifndef MLN_INCLUDE_ONLY template <typename I, typename S, typename E> - image_domain_morpher_<I,S,E>::image_domain_morpher_() + image_domain_morpher<I,S,E>::image_domain_morpher() { } template <typename I, typename S, typename E> const mln_vset(I)& - image_domain_morpher_<I,S,E>::values() const + image_domain_morpher<I,S,E>::values() const { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->values(); @@ -98,15 +98,15 @@ template <typename I, typename S, typename E> mln_rvalue(I) - image_domain_morpher_<I,S,E>::operator()(const mln_psite(S)& p) const + image_domain_morpher<I,S,E>::operator()(const mln_psite(S)& p) const { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->operator()(p); } template <typename I, typename S, typename E> - typename image_domain_morpher_<I,S,E>::lvalue - image_domain_morpher_<I,S,E>::operator()(const mln_psite(S)& p) + typename image_domain_morpher<I,S,E>::lvalue + image_domain_morpher<I,S,E>::operator()(const mln_psite(S)& p) { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->operator()(p); Index: sandbox/garrigues/image_identity/image_value_morpher.hh --- sandbox/garrigues/image_identity/image_value_morpher.hh (revision 2057) +++ sandbox/garrigues/image_identity/image_value_morpher.hh (working copy) @@ -50,7 +50,7 @@ * \internal */ template <typename I, typename E> - class image_value_morpher_ : public virtual image_morpher_<I, mln_pset(I), E> + class image_value_morpher : public virtual image_morpher_<I, mln_pset(I), E> { public: @@ -58,20 +58,20 @@ bool has(const mln_psite(I)& p) const; protected: - image_value_morpher_(); + image_value_morpher(); }; # ifndef MLN_INCLUDE_ONLY template <typename I, typename E> - image_value_morpher_<I,E>::image_value_morpher_() + image_value_morpher<I,E>::image_value_morpher() { } template <typename I, typename E> const mln_pset(I)& - image_value_morpher_<I,E>::domain() const + image_value_morpher<I,E>::domain() const { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->domain(); @@ -79,7 +79,7 @@ template <typename I, typename E> bool - image_value_morpher_<I,E>::has(const mln_psite(I)& p) const + image_value_morpher<I,E>::has(const mln_psite(I)& p) const { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->has(p); Index: sandbox/garrigues/image_identity/interpolated.hh --- sandbox/garrigues/image_identity/interpolated.hh (revision 2057) +++ sandbox/garrigues/image_identity/interpolated.hh (working copy) @@ -62,10 +62,10 @@ * */ template <typename I> - struct interpolated : public mln::internal::image_identity_< I, mln_pset(I), interpolated<I> > + struct interpolated : public mln::internal::image_identity< I, mln_pset(I), interpolated<I> > { - typedef mln::internal::image_identity_< I, mln_pset(I), interpolated<I> > super_; + typedef mln::internal::image_identity< I, mln_pset(I), interpolated<I> > super_; /// Point_Site associated type. typedef mln_psite(I) psite; Index: sandbox/garrigues/image_identity/image_identity.hh --- sandbox/garrigues/image_identity/image_identity.hh (revision 2057) +++ sandbox/garrigues/image_identity/image_identity.hh (working copy) @@ -50,20 +50,20 @@ * \internal */ template <typename I, typename S, typename E> - class image_identity_ : public image_domain_morpher_<I, S, E>, - public image_value_morpher_<I, E> + class image_identity : public image_domain_morpher<I, S, E>, + public image_value_morpher<I, E> { public: protected: - image_identity_(); + image_identity(); }; # ifndef MLN_INCLUDE_ONLY template <typename I, typename S, typename E> - image_identity_<I,S,E>::image_identity_() + image_identity<I,S,E>::image_identity() { } Index: sandbox/ballas/refactorization/rle_image.hh --- sandbox/ballas/refactorization/rle_image.hh (revision 2057) +++ sandbox/ballas/refactorization/rle_image.hh (working copy) @@ -11,7 +11,7 @@ // note P must be a point template <typename P, typename T> class rle_image : - public internal::image_base_<rle_pset<P>, rle_image<P, T> > + public internal::image_base<rle_pset<P>, rle_image<P, T> > { public: Index: sandbox/ballas/refactorization/image2d.hh --- sandbox/ballas/refactorization/image2d.hh (revision 2057) +++ sandbox/ballas/refactorization/image2d.hh (working copy) @@ -9,7 +9,7 @@ { template <typename T> - class image2d : public internal::image_base_< box2d<int>, image2d<T> > + class image2d : public internal::image_base< box2d<int>, image2d<T> > { public: Index: sandbox/ballas/refactorization/internal/image_base.hh --- sandbox/ballas/refactorization/internal/image_base.hh (revision 2057) +++ sandbox/ballas/refactorization/internal/image_base.hh (working copy) @@ -10,7 +10,7 @@ /// Image base /// S is the point set type template <typename S, typename E> - struct image_base_ : public Image<E> + struct image_base : public Image<E> { typedef S pset; typedef typename S::psite psite; @@ -22,7 +22,7 @@ bool has(const psite& ps) const; protected: - image_base_(); + image_base(); }; ///FIXME: is_ready @@ -30,13 +30,13 @@ # ifndef MLN_INCLUDE_ONLY template <typename S, typename E> - image_base_<S, E>::image_base_() + image_base<S, E>::image_base() { } template <typename S, typename E> bool - image_base_<S, E>::has(const psite& ps) const + image_base<S, E>::has(const psite& ps) const { return exact(this)->has(ps); }