[Olena-patches] last-svn-commit-149-g04e7d80 Help g++ 3.3 compile Milena code.

* apps/graph-morpho/convert.hh (convert::to_image2d(const mln::bin_1complex_image2d&)): Break up an object's construction to help g++ 3.3 understand it. --- milena/ChangeLog | 8 ++++++++ milena/apps/graph-morpho/convert.hh | 7 +++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f0ad22e..39cc7f3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2010-04-27 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Help g++ 3.3 compile Milena code. + + * apps/graph-morpho/convert.hh + (convert::to_image2d(const mln::bin_1complex_image2d&)): + Break up an object's construction to help g++ 3.3 understand it. + 2010-04-23 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Prevent g++ 4.2 from issuing bad code for graph-morpho/samples_image2d. diff --git a/milena/apps/graph-morpho/convert.hh b/milena/apps/graph-morpho/convert.hh index 6e4ad55..bd8ade5 100644 --- a/milena/apps/graph-morpho/convert.hh +++ b/milena/apps/graph-morpho/convert.hh @@ -64,10 +64,9 @@ namespace convert } mln::box2d support = bbox; - image2d<bool> output(box2d(point2d(support.pmin().row() * 2, - support.pmin().col() * 2), - point2d(support.pmax().row() * 2, - support.pmax().col() * 2))); + point2d box_p_min(support.pmin().row() * 2, support.pmin().col() * 2); + point2d box_p_max(support.pmax().row() * 2, support.pmax().col() * 2); + image2d<bool> output(box2d(box_p_min, box_p_max)); data::fill(output, false); // Iterate on vertices. -- 1.5.6.5