* mln/core/image/image3d.hh,
* mln/debug/slices_2d.hh,
* tests/io/pbms/load.cc,
* tests/io/pgms/load.cc,
* tests/io/ppms/load.cc: Rename nslices to nslis.
---
milena/ChangeLog | 10 ++++++++++
milena/mln/core/image/image3d.hh | 7 ++++---
milena/mln/debug/slices_2d.hh | 13 +++++++------
milena/tests/io/pbms/load.cc | 2 +-
milena/tests/io/pgms/load.cc | 2 +-
milena/tests/io/ppms/load.cc | 2 +-
6 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 04b9146..f76dc74 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,15 @@
2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr>
+ Rename image3d<>::nslices to image3d<>::nslis.
+
+ * mln/core/image/image3d.hh,
+ * mln/debug/slices_2d.hh,
+ * tests/io/pbms/load.cc,
+ * tests/io/pgms/load.cc,
+ * tests/io/ppms/load.cc: Rename nslices to nslis.
+
+2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr>
+
Various small fixes.
* doc/tutorial/tutorial.tex: Add more contacts.
diff --git a/milena/mln/core/image/image3d.hh b/milena/mln/core/image/image3d.hh
index 6c4afe0..dc2b6c3 100644
--- a/milena/mln/core/image/image3d.hh
+++ b/milena/mln/core/image/image3d.hh
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+// Laboratory (LRDE)
//
// This file is part of Olena.
//
@@ -208,7 +209,7 @@ namespace mln
/// Give the number of slices.
- unsigned nslices() const;
+ unsigned nslis() const;
/// Give the number of rows.
unsigned nrows() const;
@@ -511,7 +512,7 @@ namespace mln
template <typename T>
inline
unsigned
- image3d<T>::nslices() const
+ image3d<T>::nslis() const
{
mln_precondition(this->is_valid());
return this->data_->b_.len(0);
diff --git a/milena/mln/debug/slices_2d.hh b/milena/mln/debug/slices_2d.hh
index 79aaa99..165e79c 100644
--- a/milena/mln/debug/slices_2d.hh
+++ b/milena/mln/debug/slices_2d.hh
@@ -1,4 +1,5 @@
-// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+// Laboratory (LRDE)
//
// This file is part of Olena.
//
@@ -86,11 +87,11 @@ namespace mln
mln_precondition(input.is_valid());
mln_precondition(n_horizontal > 0 && n_vertical > 0);
- mln_precondition(input.nslices() <= n_horizontal * n_vertical);
+ mln_precondition(input.nslis() <= n_horizontal * n_vertical);
image2d<mln_value(I)> output(input.nrows() * n_vertical,
input.ncols() * n_horizontal);
- if (input.nslices() != n_horizontal * n_vertical)
+ if (input.nslis() != n_horizontal * n_vertical)
data::fill(output, bg);
const point3d& p_min = input.domain().pmin();
@@ -152,7 +153,7 @@ namespace mln
n_vertical = internal::round_up(n_v);
}
}
-
+
} // end of namespace mln::debug::internal
@@ -170,10 +171,10 @@ namespace mln
mln_precondition(ratio_hv > 0.f);
unsigned n_horizontal, n_vertical;
- internal::slices2d_helper(input.nslices(), input.nrows(), input.ncols(),
+ internal::slices2d_helper(input.nslis(), input.nrows(), input.ncols(),
ratio_hv,
n_horizontal, n_vertical);
- mln_assertion(n_horizontal * n_vertical >= input.nslices());
+ mln_assertion(n_horizontal * n_vertical >= input.nslis());
image2d<mln_value(I)> output = slices_2d(input, n_horizontal, n_vertical,
bg);
diff --git a/milena/tests/io/pbms/load.cc b/milena/tests/io/pbms/load.cc
index 7712590..e95bc4d 100644
--- a/milena/tests/io/pbms/load.cc
+++ b/milena/tests/io/pbms/load.cc
@@ -54,7 +54,7 @@ int main()
image3d<bool> ima3d;
io::pbms::load(ima3d, files);
- mln_assertion(ima3d.nslices() == 2);
+ mln_assertion(ima3d.nslis() == 2);
mln_assertion(slice(ima3d, 0) == pic);
mln_assertion(slice(ima3d, 1) == pic2);
diff --git a/milena/tests/io/pgms/load.cc b/milena/tests/io/pgms/load.cc
index 8380506..d0b5c75 100644
--- a/milena/tests/io/pgms/load.cc
+++ b/milena/tests/io/pgms/load.cc
@@ -61,7 +61,7 @@ int main()
image3d<int_u8> ima3d;
io::pgms::load(ima3d, files);
- mln_assertion(ima3d.nslices() == 2);
+ mln_assertion(ima3d.nslis() == 2);
mln_assertion(slice(ima3d, 0) == lena);
mln_assertion(slice(ima3d, 1) == lena2);
}
diff --git a/milena/tests/io/ppms/load.cc b/milena/tests/io/ppms/load.cc
index d5149cf..ad8d813 100644
--- a/milena/tests/io/ppms/load.cc
+++ b/milena/tests/io/ppms/load.cc
@@ -63,7 +63,7 @@ int main()
image3d<rgb8> ima3d;
io::ppms::load(ima3d, files);
- mln_assertion(ima3d.nslices() == 2);
+ mln_assertion(ima3d.nslis() == 2);
mln_assertion(slice(ima3d, 0) == ima);
mln_assertion(slice(ima3d, 1) == ima2);
}
--
1.5.6.5