[Olena-patches] olena: olena-2.0-636-g605d714 Merge branch 'exp/upscale' into exp/TL

This is a merge commit message of the following branches: Merge: e7c6040 19441a4 Conflicts: milena/mln/upscaling/upscaling_bicubic_2x.hh milena/mln/upscaling/upscaling_bicubic_2x.hh | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --cc milena/mln/upscaling/upscaling_bicubic_2x.hh index 67ed639,e4c2a33..9d1e91e --- a/milena/mln/upscaling/upscaling_bicubic_2x.hh +++ b/milena/mln/upscaling/upscaling_bicubic_2x.hh @@@ -27,8 -27,8 +27,9 @@@ #define MLN_UPSCALING_UPSCALE_BICUBIC_2X_HH #include <mln/core/image/image2d.hh> + #include <cmath> + /// \file /// /// \brief upscale image x2 with bicubic interpolation. @@@ -71,19 -71,17 +72,19 @@@ namespace mln mln_trace("upscaling::upscaling_bicubic_x2"); const I& in_image = exact(in_image_); mln_precondition(in_image.is_valid()); - mln_domain(I) ext_domain(in_image.domain().pmin() * 2, - in_image.domain().pmax() * 2); - mln_concrete(I) output(ext_domain); - + mln_concrete(I) output(in_image.nrows()*2,in_image.ncols()*2); + data::fill(output, 0); mln_concrete(I) tmp; initialize(tmp, in_image); data::fill(tmp, 0); - int x, y, k, l; ++ int k, l; + - for (def::coord row = 1; row < in_image.nrows(); ++row) - for (def::coord col = 1; col < in_image.ncols(); ++col) { ++ + for (def::coord row = geom::min_row(in_image); row <= geom::max_row(in_image) ; ++row) + for (def::coord col = geom::min_col(in_image)+1; col < geom::max_col(in_image)-1; ++col) { opt::at(tmp, row, col) = tl_bicubic_interpol(in_image(point2d(row, col - 1)), in_image(point2d(row, col)), in_image(point2d(row, col + 1)), in_image(point2d(row, col + 2))); } hooks/post-receive -- Olena, a generic and efficient image processing platform