freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master 181033d: [ftstroke] Fix unpredictable failures (#5498


From: Alexei Podtelezhnikov
Subject: [freetype2] master 181033d: [ftstroke] Fix unpredictable failures (#54986).
Date: Thu, 8 Nov 2018 21:05:24 -0500 (EST)

branch: master
commit 181033d396acac847e1dbcb766a1df8e5dc9d711
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>

    [ftstroke] Fix unpredictable failures (#54986).
    
    * src/base/ftstroke.c (ft_sroke_border_lineto): Fix lineto check.
---
 ChangeLog           | 6 ++++++
 src/base/ftstroke.c | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cd7b0ef..9f9c9a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2018-11-08  Alexei Podtelezhnikov  <address@hidden>
 
+       [ftstroke] Fix unpredictable failures (#54986).
+
+       * src/base/ftstroke.c (ft_sroke_border_lineto): Fix lineto check.
+
+2018-11-08  Alexei Podtelezhnikov  <address@hidden>
+
        [ftstroke] Fix unpredictable failures (#54976).
 
        * src/base/ftstroke.c (ft_sroke_border_close): Set the start tags.
diff --git a/src/base/ftstroke.c b/src/base/ftstroke.c
index 8a9e7db..fd74f8c 100644
--- a/src/base/ftstroke.c
+++ b/src/base/ftstroke.c
@@ -432,8 +432,8 @@
     }
     else
     {
-      /* don't add zero-length lineto */
-      if ( border->num_points > 0                                          &&
+      /* don't add zero-length lineto, but always add moveto */
+      if ( border->num_points > (FT_UInt)border->start                     &&
            FT_IS_SMALL( border->points[border->num_points - 1].x - to->x ) &&
            FT_IS_SMALL( border->points[border->num_points - 1].y - to->y ) )
         return error;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]