URL:
https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena
ChangeLog:
2008-09-12 Guillaume Lazzara <z(a)lrde.epita.fr>
Propagate few renamings.
* milena/mln/canvas/browsing/snake_fwd.hh,
* milena/mln/debug/println.spe.hh: Use def::coord instead of int.
* milena/mln/convert/to_image.hh: Rename mln_point to mln_site.
* milena/mln/geom/shift.hh:
Use convert::to instead of convert::to_dpoint().
* milena/mln/level/median.hh: Update the use of io property.
* milena/mln/pw/image.hh: Fix typo.
* milena/mln/win/line.hh: remove useless '_' in type name.
---
canvas/browsing/snake_fwd.hh | 4 ++--
convert/to_image.hh | 2 +-
debug/println.spe.hh | 6 +++---
geom/shift.hh | 3 ++-
level/median.hh | 2 +-
pw/image.hh | 2 +-
win/line.hh | 6 +++---
7 files changed, 13 insertions(+), 12 deletions(-)
Index: branches/cleanup-2008/milena/mln/debug/println.spe.hh
===================================================================
--- branches/cleanup-2008/milena/mln/debug/println.spe.hh (revision 2225)
+++ branches/cleanup-2008/milena/mln/debug/println.spe.hh (revision 2226)
@@ -158,9 +158,9 @@
println(const box3d& b, const I& input)
{
point3d p;
- int& sli = p.sli();
- int& row = p.row();
- int& col = p.col();
+ def::coord& sli = p.sli();
+ def::coord& row = p.row();
+ def::coord& col = p.col();
const int
max_row = b.max_row(),
max_sli = b.max_sli(),
Index: branches/cleanup-2008/milena/mln/level/median.hh
===================================================================
--- branches/cleanup-2008/milena/mln/level/median.hh (revision 2225)
+++ branches/cleanup-2008/milena/mln/level/median.hh (revision 2226)
@@ -303,7 +303,7 @@
{
trace::entering("level::median_dir");
- mlc_is(mln_trait_image_io(O), trait::image::io::write)::check();
+ mlc_is(mln_trait_image_value_io(O), trait::image::value_io::read_write)::check();
mlc_is(mln_trait_image_support(I), trait::image::support::aligned)::check();
mlc_converts_to(mln_value(I), mln_value(O))::check();
Index: branches/cleanup-2008/milena/mln/convert/to_image.hh
===================================================================
--- branches/cleanup-2008/milena/mln/convert/to_image.hh (revision 2225)
+++ branches/cleanup-2008/milena/mln/convert/to_image.hh (revision 2226)
@@ -64,7 +64,7 @@
template <typename T>
struct helper_dim_
{
- typedef mln_point(T) P;
+ typedef mln_site(T) P;
enum { value = P::dim };
};
Index: branches/cleanup-2008/milena/mln/pw/image.hh
===================================================================
--- branches/cleanup-2008/milena/mln/pw/image.hh (revision 2225)
+++ branches/cleanup-2008/milena/mln/pw/image.hh (revision 2226)
@@ -142,7 +142,7 @@
/// Give the definition domain.
const S& domain() const;
- /// Returns the function which compute a site value.
+ /// Return the function which computes a site value.
F function() const;
/// Read-only access of pixel value at point site \p p.
Index: branches/cleanup-2008/milena/mln/geom/shift.hh
===================================================================
--- branches/cleanup-2008/milena/mln/geom/shift.hh (revision 2225)
+++ branches/cleanup-2008/milena/mln/geom/shift.hh (revision 2226)
@@ -34,6 +34,7 @@
*/
# include <mln/core/window.hh>
+# include <mln/convert/to.hh>
@@ -60,7 +61,7 @@
window<mln_dpoint(W)> tmp;
mln_qiter(W) q(win, P::origin);
for_all(q)
- tmp.insert(convert::to_dpoint(q) + dp);
+ tmp.insert(convert::to(q) + dp);
return tmp;
}
Index: branches/cleanup-2008/milena/mln/win/line.hh
===================================================================
--- branches/cleanup-2008/milena/mln/win/line.hh (revision 2225)
+++ branches/cleanup-2008/milena/mln/win/line.hh (revision 2226)
@@ -58,16 +58,16 @@
*/
template <typename M, unsigned i, typename C>
struct line : public Window< line<M,i,C> >,
- public internal::dpoints_base_<dpoint_<M, C>, point_<M, C> >
+ public internal::dpoints_base_<dpoint<M, C>, point<M, C> >
{
/// Point associated type.
- typedef point_<M, int> point;
+ typedef point<M, int> point;
/// Psite associated type.
typedef point psite;
/// Dpoint associated type.
- typedef dpoint_<M, int> dpoint;
+ typedef dpoint<M, int> dpoint;
/// Site_Iterator type to browse a line forward
typedef dpoints_fwd_piter<dpoint> fwd_qiter;
Index: branches/cleanup-2008/milena/mln/canvas/browsing/snake_fwd.hh
===================================================================
--- branches/cleanup-2008/milena/mln/canvas/browsing/snake_fwd.hh (revision 2225)
+++ branches/cleanup-2008/milena/mln/canvas/browsing/snake_fwd.hh (revision 2226)
@@ -110,8 +110,8 @@
// p
f.p = f.input.bbox().pmin();
- int& row = f.p.row();
- int& col = f.p.col();
+ def::coord& row = f.p.row();
+ def::coord& col = f.p.col();
// initialization
trace::entering("canvas::browsing::snake_fwd::init");