* mln/core/site_set/box.hh: here. --- milena/ChangeLog | 6 ++++++ milena/mln/core/site_set/box.hh | 24 ------------------------ 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5fa5495..f555458 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2008-10-30 Guillaume Lazzara <z@lrde.epita.fr> + + Remove duplicate nrows() and ncols from mln::box. + + * mln/core/site_set/box.hh: here. + 2008-10-29 Guillaume Lazzara <z@lrde.epita.fr> Add new colors. diff --git a/milena/mln/core/site_set/box.hh b/milena/mln/core/site_set/box.hh index 019d6ad..7e8a29f 100644 --- a/milena/mln/core/site_set/box.hh +++ b/milena/mln/core/site_set/box.hh @@ -147,12 +147,6 @@ namespace mln /// FIXME: Do we want a routine as well like geom::bbox()? P center() const; - /// Return the column count of this box. - unsigned ncols() const; - - /// Return the row count of this box. - unsigned nrows() const; - /// Test that the box owns valid data, i.e., is initialized and /// with pmin being 'less-than' pmax. bool is_valid() const; @@ -384,24 +378,6 @@ namespace mln template <typename P> inline - unsigned - box<P>::ncols() const - { - mln_precondition(is_valid()); - return pmax().col() - pmin().col(); - } - - template <typename P> - inline - unsigned - box<P>::nrows() const - { - mln_precondition(is_valid()); - return pmax().row() - pmin().row(); - } - - template <typename P> - inline std::size_t box<P>::memory_size() const { -- 1.5.6.5