* mln/geom/bbox.hh, * mln/geom/max_col.hh, * mln/geom/max_row.hh, * mln/geom/max_sli.hh, * mln/geom/min_col.hh, * mln/geom/min_row.hh, * mln/geom/min_sli.hh, * mln/geom/ncols.hh, * mln/geom/nrows.hh, * mln/geom/nslis.hh: Remove useless traces. --- milena/ChangeLog | 15 +++++++++++++++ milena/mln/geom/bbox.hh | 16 +++------------- milena/mln/geom/max_col.hh | 9 ++------- milena/mln/geom/max_row.hh | 9 ++------- milena/mln/geom/max_sli.hh | 6 ++---- milena/mln/geom/min_col.hh | 9 ++------- milena/mln/geom/min_row.hh | 9 ++------- milena/mln/geom/min_sli.hh | 6 ++---- milena/mln/geom/ncols.hh | 9 ++------- milena/mln/geom/nrows.hh | 9 ++------- milena/mln/geom/nslis.hh | 6 ++---- 11 files changed, 36 insertions(+), 67 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1e97d05..9812f96 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,20 @@ 2009-11-18 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Remove useless traces. + + * mln/geom/bbox.hh, + * mln/geom/max_col.hh, + * mln/geom/max_row.hh, + * mln/geom/max_sli.hh, + * mln/geom/min_col.hh, + * mln/geom/min_row.hh, + * mln/geom/min_sli.hh, + * mln/geom/ncols.hh, + * mln/geom/nrows.hh, + * mln/geom/nslis.hh: Remove useless traces. + +2009-11-18 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Improve influence zone geodesic. * mln/canvas/distance_geodesic.hh: Remove useless traces. diff --git a/milena/mln/geom/bbox.hh b/milena/mln/geom/bbox.hh index 0ec374a..2a727e0 100644 --- a/milena/mln/geom/bbox.hh +++ b/milena/mln/geom/bbox.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. // @@ -34,7 +35,7 @@ * \todo Re-activate precondition so introduce * "set::nsites(Site_Set)"... * - * \todo Add a static check "domain is ok for bbox (like grid)". + * \todo Add a static check "domain is ok for bbox (like grid)". * * \todo Add the weighted_window case. */ @@ -120,34 +121,27 @@ namespace mln inline box<mln_site(S)> bbox(const Site_Set<S>& pset) { - trace::entering("geom::bbox"); // mln_precondition(set::is_empty(pset) != 0); box<mln_site(S)> b = impl::bbox_(mln_trait_site_set_bbox(S)(), exact(pset)); - trace::exiting("geom::bbox"); return b; } template <typename I> box<mln_site(I)> bbox(const Image<I>& ima_) { - trace::entering("geom::bbox"); - const I& ima = exact(ima_); mln_precondition(ima.is_valid()); box<mln_site(I)> b = geom::bbox(ima.domain()); - trace::exiting("geom::bbox"); return b; } template <typename W> box<mln_psite(W)> bbox(const Window<W>& win) { - trace::entering("geom::bbox"); - typedef mln_psite(W) P; accu::shape::bbox<P> b; P O = literal::origin; @@ -155,18 +149,14 @@ namespace mln for_all(q) b.take(q); - trace::exiting("geom::bbox"); return b; } template <typename W> box<mln_psite(W)> bbox(const Weighted_Window<W>& win) { - trace::entering("geom::bbox"); - box<mln_psite(W)> b = bbox(exact(win).win()); - trace::exiting("geom::bbox"); return b; } diff --git a/milena/mln/geom/max_col.hh b/milena/mln/geom/max_col.hh index 7e600ce..36eb213 100644 --- a/milena/mln/geom/max_col.hh +++ b/milena/mln/geom/max_col.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. // @@ -54,12 +55,9 @@ namespace mln inline mln_deduce(I, site, coord) max_col(const Image<I>& ima) { - trace::entering("mln::geom::max_col"); - mln_precondition(exact(ima).is_valid()); mln_deduce(I, site, coord) maxcol = geom::bbox(ima).pmax().col(); - trace::exiting("mln::geom::max_col"); return maxcol; } @@ -68,12 +66,9 @@ namespace mln inline mln_deduce(B, point, coord) max_col(const Box<B>& b) { - trace::entering("mln::geom::max_col"); - metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); mln_deduce(B, point, coord) maxcol = exact(b).pmax().col(); - trace::exiting("mln::geom::max_col"); return maxcol; } diff --git a/milena/mln/geom/max_row.hh b/milena/mln/geom/max_row.hh index 04689e8..6519906 100644 --- a/milena/mln/geom/max_row.hh +++ b/milena/mln/geom/max_row.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. // @@ -55,12 +56,9 @@ namespace mln inline mln_deduce(I, site, coord) max_row(const Image<I>& ima) { - trace::entering("mln::geom::max_row"); - mln_precondition(exact(ima).is_valid()); mln_deduce(I, site, coord) maxrow = geom::bbox(ima).pmax().row(); - trace::exiting("mln::geom::max_row"); return maxrow; } @@ -69,12 +67,9 @@ namespace mln inline mln_deduce(B, point, coord) max_row(const Box<B>& b) { - trace::entering("mln::geom::max_row"); - metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); mln_deduce(B, point, coord) maxrow = exact(b).pmax().row(); - trace::exiting("mln::geom::max_row"); return maxrow; } diff --git a/milena/mln/geom/max_sli.hh b/milena/mln/geom/max_sli.hh index b0c541c..cf4fc51 100644 --- a/milena/mln/geom/max_sli.hh +++ b/milena/mln/geom/max_sli.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. // @@ -51,12 +52,9 @@ namespace mln inline mln_deduce(I, site, coord) max_sli(const Image<I>& ima) { - trace::entering("mln::geom::max_sli"); - mln_precondition(exact(ima).is_valid()); mln_deduce(I, site, coord) maxsli = geom::bbox(ima).pmax().sli(); - trace::exiting("mln::geom::max_sli"); return maxsli; } diff --git a/milena/mln/geom/min_col.hh b/milena/mln/geom/min_col.hh index 2cdc052..373237e 100644 --- a/milena/mln/geom/min_col.hh +++ b/milena/mln/geom/min_col.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. // @@ -55,12 +56,9 @@ namespace mln inline mln_deduce(I, site, coord) min_col(const Image<I>& ima) { - trace::entering("mln::geom::min_col"); - mln_precondition(exact(ima).is_valid()); mln_deduce(I, site, coord) mincol = geom::bbox(ima).pmin().col(); - trace::exiting("mln::geom::min_col"); return mincol; } @@ -69,12 +67,9 @@ namespace mln inline mln_deduce(B, point, coord) min_col(const Box<B>& b) { - trace::entering("mln::geom::min_col"); - metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); mln_deduce(B, point, coord) mincol = exact(b).pmin().col(); - trace::exiting("mln::geom::min_col"); return mincol; } diff --git a/milena/mln/geom/min_row.hh b/milena/mln/geom/min_row.hh index ad8c8b7..ec833c3 100644 --- a/milena/mln/geom/min_row.hh +++ b/milena/mln/geom/min_row.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. // @@ -58,12 +59,9 @@ namespace mln inline mln_deduce(I, site, coord) min_row(const Image<I>& ima) { - trace::entering("mln::geom::min_row"); - mln_precondition(exact(ima).is_valid()); mln_deduce(I, site, coord) minrow = geom::bbox(ima).pmin().row(); - trace::exiting("mln::geom::min_row"); return minrow; } @@ -72,12 +70,9 @@ namespace mln inline mln_deduce(B, point, coord) min_row(const Box<B>& b) { - trace::entering("mln::geom::min_row"); - metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); mln_deduce(B, point, coord) minrow = exact(b).pmin().row(); - trace::exiting("mln::geom::min_row"); return minrow; } diff --git a/milena/mln/geom/min_sli.hh b/milena/mln/geom/min_sli.hh index 7b07a8c..87d6571 100644 --- a/milena/mln/geom/min_sli.hh +++ b/milena/mln/geom/min_sli.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. // @@ -51,12 +52,9 @@ namespace mln inline mln_deduce(I, site, coord) min_sli(const Image<I>& ima) { - trace::entering("mln::geom::min_sli"); - mln_precondition(exact(ima).is_valid()); mln_deduce(I, site, coord) minsli = geom::bbox(ima).pmin().sli(); - trace::exiting("mln::geom::min_sli"); return minsli; } diff --git a/milena/mln/geom/ncols.hh b/milena/mln/geom/ncols.hh index 4e062ce..bc4a09b 100644 --- a/milena/mln/geom/ncols.hh +++ b/milena/mln/geom/ncols.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. // @@ -55,12 +56,9 @@ namespace mln inline unsigned ncols(const Image<I>& ima) { - trace::entering("mln::geom::ncols"); - mln_precondition(exact(ima).is_valid()); unsigned ncols = geom::max_col(ima) - geom::min_col(ima) + 1; - trace::exiting("mln::geom::ncols"); return ncols; } @@ -68,12 +66,9 @@ namespace mln template <typename B> unsigned ncols(const Box<B>& b) { - trace::entering("mln::geom::ncols"); - metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); unsigned ncols = geom::max_col(b) - geom::min_col(b) + 1; - trace::exiting("mln::geom::ncols"); return ncols; } diff --git a/milena/mln/geom/nrows.hh b/milena/mln/geom/nrows.hh index b7892c8..040ca57 100644 --- a/milena/mln/geom/nrows.hh +++ b/milena/mln/geom/nrows.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. // @@ -55,24 +56,18 @@ namespace mln inline unsigned nrows(const Image<I>& ima) { - trace::entering("mln::geom::nrows"); - mln_precondition(exact(ima).is_valid()); unsigned nrows = geom::max_row(ima) - geom::min_row(ima) + 1; - trace::exiting("mln::geom::nrows"); return nrows; } template <typename B> unsigned nrows(const Box<B>& b) { - trace::entering("mln::geom::nrows"); - metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); unsigned nrows = geom::max_row(b) - geom::min_row(b) + 1; - trace::exiting("mln::geom::nrows"); return nrows; } diff --git a/milena/mln/geom/nslis.hh b/milena/mln/geom/nslis.hh index 42c1899..d6953da 100644 --- a/milena/mln/geom/nslis.hh +++ b/milena/mln/geom/nslis.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. // @@ -51,12 +52,9 @@ namespace mln inline unsigned nslis(const Image<I>& ima) { - trace::entering("mln::geom::nslis"); - mln_precondition(exact(ima).is_valid()); unsigned nslis = geom::max_sli(ima) - geom::min_sli(ima) + 1; - trace::exiting("mln::geom::nslis"); return nslis; } -- 1.5.6.5