[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 69ce973: [sfnt] Fix previous commit (#48901).
From: |
Werner LEMBERG |
Subject: |
[freetype2] master 69ce973: [sfnt] Fix previous commit (#48901). |
Date: |
Thu, 25 Aug 2016 17:50:21 +0000 (UTC) |
branch: master
commit 69ce97391cc2e7cbc4b6e2e7b7e62708a46280c6
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
[sfnt] Fix previous commit (#48901).
* src/sfnt/ttcmap.c (tt_cmap4_char_map_binary): Thinkos.
---
ChangeLog | 6 ++++++
src/sfnt/ttcmap.c | 5 +----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0fc1a9d..07e190e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2016-08-25 Werner Lemberg <address@hidden>
+ [sfnt] Fix previous commit (#48901).
+
+ * src/sfnt/ttcmap.c (tt_cmap4_char_map_binary): Thinkos.
+
+2016-08-25 Werner Lemberg <address@hidden>
+
[sfnt] Speed up handling of invalid format 4 cmaps.
* src/sfnt/ttcmap.c (tt_cmap4_next, tt_cmap4_char_map_binary): Add
diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c
index 0e0479d..cd7467d 100644
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@@ -1376,7 +1376,7 @@
/* if p > limit, the whole segment is invalid */
if ( next && p > limit )
- continue;
+ break;
gindex = TT_PEEK_USHORT( p );
if ( gindex )
@@ -1404,9 +1404,6 @@
else if ( (FT_Int)charcode + delta < 0x10000L &&
(FT_Int)end + delta >= 0x10000L )
charcode = (FT_UInt)( 0x10000L - delta );
-
- else
- continue;
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 69ce973: [sfnt] Fix previous commit (#48901).,
Werner LEMBERG <=