[Olena-patches] 2551: Use geom::bbox() instead of bbox().

--- milena/ChangeLog | 8 ++++++++ milena/mln/geom/max_col.hh | 3 ++- milena/mln/geom/max_row.hh | 3 ++- milena/mln/geom/min_col.hh | 3 ++- milena/mln/geom/min_row.hh | 3 ++- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e1d1927..734d001 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2008-10-14 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Use geom::bbox instead of bbox(). + * milena/mln/geom/max_col.hh, + * milena/mln/geom/max_row.hh, + * milena/mln/geom/min_col.hh, + * milena/mln/geom/min_col.hh: Use geom::bbox(). + 2008-10-14 Thierry Geraud &lt;thierry.geraud(a)lrde.epita.fr&gt; Some fixes on level update and compute. diff --git a/milena/mln/geom/max_col.hh b/milena/mln/geom/max_col.hh index fa1b644..31cbb9a 100644 --- a/milena/mln/geom/max_col.hh +++ b/milena/mln/geom/max_col.hh @@ -34,6 +34,7 @@ */ # include <mln/core/concept/image.hh> +# include <mln/geom/bbox.hh> namespace mln @@ -57,7 +58,7 @@ namespace mln mln_deduce(I, site, coord) max_col(const Image<I>& ima) { mln_precondition(exact(ima).has_data()); - return exact(ima).bbox().pmax().col(); + return geom::bbox(ima).pmax().col(); } diff --git a/milena/mln/geom/max_row.hh b/milena/mln/geom/max_row.hh index 1b51db5..5697a4a 100644 --- a/milena/mln/geom/max_row.hh +++ b/milena/mln/geom/max_row.hh @@ -34,6 +34,7 @@ */ # include <mln/core/concept/image.hh> +# include <mln/geom/bbox.hh> namespace mln @@ -58,7 +59,7 @@ namespace mln mln_coord(I) max_row(const Image<I>& ima) { mln_precondition(exact(ima).has_data()); - return exact(ima).bbox().pmax().row(); + return geom::bbox(ima).pmax().row(); } diff --git a/milena/mln/geom/min_col.hh b/milena/mln/geom/min_col.hh index 90fdc4b..6993d6f 100644 --- a/milena/mln/geom/min_col.hh +++ b/milena/mln/geom/min_col.hh @@ -34,6 +34,7 @@ */ # include <mln/core/concept/image.hh> +# include <mln/geom/bbox.hh> namespace mln @@ -58,7 +59,7 @@ namespace mln mln_coord(I) min_col(const Image<I>& ima) { mln_precondition(exact(ima).has_data()); - return exact(ima).bbox().pmin().col(); + return geom::bbox(ima).pmin().col(); } diff --git a/milena/mln/geom/min_row.hh b/milena/mln/geom/min_row.hh index 73089cd..5f2c191 100644 --- a/milena/mln/geom/min_row.hh +++ b/milena/mln/geom/min_row.hh @@ -34,6 +34,7 @@ */ # include <mln/core/concept/image.hh> +# include <mln/geom/bbox.hh> # include <mln/metal/bexpr.hh> # include <mln/metal/int.hh> @@ -61,7 +62,7 @@ namespace mln mln_deduce(I, site, coord) min_row(const Image<I>& ima) { mln_precondition(exact(ima).has_data()); - return exact(ima).bbox().pmin().row(); + return geom::bbox(ima).pmin().row(); } -- 1.5.6.5