* src/base/ftstroke.c (ft_stroker_inside): Fix border intersections.

One more place to check whether `radius' is zero. Problem reported by Marco Wertz <marco.wertz@gmx.de>.
10 years ago · 0e73d218bc
parent 2c4832d309
commit 0e73d218bc
2 changed files with 11 additions and 2 deletions
--- a/8
+++ b/8
@ -1,3 +1,11 @@
+2014-11-09  Werner Lemberg  <wl@gnu.org>
+
+	* src/base/ftstroke.c (ft_stroker_inside): Fix border intersections.
+
+	One more place to check whether `radius' is zero.
+
+	Problem reported by Marco Wertz <marco.wertz@gmx.de>.
+
 2014-11-07  Werner Lemberg  <wl@gnu.org>

 	Fix Savannah bug #43535.
--- 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 );
    }