cleanup-2008 2200 Rename data_ as data.
8 Sep
2008
8 Sep
'08
6:17 p.m.
From: Matthieu Garrigues <garrigues@lrde.epita.fr>
To: olena-patches@lrde.epita.fr
Subject: milena r2200: Rename data_ as data
URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena
ChangeLog:
2008-09-08 Matthieu Garrigues <garrigues@lrde.epita.fr>
Rename data_ as data.
* mln/core/image/bgraph_image.hh: .
* mln/core/image/cast_image.hh: .
* mln/core/image/complex_image.hh: .
* mln/core/image/decorated_image.hh: .
* mln/core/image/fi_adaptor.hh: .
* mln/core/image/graph_image.hh: .
* mln/core/image/hexa.hh: .
* mln/core/image/image1d.hh: .
* mln/core/image/image3d.hh: .
* mln/core/image/interpolated.hh: .
* mln/core/image/lazy_image.hh: .
* mln/core/image/line_graph_image.hh: .
* mln/core/image/mono_obased_rle_image.hh: .
* mln/core/image/mono_rle_image.hh: .
* mln/core/image/rle_image.hh: .
* mln/core/image/t_image.hh: .
* mln/core/image/tr_image.hh: .
* mln/core/image/translate_image.hh: .
* mln/core/image/value_enc_image.hh: .
* mln/core/internal/image_if_base.hh: .
* mln/neighb/image.hh: .
* mln/value/stack.hh: .
---
core/image/bgraph_image.hh | 8 ++++----
core/image/cast_image.hh | 12 ++++++------
core/image/complex_image.hh | 8 ++++----
core/image/decorated_image.hh | 10 +++++-----
core/image/fi_adaptor.hh | 24 ++++++++++++------------
core/image/graph_image.hh | 8 ++++----
core/image/hexa.hh | 10 +++++-----
core/image/image1d.hh | 30 +++++++++++++++---------------
core/image/image3d.hh | 30 +++++++++++++++---------------
core/image/interpolated.hh | 10 +++++-----
core/image/lazy_image.hh | 10 +++++-----
core/image/line_graph_image.hh | 8 ++++----
core/image/mono_obased_rle_image.hh | 14 +++++++-------
core/image/mono_rle_image.hh | 14 +++++++-------
core/image/rle_image.hh | 16 ++++++++--------
core/image/t_image.hh | 10 +++++-----
core/image/tr_image.hh | 10 +++++-----
core/image/translate_image.hh | 10 +++++-----
core/image/value_enc_image.hh | 12 ++++++------
core/internal/image_if_base.hh | 10 +++++-----
neighb/image.hh | 10 +++++-----
value/stack.hh | 10 +++++-----
22 files changed, 142 insertions(+), 142 deletions(-)
Index: branches/cleanup-2008/milena/mln/core/image/lazy_image.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/lazy_image.hh (revision
2199)
+++ branches/cleanup-2008/milena/mln/core/image/lazy_image.hh (revision
2200)
@@ -51,9 +51,9 @@
/// \internal Data structure for \c mln::lazy_image<I>.
template <typename I, typename F, typename B>
- struct data_< lazy_image<I,F,B> >
+ struct data< lazy_image<I,F,B> >
{
- data_(const F& fun_, const B& box);
+ data(const F& fun_, const B& box);
mutable mln_ch_value(I,mln_result(F)) ima_;
mutable mln_ch_value(I,bool) is_known;
@@ -144,11 +144,11 @@
namespace internal
{
- // internal::data_< lazy_image<I,S> >
+ // internal::data< lazy_image<I,S> >
template <typename I, typename F, typename B>
inline
- data_< lazy_image<I,F,B> >::data_(const F& fun, const B& box)
+ data< lazy_image<I,F,B> >::data(const F& fun, const B& box)
: ima_(box), is_known(box), fun(fun), bb_(box)
{
}
@@ -159,7 +159,7 @@
inline
lazy_image<I,F,B>::lazy_image(const F& fun, const B& box)
{
- this->data_ = new internal::data_< lazy_image<I,F,B> >(fun, box);
+ this->data_ = new internal::data< lazy_image<I,F,B> >(fun, box);
}
template <typename I, typename F, typename B>
Index: branches/cleanup-2008/milena/mln/core/image/cast_image.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/cast_image.hh (revision
2199)
+++ branches/cleanup-2008/milena/mln/core/image/cast_image.hh (revision
2200)
@@ -52,9 +52,9 @@
{
/// \internal Data structure for \c mln::cast_image_<T,I>.
template <typename T, typename I>
- struct data_< cast_image_<T,I> >
+ struct data< cast_image_<T,I> >
{
- data_(const I& ima);
+ data(const I& ima);
const I& ima_;
};
@@ -68,7 +68,7 @@
template <typename T, typename I>
struct image_< cast_image_<T,I> > : default_image_morpher< I, T,
cast_image_<T,I> >
{
- typedef trait::image::io::read_only io;
+ typedef trait::image::value_io::read_only value_io;
};
} // end of namespace mln::trait
@@ -123,14 +123,14 @@
# ifndef MLN_INCLUDE_ONLY
- // internal::data_< cast_image_<T,I> >
+ // internal::data< cast_image_<T,I> >
namespace internal
{
template <typename T, typename I>
inline
- data_< cast_image_<T,I> >::data_(const I& ima)
+ data< cast_image_<T,I> >::data(const I& ima)
: ima_(ima)
{
}
@@ -145,7 +145,7 @@
cast_image_<T,I>::cast_image_(const Image<I>& ima)
{
mln_precondition(exact(ima).has_data());
- this->data_ = new internal::data_< cast_image_<T,I> >(exact(ima));
+ this->data_ = new internal::data< cast_image_<T,I> >(exact(ima));
}
template <typename T, typename I>
Index: branches/cleanup-2008/milena/mln/core/image/decorated_image.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/decorated_image.hh
(revision 2199)
+++ branches/cleanup-2008/milena/mln/core/image/decorated_image.hh
(revision 2200)
@@ -65,9 +65,9 @@
/// \internal Data structure for \c mln::decorated_image<I,D>.
template <typename I, typename D>
- struct data_< decorated_image<I,D> >
+ struct data< decorated_image<I,D> >
{
- data_(I& ima, const D& deco);
+ data(I& ima, const D& deco);
I ima_;
D deco_;
@@ -143,10 +143,10 @@
namespace internal
{
- /// \internal internal::data_< decorated_image<I,S> >
+ /// \internal internal::data< decorated_image<I,S> >
template <typename I, typename D>
inline
- data_< decorated_image<I,D> >::data_(I& ima, const D& deco)
+ data< decorated_image<I,D> >::data(I& ima, const D& deco)
: ima_(ima),
deco_(deco)
{
@@ -166,7 +166,7 @@
inline
decorated_image<I,D>::decorated_image(I& ima, const D& deco)
{
- this->data_ = new internal::data_< decorated_image<I,D> >(ima, deco);
+ this->data_ = new internal::data< decorated_image<I,D> >(ima, deco);
}
template <typename I, typename D>
Index: branches/cleanup-2008/milena/mln/core/image/translate_image.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/translate_image.hh
(revision 2199)
+++ branches/cleanup-2008/milena/mln/core/image/translate_image.hh
(revision 2200)
@@ -51,9 +51,9 @@
/// \internal Data structure for \c mln::translate_image<I>.
template <typename I>
- struct data_< translate_image<I> >
+ struct data< translate_image<I> >
{
- data_(I& ima, const mln_dpsite(I) dp);
+ data(I& ima, const mln_dpsite(I) dp);
I ima_;
@@ -137,11 +137,11 @@
namespace internal
{
- // internal::data_< translate_image<I,S> >
+ // internal::data< translate_image<I,S> >
template <typename I>
inline
- data_< translate_image<I> >::data_(I& ima, const mln_dpsite(I) dp)
+ data< translate_image<I> >::data(I& ima, const mln_dpsite(I) dp)
: ima_ (ima),
dp_ (dp)
{
@@ -162,7 +162,7 @@
translate_image<I>::translate_image(I& ima, const mln_dpsite(I) dp)
{
mln_precondition(ima.has_data());
- this->data_ = new internal::data_< translate_image<I> >(ima, dp);
+ this->data_ = new internal::data< translate_image<I> >(ima, dp);
}
template <typename I>
Index: branches/cleanup-2008/milena/mln/core/image/graph_image.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/graph_image.hh (revision
2199)
+++ branches/cleanup-2008/milena/mln/core/image/graph_image.hh (revision
2200)
@@ -51,9 +51,9 @@
/// \internal Data structure for \c mln::graph_image<P,V>.
template <typename P, typename V>
- struct data_< graph_image<P, V> >
+ struct data< graph_image<P, V> >
{
- data_(const p_graph<P>& pg, const std::vector<V>& val);
+ data(const p_graph<P>& pg, const std::vector<V>& val);
std::vector<V> val_;
const p_graph<P> pg_;
@@ -179,7 +179,7 @@
{
template <typename P, typename V>
inline
- data_< graph_image<P, V> >::data_(const p_graph<P>& pg,
+ data< graph_image<P, V> >::data(const p_graph<P>& pg,
const std::vector<V>& val)
: val_ (val),
pg_ (pg)
@@ -220,7 +220,7 @@
graph_image<P, V>::init_(const p_graph<P>& pg, const std::vector<V>&
val)
{
mln_precondition(! this->has_data());
- this->data_ = new internal::data_< graph_image<P, V> > (pg, val);
+ this->data_ = new internal::data< graph_image<P, V> > (pg, val);
}
/*---------------.
Index: branches/cleanup-2008/milena/mln/core/image/value_enc_image.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/value_enc_image.hh
(revision 2199)
+++ branches/cleanup-2008/milena/mln/core/image/value_enc_image.hh
(revision 2200)
@@ -54,9 +54,9 @@
/// \internal Data structure for \c mln::value_enc_image<P,T>.
template <typename P, typename T>
- struct data_< value_enc_image<P, T> >
+ struct data< value_enc_image<P, T> >
{
- data_();
+ data();
/// Image values.
std::vector<T> values_;
@@ -146,11 +146,11 @@
namespace internal
{
- // internal::data_< value_enc_image<P, T> >
+ // internal::data< value_enc_image<P, T> >
template <typename P, typename T>
inline
- data_< value_enc_image<P,T> >::data_()
+ data< value_enc_image<P,T> >::data()
{
}
@@ -161,7 +161,7 @@
inline
value_enc_image<P, T>::value_enc_image()
{
- this->data_ = new internal::data_< value_enc_image<P,T> >();
+ this->data_ = new internal::data< value_enc_image<P,T> >();
}
template <typename P, typename T>
@@ -178,7 +178,7 @@
value_enc_image<P, T>::insert(const p_runs_<P>& ps, T value)
{
if (!this->has_data())
- this->data_ = new internal::data_< value_enc_image<P,T> >();
+ this->data_ = new internal::data< value_enc_image<P,T> >();
this->data_->domain_.insert(ps);
this->data_->values_.push_back(value);
Index: branches/cleanup-2008/milena/mln/core/image/line_graph_image.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/line_graph_image.hh
(revision 2199)
+++ branches/cleanup-2008/milena/mln/core/image/line_graph_image.hh
(revision 2200)
@@ -65,9 +65,9 @@
/// \internal Data structure for \c mln::line_graph_image<P,V>.
template <typename P, typename V>
- struct data_< line_graph_image<P, V> >
+ struct data< line_graph_image<P, V> >
{
- data_(const p_line_graph<P>& plg,
+ data(const p_line_graph<P>& plg,
const std::vector<V>& vertex_val, const std::vector<V>& edge_val);
std::vector<V> vertex_val_;
@@ -205,7 +205,7 @@
{
template <typename P, typename V>
inline
- data_< line_graph_image<P, V> >::data_(const p_line_graph<P>& plg,
+ data< line_graph_image<P, V> >::data(const p_line_graph<P>& plg,
const std::vector<V>& vertex_val,
const std::vector<V>& edge_val)
: vertex_val_(vertex_val),
@@ -253,7 +253,7 @@
{
mln_precondition(! this->has_data());
this->data_ =
- new internal::data_< line_graph_image<P, V> >(plg, vertex_val,
edge_val);
+ new internal::data< line_graph_image<P, V> >(plg, vertex_val,
edge_val);
}
/*---------------.
Index: branches/cleanup-2008/milena/mln/core/image/rle_image.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/rle_image.hh (revision 2199)
+++ branches/cleanup-2008/milena/mln/core/image/rle_image.hh (revision 2200)
@@ -51,9 +51,9 @@
/// \internal Data structure for \c mln::rle_image<P,T>.
template <typename P, typename T>
- struct data_< rle_image<P,T> >
+ struct data< rle_image<P,T> >
{
- data_();
+ data();
/// Image values.
std::vector<T> values_;
@@ -141,18 +141,18 @@
namespace internal
{
- // internal::data_< rle_image<I,S> >
+ // internal::data< rle_image<I,S> >
template <typename P, typename T>
inline
- data_< rle_image<P,T> >::data_()
+ data< rle_image<P,T> >::data()
{
}
template <typename P, typename T>
inline
unsigned
- data_< rle_image<P,T> >::size_mem() const
+ data< rle_image<P,T> >::size_mem() const
{
return sizeof(T) * values_.size() + domain_.size_mem();
}
@@ -160,7 +160,7 @@
template <typename P, typename T>
inline
void
- data_< rle_image<P,T> >::finalize()
+ data< rle_image<P,T> >::finalize()
{
domain_.finalize();
}
@@ -171,7 +171,7 @@
inline
rle_image<P, T>::rle_image()
{
- this->data_ = new internal::data_< rle_image<P,T> >();
+ this->data_ = new internal::data< rle_image<P,T> >();
}
template <typename P, typename T>
@@ -188,7 +188,7 @@
rle_image<P, T>::insert(const p_run<P>& pr, T value)
{
if (!this->has_data())
- this->data_ = new internal::data_< rle_image<P,T> >();
+ this->data_ = new internal::data< rle_image<P,T> >();
mln_assertion(this->data_->values_.size() == 0 ||
pr.first() > this->data_->domain_[this->data_->domain_.nruns() -
1].first());
this->data_->domain_.insert(pr);
Index: branches/cleanup-2008/milena/mln/core/image/hexa.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/hexa.hh (revision 2199)
+++ branches/cleanup-2008/milena/mln/core/image/hexa.hh (revision 2200)
@@ -52,9 +52,9 @@
{
/// \internal Data structure for \c mln::hexa<I>.
template <typename I>
- struct data_< hexa<I> >
+ struct data< hexa<I> >
{
- data_(I& ima, box2d_h b);
+ data(I& ima, box2d_h b);
I ima_;
mln::box2d_h b_;
@@ -185,14 +185,14 @@
- // internal::data_< hexa<I> >
+ // internal::data< hexa<I> >
namespace internal
{
template <typename I>
inline
- data_< hexa<I> >::data_(I& ima, box2d_h b)
+ data< hexa<I> >::data(I& ima, box2d_h b)
: ima_(ima),
b_(b)
{
@@ -210,7 +210,7 @@
box2d b_in = ima.bbox();
box2d_h b = make::box2d_h(b_in.pmin()[0] * 2, b_in.pmin()[1],
b_in.pmax()[0] * 2, (b_in.pmax()[1] + 1) * 2 - 1);
- this->data_ = new internal::data_< hexa<I> >(ima, b);
+ this->data_ = new internal::data< hexa<I> >(ima, b);
}
Index: branches/cleanup-2008/milena/mln/core/image/tr_image.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/tr_image.hh (revision 2199)
+++ branches/cleanup-2008/milena/mln/core/image/tr_image.hh (revision 2200)
@@ -53,9 +53,9 @@
/// \internal Data structure for \c mln::tr_image<T,I>.
template <typename T, typename I>
- struct data_< tr_image<T,I> >
+ struct data< tr_image<T,I> >
{
- data_(I& ima, T& tr);
+ data(I& ima, T& tr);
I ima_;
T tr_;
@@ -133,11 +133,11 @@
namespace internal
{
- // internal::data_< tr_image<I,S> >
+ // internal::data< tr_image<I,S> >
template <typename T, typename I>
inline
- data_< tr_image<T,I> >::data_(I& ima, T& tr)
+ data< tr_image<T,I> >::data(I& ima, T& tr)
: ima_(ima),
tr_(tr)
{
@@ -150,7 +150,7 @@
tr_image<T,I>::tr_image(I& ima, T& tr)
{
mln_precondition(ima.has_data());
- this->data_ = new internal::data_< tr_image<T,I> >(ima, tr);
+ this->data_ = new internal::data< tr_image<T,I> >(ima, tr);
}
template <typename T, typename I>
Index: branches/cleanup-2008/milena/mln/core/image/mono_obased_rle_image.hh
===================================================================
---
branches/cleanup-2008/milena/mln/core/image/mono_obased_rle_image.hh
(revision 2199)
+++
branches/cleanup-2008/milena/mln/core/image/mono_obased_rle_image.hh
(revision 2200)
@@ -53,9 +53,9 @@
/// \internal Data structure for \c mln::mono_obased_rle_image<P,T>.
template <typename P, typename T>
- struct data_< mono_obased_rle_image<P,T> >
+ struct data< mono_obased_rle_image<P,T> >
{
- data_(const std::set<T>& values);
+ data(const std::set<T>& values);
/// Objects.
std::vector< mono_rle_image<P, T> > ima_;
@@ -149,11 +149,11 @@
namespace internal
{
- // internal::data_< mono_obased_rle_image<P,T> >
+ // internal::data< mono_obased_rle_image<P,T> >
template <typename P, typename T>
inline
- data_< mono_obased_rle_image<P,T> >::data_(const std::set<T>& values)
+ data< mono_obased_rle_image<P,T> >::data(const std::set<T>& values)
: ima_(values.begin(), values.end())
{
}
@@ -161,7 +161,7 @@
template <typename P, typename T>
inline
unsigned
- data_< mono_obased_rle_image<P,T> >::size_mem() const
+ data< mono_obased_rle_image<P,T> >::size_mem() const
{
return domain_.size_mem() * 2 + sizeof(T) * (values_.size() +
ima_.size());
}
@@ -169,7 +169,7 @@
template <typename P, typename T>
inline
void
- data_< mono_obased_rle_image<P,T> >::finalize()
+ data< mono_obased_rle_image<P,T> >::finalize()
{
domain_.finalize();
for (typename std::vector< mono_rle_image<P, T> >::iterator it =
ima_.begin();
@@ -183,7 +183,7 @@
inline
mono_obased_rle_image<P, T>::mono_obased_rle_image(const
std::set<T>& values)
{
- this->data_ = new internal::data_< mono_obased_rle_image<P,T>
>(values);
+ this->data_ = new internal::data< mono_obased_rle_image<P,T> >(values);
}
template <typename P, typename T>
Index: branches/cleanup-2008/milena/mln/core/image/interpolated.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/interpolated.hh
(revision 2199)
+++ branches/cleanup-2008/milena/mln/core/image/interpolated.hh
(revision 2200)
@@ -51,9 +51,9 @@
/// \internal Data structure for \c mln::interpolated<I>.
template <typename I>
- struct data_< interpolated<I> >
+ struct data< interpolated<I> >
{
- data_(I& ima);
+ data(I& ima);
I ima_;
};
@@ -117,11 +117,11 @@
namespace internal
{
- // internal::data_< interpolated<I,S> >
+ // internal::data< interpolated<I,S> >
template <typename I>
inline
- data_< interpolated<I> >::data_(I& ima)
+ data< interpolated<I> >::data(I& ima)
: ima_(ima)
{
}
@@ -133,7 +133,7 @@
interpolated<I>::interpolated(I& ima)
{
mln_precondition(ima.has_data());
- this->data_ = new internal::data_< interpolated<I> >(ima);
+ this->data_ = new internal::data< interpolated<I> >(ima);
}
template <typename I>
Index: branches/cleanup-2008/milena/mln/core/image/bgraph_image.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/bgraph_image.hh
(revision 2199)
+++ branches/cleanup-2008/milena/mln/core/image/bgraph_image.hh
(revision 2200)
@@ -51,12 +51,12 @@
/// \internal Data structure for \c mln::bgraph_image<P,V>.
template <typename P, typename V>
- struct data_< bgraph_image<P, V> >
+ struct data< bgraph_image<P, V> >
{
/// Data stores a **copy** of the pset g.
/// But, the pset g and the data_ copy will shared the same
/// underlaying graph.
- data_(const p_bgraph<P>& g, const std::vector<V>& val);
+ data(const p_bgraph<P>& g, const std::vector<V>& val);
p_bgraph<P> pg_;
@@ -179,7 +179,7 @@
{
template <typename P, typename V>
inline
- data_< bgraph_image<P, V> >::data_(const p_bgraph<P>& g,
+ data< bgraph_image<P, V> >::data(const p_bgraph<P>& g,
const std::vector<V>& val)
: pg_ (g),
val_ (val)
@@ -218,7 +218,7 @@
void
bgraph_image<P, V>::init_(const p_bgraph<P>& g, const
std::vector<V>& val)
{
- this->data_ = new internal::data_< bgraph_image<P, V> > (g, val);
+ this->data_ = new internal::data< bgraph_image<P, V> > (g, val);
}
/*---------------.
Index: branches/cleanup-2008/milena/mln/core/image/t_image.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/t_image.hh (revision 2199)
+++ branches/cleanup-2008/milena/mln/core/image/t_image.hh (revision 2200)
@@ -48,7 +48,7 @@
/// \internal Data structure for \c mln::t_image<I>.
template <typename I>
- struct data_< t_image<I> >
+ struct data< t_image<I> >
{
/// \brief Build the data object held by a t_image.
///
@@ -56,7 +56,7 @@
/// \param dim1 The first dimension to be swapped.
/// \param dim2 The second dimension to be swapped.
/// \param box The bounding box (domain) of the morphed image.
- data_(I& ima, unsigned dim1, unsigned dim2,
+ data(I& ima, unsigned dim1, unsigned dim2,
mln::box_<mln_psite(I)>& box);
/// Underlying image.
@@ -162,11 +162,11 @@
namespace internal
{
- // internal::data_< t_image<I,S> >
+ // internal::data< t_image<I,S> >
template <typename I>
inline
- data_< t_image<I> >::data_(I& ima,
+ data< t_image<I> >::data(I& ima,
unsigned dim1, unsigned dim2,
mln::box_<mln_psite(I)>& box)
: ima_(ima),
@@ -190,7 +190,7 @@
// yet at this point.
box_<mln_psite(I)> box(exchange_coords_(ima.bbox().pmin(), dim1,
dim2),
exchange_coords_(ima.bbox().pmax(), dim1, dim2));
- this->data_ = new internal::data_< t_image<I> >(ima, dim1, dim2, box);
+ this->data_ = new internal::data< t_image<I> >(ima, dim1, dim2, box);
}
template <typename I>
Index: branches/cleanup-2008/milena/mln/core/image/image1d.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/image1d.hh (revision 2199)
+++ branches/cleanup-2008/milena/mln/core/image/image1d.hh (revision 2200)
@@ -59,10 +59,10 @@
/// \internal Data structure for \c mln::image1d<T>.
template <typename T>
- struct data_< image1d<T> >
+ struct data< image1d<T> >
{
- data_(const box1d& b, unsigned bdr);
- ~data_();
+ data(const box1d& b, unsigned bdr);
+ ~data();
T* buffer_;
T* array_;
@@ -74,7 +74,7 @@
void update_vb_();
void allocate_();
void deallocate_();
- void swap_ (data_< image1d<T> >& other_);
+ void swap_ (data< image1d<T> >& other_);
void reallocate_(unsigned new_border);
};
@@ -231,14 +231,14 @@
target.init_(b, bdr);
}
- // \internal internal::data_< image1d<T> >
+ // \internal internal::data< image1d<T> >
namespace internal
{
template <typename T>
inline
- data_< image1d<T> >::data_(const box1d& b, unsigned bdr)
+ data< image1d<T> >::data(const box1d& b, unsigned bdr)
: buffer_(0),
array_ (0),
b_ (b),
@@ -249,7 +249,7 @@
template <typename T>
inline
- data_< image1d<T> >::~data_()
+ data< image1d<T> >::~data()
{
deallocate_();
}
@@ -257,7 +257,7 @@
template <typename T>
inline
void
- data_< image1d<T> >::update_vb_()
+ data< image1d<T> >::update_vb_()
{
vb_.pmin() = b_.pmin() - dpoint1d(all_to(bdr_));
vb_.pmax() = b_.pmax() + dpoint1d(all_to(bdr_));
@@ -266,7 +266,7 @@
template <typename T>
inline
void
- data_< image1d<T> >::allocate_()
+ data< image1d<T> >::allocate_()
{
update_vb_();
unsigned
@@ -279,7 +279,7 @@
template <typename T>
inline
void
- data_< image1d<T> >::deallocate_()
+ data< image1d<T> >::deallocate_()
{
if (buffer_)
{
@@ -292,10 +292,10 @@
template <typename T>
inline
void
- data_< image1d<T> >::swap_(data_< image1d<T> >& other_)
+ data< image1d<T> >::swap_(data< image1d<T> >& other_)
{
- data_< image1d<T> > self_ = *this;
+ data< image1d<T> > self_ = *this;
*this = other_;
other_ = self_;
@@ -304,9 +304,9 @@
template <typename T>
inline
void
- data_< image1d<T> >::reallocate_(unsigned new_border)
+ data< image1d<T> >::reallocate_(unsigned new_border)
{
- data_< image1d<T> >& tmp = *(new data_< image1d<T> >(this->b_,
new_border));
+ data< image1d<T> >& tmp = *(new data< image1d<T> >(this->b_,
new_border));
this->swap_(tmp);
}
@@ -342,7 +342,7 @@
image1d<T>::init_(const box1d& b, unsigned bdr)
{
mln_precondition(! this->has_data());
- this->data_ = new internal::data_< image1d<T> >(b, bdr);
+ this->data_ = new internal::data< image1d<T> >(b, bdr);
}
template <typename T>
Index: branches/cleanup-2008/milena/mln/core/image/fi_adaptor.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/fi_adaptor.hh (revision
2199)
+++ branches/cleanup-2008/milena/mln/core/image/fi_adaptor.hh (revision
2200)
@@ -64,13 +64,13 @@
{
/// \internal Data structure for \c mln::fi_adaptor<I>.
template <typename I>
- struct data_< fi_adaptor<I> >
+ struct data< fi_adaptor<I> >
{
/// Constructor.
- data_();
+ data();
/// Destructor.
- ~data_();
+ ~data();
/// Adaptee image
fipImage fi_ima_;
@@ -91,7 +91,7 @@
void deallocate_();
/// Swap data between images.
- void swap_(data_< fi_adaptor<I> >& other_);
+ void swap_(data< fi_adaptor<I> >& other_);
};
} // end of namespace mln::internal
@@ -220,24 +220,24 @@
};
- // internal::data_< fi_adaptor<I> >
+ // internal::data< fi_adaptor<I> >
namespace internal
{
template <typename I>
- data_< fi_adaptor<I> >::data_()
+ data< fi_adaptor<I> >::data()
{
}
template <typename I>
- data_< fi_adaptor<I> >::~data_()
+ data< fi_adaptor<I> >::~data()
{
deallocate_();
}
template <typename I>
void
- data_< fi_adaptor<I> >::sync_with_adaptee_()
+ data< fi_adaptor<I> >::sync_with_adaptee_()
{
mln_precondition(fi_ima_.isValid());
// FIXME: doesnt work for rgb:
@@ -262,7 +262,7 @@
template <typename I>
void
- data_< fi_adaptor<I> >::deallocate_()
+ data< fi_adaptor<I> >::deallocate_()
{
if (array_)
{
@@ -273,9 +273,9 @@
template <typename I>
void
- data_< fi_adaptor<I> >::swap_(data_< fi_adaptor<I> >& other_)
+ data< fi_adaptor<I> >::swap_(data< fi_adaptor<I> >& other_)
{
- data_< fi_adaptor<I> > self_ = *this;
+ data< fi_adaptor<I> > self_ = *this;
*this = other_;
other_ = self_;
}
@@ -294,7 +294,7 @@
void
fi_adaptor<I>::init_()
{
- this->data_ = new internal::data_< fi_adaptor<I> >();
+ this->data_ = new internal::data< fi_adaptor<I> >();
}
template <typename I>
Index: branches/cleanup-2008/milena/mln/core/image/image3d.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/image3d.hh (revision 2199)
+++ branches/cleanup-2008/milena/mln/core/image/image3d.hh (revision 2200)
@@ -60,10 +60,10 @@
/// \internal Data structure for \c mln::image3d<T>.
template <typename T>
- struct data_< image3d<T> >
+ struct data< image3d<T> >
{
- data_(const box3d& b, unsigned bdr);
- ~data_();
+ data(const box3d& b, unsigned bdr);
+ ~data();
T* buffer_;
T*** array_;
@@ -75,7 +75,7 @@
void update_vb_();
void allocate_();
void deallocate_();
- void swap_ (data_< image3d<T> >& other_);
+ void swap_ (data< image3d<T> >& other_);
void reallocate_(unsigned new_border);
};
@@ -241,14 +241,14 @@
}
- // internal::data_< image3d<T> >
+ // internal::data< image3d<T> >
namespace internal
{
template <typename T>
inline
- data_< image3d<T> >::data_(const box3d& b, unsigned bdr)
+ data< image3d<T> >::data(const box3d& b, unsigned bdr)
: buffer_(0),
array_ (0),
b_ (b),
@@ -259,7 +259,7 @@
template <typename T>
inline
- data_< image3d<T> >::~data_()
+ data< image3d<T> >::~data()
{
deallocate_();
}
@@ -267,7 +267,7 @@
template <typename T>
inline
void
- data_< image3d<T> >::update_vb_()
+ data< image3d<T> >::update_vb_()
{
vb_.pmin() = b_.pmin() - dpoint3d(all_to(bdr_));
vb_.pmax() = b_.pmax() + dpoint3d(all_to(bdr_));
@@ -276,7 +276,7 @@
template <typename T>
inline
void
- data_< image3d<T> >::allocate_()
+ data< image3d<T> >::allocate_()
{
update_vb_();
unsigned
@@ -304,7 +304,7 @@
template <typename T>
inline
void
- data_< image3d<T> >::deallocate_()
+ data< image3d<T> >::deallocate_()
{
if (buffer_)
{
@@ -331,9 +331,9 @@
template <typename T>
inline
void
- data_< image3d<T> >::swap_(data_< image3d<T> >& other_)
+ data< image3d<T> >::swap_(data< image3d<T> >& other_)
{
- data_< image3d<T> > self_ = *this;
+ data< image3d<T> > self_ = *this;
*this = other_;
other_ = self_;
}
@@ -341,9 +341,9 @@
template <typename T>
inline
void
- data_< image3d<T> >::reallocate_(unsigned new_border)
+ data< image3d<T> >::reallocate_(unsigned new_border)
{
- data_< image3d<T> >& tmp = *(new data_< image3d<T> >(this->b_,
new_border));
+ data< image3d<T> >& tmp = *(new data< image3d<T> >(this->b_,
new_border));
this->swap_(tmp);
}
@@ -378,7 +378,7 @@
image3d<T>::init_(const box3d& b, unsigned bdr)
{
mln_precondition(! this->has_data());
- this->data_ = new internal::data_< image3d<T> >(b, bdr);
+ this->data_ = new internal::data< image3d<T> >(b, bdr);
}
template <typename T>
Index: branches/cleanup-2008/milena/mln/core/image/complex_image.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/complex_image.hh
(revision 2199)
+++ branches/cleanup-2008/milena/mln/core/image/complex_image.hh
(revision 2200)
@@ -58,9 +58,9 @@
/// \internal Data structure for \c mln::complex_image<P,V>.
template <unsigned D, typename P, typename V>
- struct data_< complex_image<D, P, V> >
+ struct data< complex_image<D, P, V> >
{
- data_(const p_complex<D, P>& pc,
+ data(const p_complex<D, P>& pc,
const metal::vec< D + 1, std::vector<V> >& values);
metal::vec< D + 1, std::vector<V> > values_;
@@ -184,7 +184,7 @@
{
template <unsigned D, typename P, typename V>
inline
- data_< complex_image<D, P, V> >::data_(const p_complex<D, P>& pc,
+ data< complex_image<D, P, V> >::data(const p_complex<D, P>& pc,
const metal::vec< D + 1,
std::vector<V> >& values)
: values_(values),
@@ -238,7 +238,7 @@
{
mln_precondition(! this->has_data());
this->data_ =
- new internal::data_< complex_image<D, P, V> >(pc, values);
+ new internal::data< complex_image<D, P, V> >(pc, values);
}
/*---------------.
Index: branches/cleanup-2008/milena/mln/core/image/mono_rle_image.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/image/mono_rle_image.hh
(revision 2199)
+++ branches/cleanup-2008/milena/mln/core/image/mono_rle_image.hh
(revision 2200)
@@ -51,9 +51,9 @@
/// \internal Data structure for \c mln::mono_rle_image<P,T>.
template <typename P, typename T>
- struct data_< mono_rle_image<P,T> >
+ struct data< mono_rle_image<P,T> >
{
- data_(const T& val);
+ data(const T& val);
/// Image value.
T value_;
@@ -145,11 +145,11 @@
namespace internal
{
- // internal::data_< mono_rle_image<I,S> >
+ // internal::data< mono_rle_image<I,S> >
template <typename P, typename T>
inline
- data_< mono_rle_image<P,T> >::data_(const T& val)
+ data< mono_rle_image<P,T> >::data(const T& val)
: value_(val)
{
}
@@ -157,7 +157,7 @@
template <typename P, typename T>
inline
unsigned
- data_< mono_rle_image<P,T> >::size_mem() const
+ data< mono_rle_image<P,T> >::size_mem() const
{
return sizeof(T) + domain_.size_mem();
}
@@ -165,7 +165,7 @@
template <typename P, typename T>
inline
void
- data_< mono_rle_image<P,T> >::finalize()
+ data< mono_rle_image<P,T> >::finalize()
{
domain_.finalize();
}
@@ -176,7 +176,7 @@
inline
mono_rle_image<P, T>::mono_rle_image(const T& val)
{
- this->data_ = new internal::data_< mono_rle_image<P,T> >(val);
+ this->data_ = new internal::data< mono_rle_image<P,T> >(val);
}
template <typename P, typename T>
Index: branches/cleanup-2008/milena/mln/core/internal/image_if_base.hh
===================================================================
--- branches/cleanup-2008/milena/mln/core/internal/image_if_base.hh
(revision 2199)
+++ branches/cleanup-2008/milena/mln/core/internal/image_if_base.hh
(revision 2200)
@@ -52,9 +52,9 @@
// \internal data_.
template <typename I, typename F, typename E>
- struct data_< image_if_base_<I,F,E> >
+ struct data< image_if_base_<I,F,E> >
{
- data_(I& ima, const F& f);
+ data(I& ima, const F& f);
I ima_;
p_if<mln_pset(I), F> pset_;
@@ -141,11 +141,11 @@
// target.init_(ima, f);
// }
- // \internal internal::data_< image_if_base_<I,S> >
+ // \internal internal::data< image_if_base_<I,S> >
template <typename I, typename F, typename E>
inline
- data_< image_if_base_<I,F,E> >::data_(I& ima, const F& f)
+ data< image_if_base_<I,F,E> >::data(I& ima, const F& f)
: ima_(ima),
pset_(ima.domain() | f)
{
@@ -181,7 +181,7 @@
image_if_base_<I,F,E>::init_(I& ima, const F& f)
{
mln_precondition(! this->has_data());
- this->data_ = new internal::data_<E>(ima, f);
+ this->data_ = new internal::data<E>(ima, f);
}
template <typename I, typename F, typename E>
Index: branches/cleanup-2008/milena/mln/neighb/image.hh
===================================================================
--- branches/cleanup-2008/milena/mln/neighb/image.hh (revision 2199)
+++ branches/cleanup-2008/milena/mln/neighb/image.hh (revision 2200)
@@ -54,9 +54,9 @@
/// \internal Data structure for mln::neighb::image
template <typename I, typename N>
- struct data_< mln::neighb::image<I, N> >
+ struct data< mln::neighb::image<I, N> >
{
- data_(I& ima, const N& nbh);
+ data(I& ima, const N& nbh);
I ima_;
N nbh_;
@@ -169,14 +169,14 @@
}
/*-----------------------------------------.
- | internal::data_< neighb::image_<T,I> >. |
+ | internal::data< neighb::image_<T,I> >. |
`-----------------------------------------*/
namespace internal
{
template <typename I, typename N>
inline
- data_< neighb::image<I, N> >::data_(I& ima, const N& nbh)
+ data< neighb::image<I, N> >::data(I& ima, const N& nbh)
: ima_(ima),
nbh_(nbh)
{
@@ -210,7 +210,7 @@
{
mln_precondition(! this->has_data());
this->data_ =
- new mln::internal::data_< mln::neighb::image<I, N> >(exact(ima),
+ new mln::internal::data< mln::neighb::image<I, N> >(exact(ima),
exact(nbh));
}
Index: branches/cleanup-2008/milena/mln/value/stack.hh
===================================================================
--- branches/cleanup-2008/milena/mln/value/stack.hh (revision 2199)
+++ branches/cleanup-2008/milena/mln/value/stack.hh (revision 2200)
@@ -54,10 +54,10 @@
*
*/
template <unsigned n, typename I>
- struct data_< value::stack_image<n, I> >
+ struct data< value::stack_image<n, I> >
{
public:
- data_(const algebra::vec<n,I>& imas);
+ data(const algebra::vec<n,I>& imas);
algebra::vec<n,I> imas_;
I& ima_;
};
@@ -214,11 +214,11 @@
namespace internal
{
- // internal::data_< cast_image_<T,I> >
+ // internal::data< cast_image_<T,I> >
template <unsigned n, typename I>
inline
- data_< value::stack_image<n,I> >::data_(const algebra::vec<n,I>& imas)
+ data< value::stack_image<n,I> >::data(const algebra::vec<n,I>& imas)
: imas_(imas),
ima_(imas_[0])
{
@@ -241,7 +241,7 @@
inline
stack_image<n,I>::stack_image(const algebra::vec<n,I>& imas)
{
- this->data_ = new mln::internal::data_< stack_image<n, I> >(imas);
+ this->data_ = new mln::internal::data< stack_image<n, I> >(imas);
for (unsigned i = 0; i < n; ++i)
{
mln_precondition(imas[i].has_data());
6220
Age (days ago)
6220
Last active (days ago)
0 comments
1 participants
participants (1)
-
Matthieu Garrigues