[Olena-patches] last-svn-commit-825-g923a8af scribo/primitive/link/internal/dmax_functor_base.hh: Make the dmax ratio safer.

--- scribo/ChangeLog | 5 +++++ .../primitive/link/internal/dmax_functor_base.hh | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b4f95c5..811fa11 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/link/internal/dmax_functor_base.hh: Make the + dmax ratio safer. + +2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/text/merging: Add a precondition. Fix merging policy. 2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/primitive/link/internal/dmax_functor_base.hh b/scribo/scribo/primitive/link/internal/dmax_functor_base.hh index 67a8db4..334cc4d 100644 --- a/scribo/scribo/primitive/link/internal/dmax_functor_base.hh +++ b/scribo/scribo/primitive/link/internal/dmax_functor_base.hh @@ -83,7 +83,7 @@ namespace scribo w = b.width(), h = b.height(); - return (w / 2.0f) + (dmax_factor_ * math::max(w, h)); + return (w / 2.0f) + (dmax_factor_ * h);//math::max(w, h)); } -- 1.5.6.5