[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 748e368: [cff] Remove an assert (#46107).
From: |
Werner LEMBERG |
Subject: |
[freetype2] master 748e368: [cff] Remove an assert (#46107). |
Date: |
Wed, 21 Oct 2015 11:59:26 +0000 |
branch: master
commit 748e3681734eb40952f2eabb61ae90f5f7e7b2a2
Author: Dave Arnold <address@hidden>
Commit: Werner Lemberg <address@hidden>
[cff] Remove an assert (#46107).
* src/cff/cf2hints.c (cf2_hintmap_insertHint): Ignore paired edges
in wrong order.
---
ChangeLog | 7 +++++++
src/cff/cf2hints.c | 5 +++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cac6c75..6af1970 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-10-21 Dave Arnold <address@hidden>
+
+ [cff] Remove an assert (#46107).
+
+ * src/cff/cf2hints.c (cf2_hintmap_insertHint): Ignore paired edges
+ in wrong order.
+
2015-10-21 Werner Lemberg <address@hidden>
[sfnt] Avoid unnecessarily large allocation for WOFFs (#46257).
diff --git a/src/cff/cf2hints.c b/src/cff/cf2hints.c
index 0e27000..bbbe8e3 100644
--- a/src/cff/cf2hints.c
+++ b/src/cff/cf2hints.c
@@ -587,8 +587,9 @@
}
/* paired edges must be in proper order */
- FT_ASSERT( !isPair ||
- topHintEdge->csCoord >= bottomHintEdge->csCoord );
+ if ( isPair &&
+ topHintEdge->csCoord < bottomHintEdge->csCoord )
+ return;
/* linear search to find index value of insertion point */
indexInsert = 0;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 748e368: [cff] Remove an assert (#46107).,
Werner LEMBERG <=