[Olena-patches] olena-2.0-448-ge0089be mln/world/binary_2d/subsample.hh: Cleanup code. Fix a memory leak.

--- milena/ChangeLog | 5 +++++ milena/mln/world/binary_2d/subsample.hh | 23 ++++++++--------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1b7691e..4e1f088 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2013-03-27 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + * mln/world/binary_2d/subsample.hh: Cleanup code. Fix a memory + leak. + +2013-03-27 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Add constant Boolean functions. * mln/fun/v2b/always_false.hh, diff --git a/milena/mln/world/binary_2d/subsample.hh b/milena/mln/world/binary_2d/subsample.hh index b8bee40..d8d1aa3 100644 --- a/milena/mln/world/binary_2d/subsample.hh +++ b/milena/mln/world/binary_2d/subsample.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2011, 2012 EPITA Research and Development +// Copyright (C) 2009, 2011, 2012, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -33,6 +33,7 @@ /// /// FIXME: not enough generic. Does not work on image having /// the top left corner different from (0,0). +/// FIXME: To be removed ? # include <mln/core/image/image2d.hh> # include <mln/core/alias/dpoint2d.hh> @@ -63,7 +64,7 @@ namespace mln inline image2d<value::int_u8> - subsample(image2d<bool>& input, unsigned n) + subsample(const image2d<bool>& input, unsigned n) { mln_trace("world::binary_2d::subsample"); @@ -79,21 +80,13 @@ namespace mln return output; } - const bool** ptr = new const bool*[n]; + const bool** ptr; const unsigned nrows = input.nrows() / n; const unsigned ncols = input.ncols() / n; - algebra::vec<2, unsigned int> vmin; - algebra::vec<2, unsigned int> vmax; - vmin[0] = 0; - vmin[1] = 0; - vmax[0] = nrows - 1; - vmax[1] = ncols - 1; - point2d pmin(vmin); - point2d pmax(vmax); - image2d<int_u8> output(box<point2d>(pmin, pmax)); - - dpoint2d dp_row(1, 0); - const unsigned delta_row = input.delta_offset(dp_row); + image2d<int_u8> output; + initialize(output, input); + + const unsigned delta_row = input.delta_offset(down); unsigned count = 0; for (unsigned row = 0; row < nrows; ++row) -- 1.7.2.5