[Olena-patches] 2381: Complete iterators on faces.

* mln/core/faces_iter.hh (mln::faces_fwd_iter_<N, D>::set_cplx) (mln::faces_bkd_iter_<N, D>::set_cplx): New accessors. --- milena/ChangeLog | 9 +++++++++ milena/mln/core/faces_iter.hh | 28 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6e0cd55..afbf257 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2008-09-24 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Complete iterators on faces. + + * mln/core/faces_iter.hh + (mln::faces_fwd_iter_<N, D>::set_cplx) + (mln::faces_bkd_iter_<N, D>::set_cplx): + New accessors. + 2008-09-23 Thierry Geraud &lt;thierry.geraud(a)lrde.epita.fr&gt; Get consistent naming for p_line2d and dpsites_impl. diff --git a/milena/mln/core/faces_iter.hh b/milena/mln/core/faces_iter.hh index d16eaa7..522f2ab 100644 --- a/milena/mln/core/faces_iter.hh +++ b/milena/mln/core/faces_iter.hh @@ -73,6 +73,10 @@ namespace mln /// Manipulation. /// \{ + /// Change the target complex. + // FIXME: Same comment as the ctor above. + void set_cplx(complex<D>& c); + /// Test if the iterator is valid. void start(); /// Go to the next point. @@ -120,6 +124,10 @@ namespace mln /// Manipulation. /// \{ + /// Change the target complex. + // FIXME: Same comment as the ctor above. + void set_cplx(complex<D>& c); + /// Start an iteration. void start(); /// Go to the next point. @@ -167,6 +175,16 @@ namespace mln template <unsigned N, unsigned D> inline + void + faces_fwd_iter_<N, D>::set_cplx(complex<D>& c) + { + face_.set_cplx(c); + // Invalidate face_. + invalidate(); + } + + template <unsigned N, unsigned D> + inline faces_fwd_iter_<N, D>& faces_fwd_iter_<N, D>::operator=(const faces_fwd_iter_<N, D>& rhs) { @@ -239,6 +257,16 @@ namespace mln template <unsigned N, unsigned D> inline + void + faces_bkd_iter_<N, D>::set_cplx(complex<D>& c) + { + face_.set_cplx(c); + // Invalidate face_. + invalidate(); + } + + template <unsigned N, unsigned D> + inline faces_bkd_iter_<N, D>& faces_bkd_iter_<N, D>::operator=(const faces_bkd_iter_<N, D>& rhs) { -- 1.6.0.1