[Olena-patches] olena-2.0-40-gd4b9819 Fix Swilena's build.

* image2d_int_u8.i: Use int_u24 instead of int_u32 to avoid overflow problems in mln::metal::math::pow. --- swilena/ChangeLog | 7 +++++++ swilena/image2d_int_u8.i | 15 ++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 6047f18..f1a243b 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,12 @@ 2012-10-05 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Fix Swilena's build. + + * image2d_int_u8.i: Use int_u24 instead of int_u32 to avoid + overflow problems in mln::metal::math::pow. + +2012-10-05 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Wrap mln::value::int_u24. * int_u24.i: New. diff --git a/swilena/image2d_int_u8.i b/swilena/image2d_int_u8.i index 109f8bc..1bcb1d4 100644 --- a/swilena/image2d_int_u8.i +++ b/swilena/image2d_int_u8.i @@ -1,5 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -74,17 +75,17 @@ instantiate_morpho(mln::image2d< mln::value::int_u<8> >, mln::neighb2d) /*---------------------------------------. -| image2d<int_u8> and image2d<int_u32>. | +| image2d<int_u8> and image2d<int_u24>. | `---------------------------------------*/ -instantiate_meyer_wst(meyer_wst32, - mln::value::int_u<32>, +instantiate_meyer_wst(meyer_wst24, + mln::value::int_u<24>, mln::image2d< mln::value::int_u<8> >, mln::neighb2d) // FIXME: Rearrange and move this elsewhere. -instantiate_image2d(image2d_int_u32, mln::value::int_u<32>) +instantiate_image2d(image2d_int_u24, mln::value::int_u<24>) -%template(println32) mln::debug::println< - mln::image2d< mln::value::int_u<32> > +%template(println24) mln::debug::println< + mln::image2d< mln::value::int_u<24> > -- 1.7.2.5