URL:
https://svn.lrde.epita.fr/svn/oln/trunk/milena
ChangeLog:
2007-09-28 Matthieu Garrigues <garrigues(a)lrde.epita.fr>
Put init_ outside of namespace impl.
* mln/core/image1d_b.hh,
* mln/core/image3d_b.hh,
* mln/core/image_if.hh,
* mln/core/sub_image.hh,
* sandbox/garrigues/TODO: Update.
---
mln/core/image1d_b.hh | 17 +----------------
mln/core/image3d_b.hh | 13 +------------
mln/core/image_if.hh | 8 +-------
mln/core/sub_image.hh | 2 +-
sandbox/garrigues/TODO | 19 +++++++++++++++++++
5 files changed, 23 insertions(+), 36 deletions(-)
Index: trunk/milena/mln/core/image_if.hh
===================================================================
--- trunk/milena/mln/core/image_if.hh (revision 1188)
+++ trunk/milena/mln/core/image_if.hh (revision 1189)
@@ -124,10 +124,7 @@
# ifndef MLN_INCLUDE_ONLY
- // impl::init_
-
- namespace impl
- {
+ // init_
template <typename I, typename F>
void init_(tag::function_t, F& f, const image_if<I,F>& model)
@@ -149,9 +146,6 @@
// target.init_(ima, pset);
}
- } // end of namespace mln::impl
-
-
// internal::data_< image_if<I,S> >
namespace internal
Index: trunk/milena/mln/core/sub_image.hh
===================================================================
--- trunk/milena/mln/core/sub_image.hh (revision 1188)
+++ trunk/milena/mln/core/sub_image.hh (revision 1189)
@@ -98,7 +98,7 @@
# ifndef MLN_INCLUDE_ONLY
- // impl::init_
+ // init_
template <typename I, typename S, typename J>
void init_(tag::image_t, sub_image<I,S>& target, const J& model)
Index: trunk/milena/mln/core/image1d_b.hh
===================================================================
--- trunk/milena/mln/core/image1d_b.hh (revision 1188)
+++ trunk/milena/mln/core/image1d_b.hh (revision 1189)
@@ -196,24 +196,12 @@
T* buffer();
};
-
- namespace impl
- {
-
template <typename T, typename J>
void init_(tag::image_t, mln::image1d_b<T>& target, const J& model);
- } // end of namespace mln::impl
-
-
-
# ifndef MLN_INCLUDE_ONLY
- // impl::init_
-
- namespace impl
- {
-
+ // init_
template <typename T>
void init_(tag::border_t, unsigned& b, const image1d_b<T>& model)
{
@@ -230,9 +218,6 @@
target.init_(b, bdr);
}
- } // end of namespace mln::impl
-
-
// internal::data_< image1d_b<T> >
namespace internal
Index: trunk/milena/mln/core/image3d_b.hh
===================================================================
--- trunk/milena/mln/core/image3d_b.hh (revision 1188)
+++ trunk/milena/mln/core/image3d_b.hh (revision 1189)
@@ -202,23 +202,14 @@
using super_::data_;
};
-
- namespace impl
- {
-
template <typename T, typename J>
void init_(tag::image_t, mln::image3d_b<T>& target, const J& model);
- } // end of namespace mln::impl
-
# ifndef MLN_INCLUDE_ONLY
- // impl::init_
-
- namespace impl
- {
+ // init_
template <typename T>
void init_(tag::border_t, unsigned& b, const image3d_b<T>& model)
@@ -236,8 +227,6 @@
target.init_(b, bdr);
}
- } // end of namespace mln::impl
-
// internal::data_< image3d_b<T> >
Index: trunk/milena/sandbox/garrigues/TODO
===================================================================
--- trunk/milena/sandbox/garrigues/TODO (revision 1188)
+++ trunk/milena/sandbox/garrigues/TODO (revision 1189)
@@ -22,3 +22,22 @@
C R make/window1d.hh
C R make/w_window1d.hh
C R make/w_window1d_int.hh
+
+no init ./mln/core/cast_image.hh: typedef cast_image_< tag::value_<T>,
tag::image_<I> > skeleton;
+no init ./mln/core/decorated_image.hh: typedef decorated_image<
tag::image_<I>, tag::data_<D> > skeleton;
+done ./mln/core/image1d_b.hh: typedef image1d_b< tag::value_<T> >
skeleton;
+done ./mln/core/image2d_b.hh: typedef image2d_b< tag::value_<T> >
skeleton;
+done ./mln/core/image3d_b.hh: typedef image3d_b< tag::value_<T> >
skeleton;
+done ./mln/core/image_if.hh: typedef image_if< tag::image_<I>,
tag::function_<F> > skeleton;
+no init ./mln/core/interpolated.hh: typedef interpolated< tag::image_<I> >
skeleton;
+no init ./mln/core/plain.hh: typedef plain< tag::image_<I> > skeleton;
+no init ./mln/core/rle_image.hh: typedef rle_image< tag::psite_<P>,
tag::value_<T> > skeleton;
+no init ./mln/core/safe.hh: typedef safe_image< tag::image_<I> >
skeleton;
+no init ./mln/core/sparse_image.hh: typedef sparse_image< tag::psite_<P>,
tag::value_<T> > skeleton;
+done ./mln/core/sub_image.hh: typedef sub_image< tag::image_<I>,
tag::pset_<S> > skeleton;
+no init ./mln/core/t_image.hh: typedef t_image< tag::image_<I> >
skeleton;
+no init ./mln/core/tr_image.hh: typedef tr_image< T, tag::image_<I> >
skeleton;
+no init ./mln/pw/image.hh: typedef image< tag::function_<F>,
tag::pset_<S> > skeleton;
+./mln/trait/ch_value.hh: typedef typename I::skeleton skeleton;
+./mln/trait/ch_value.hh: typedef typename impl::ch_value_<skeleton, V>::ret
ret;
+no init ./mln/value/stack.hh: typedef stack_image< n, tag::image_<I> >
skeleton;