From 0e73d218bc9c87aebd60b64d772c8b9ece883a68 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 9 Nov 2014 01:27:38 +0100 Subject: [PATCH] * src/base/ftstroke.c (ft_stroker_inside): Fix border intersections. One more place to check whether `radius' is zero. Problem reported by Marco Wertz . --- ChangeLog | 8 ++++++++ src/base/ftstroke.c | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 22060e705..386103df9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2014-11-09 Werner Lemberg + + * src/base/ftstroke.c (ft_stroker_inside): Fix border intersections. + + One more place to check whether `radius' is zero. + + Problem reported by Marco Wertz . + 2014-11-07 Werner Lemberg Fix Savannah bug #43535. diff --git a/src/base/ftstroke.c b/src/base/ftstroke.c index ee61ceca0..dd75e32e9 100644 --- a/src/base/ftstroke.c +++ b/src/base/ftstroke.c @@ -4,7 +4,7 @@ /* */ /* FreeType path stroker (body). */ /* */ -/* Copyright 2002-2006, 2008-2011, 2013 by */ +/* Copyright 2002-2006, 2008-2011, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -1002,7 +1002,8 @@ FT_Tan( theta ) ) ); - intersect = FT_BOOL( stroker->line_length >= min_length && + intersect = FT_BOOL( min_length && + stroker->line_length >= min_length && line_length >= min_length ); }