[Olena-patches] olena-2.0-166-gf550cfa mln/world/kn/display_enlarged.hh: Fix.

--- milena/ChangeLog | 4 ++++ milena/mln/world/kn/display_enlarged.hh | 30 ++++++++++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 475fb8e..6dedd0d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2012-10-31 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + * mln/world/kn/display_enlarged.hh: Fix. + 2012-10-30 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; * mln/world/k1/immerse.hh: Fix call to an overload in kn diff --git a/milena/mln/world/kn/display_enlarged.hh b/milena/mln/world/kn/display_enlarged.hh index 5d1ef50..e1b122a 100644 --- a/milena/mln/world/kn/display_enlarged.hh +++ b/milena/mln/world/kn/display_enlarged.hh @@ -93,16 +93,18 @@ namespace mln mln_assertion(zoom_ % 2); const I& ima_kn = exact(ima_kn_); - int shift = zoom_ - 1; + int + shift = zoom_ + 1, + mult = shift / 2; // No zoom: return original image. if (zoom_ == 1) - return ima_kn; + return duplicate(ima_kn); - mln_concrete(I) output(make::box2d(ima_kn.domain().pmin().row() * shift, - ima_kn.domain().pmin().col() * shift, - ima_kn.domain().pmax().row() * shift, - ima_kn.domain().pmax().col() * shift)); + mln_concrete(I) output(make::box2d(ima_kn.domain().pmin().row() * mult, + ima_kn.domain().pmin().col() * mult, + ima_kn.domain().pmax().row() * mult, + ima_kn.domain().pmax().col() * mult)); const mln::def::coord min_row = geom::min_row(ima_kn), @@ -116,23 +118,23 @@ namespace mln { if (kn::is_0_face(row, col)) { - output.at_(row * shift, col * shift) = ima_kn.at_(row, col); + output.at_(row * mult, col * mult) = ima_kn.at_(row, col); } else if (kn::is_1_face_vertical(row, col)) { - for (mln::def::coord j = -(shift - 1); j < (shift + 3); ++j) - output.at_(row * shift + j, col * shift) = ima_kn.at_(row, col); + for (mln::def::coord j = -(mult - 1); j <= (mult - 1); ++j) + output.at_(row * mult + j, col * mult) = ima_kn.at_(row, col); } else if (kn::is_1_face_horizontal(row, col)) { - for (mln::def::coord j = -(shift - 1); j < (shift + 3); ++j) - output.at_(row * shift, col * shift + j) = ima_kn.at_(row, col); + for (mln::def::coord j = -(mult - 1); j <= (mult - 1); ++j) + output.at_(row * mult, col * mult + j) = ima_kn.at_(row, col); } else if (kn::is_2_face(row, col)) { - for (mln::def::coord i = -(shift - 1); i < (shift + 3); ++i) - for (mln::def::coord j = -(shift - 1); j < (shift + 3); ++j) - output.at_(row * shift + i, col * shift + j) = ima_kn.at_(row, col); + for (mln::def::coord i = -(mult - 1); i <= (mult - 1); ++i) + for (mln::def::coord j = -(mult - 1); j <= (mult - 1); ++j) + output.at_(row * mult + i, col * mult + j) = ima_kn.at_(row, col); } } } -- 1.7.2.5