freetype-commit
[Top][All Lists]
Advanced

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

[freetype2] master abb3312: [sfnt] Accept version 3 of `EBLC' and `CBLC'


From: Werner LEMBERG
Subject: [freetype2] master abb3312: [sfnt] Accept version 3 of `EBLC' and `CBLC' tables also.
Date: Sun, 08 Nov 2015 09:01:27 +0000

branch: master
commit abb33121ee8fc2f3fcc5182a7e9a5be97b2e4946
Author: Behdad Esfahbod <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [sfnt] Accept version 3 of `EBLC' and `CBLC' tables also.
    
    * src/sfnt/ttsbit.c (tt_face_load_sbit): Implement it.
---
 ChangeLog         |    8 +++++++-
 src/sfnt/ttsbit.c |    3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 28cec3e..e681f66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2015-11-06  Philipp Knechtges  <address@hidden>
+2015-11-08  Behdad Esfahbod  <address@hidden>
+
+       [sfnt] Accept version 3 of `EBLC' and `CBLC' tables also.
+
+       * src/sfnt/ttsbit.c (tt_face_load_sbit): Implement it.
+
+2015-11-08  Philipp Knechtges  <address@hidden>
 
        [autofit] Don't distort (latin) glyphs too much (#46195).
 
diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c
index 62bce3c..09260b8 100644
--- a/src/sfnt/ttsbit.c
+++ b/src/sfnt/ttsbit.c
@@ -104,7 +104,8 @@
         version     = FT_NEXT_LONG( p );
         num_strikes = FT_NEXT_ULONG( p );
 
-        if ( ( (FT_ULong)version & 0xFFFF0000UL ) != 0x00020000UL )
+        if ( ( (FT_ULong)version & 0xFFFF0000UL ) != 0x00020000UL &&
+             ( (FT_ULong)version & 0xFFFF0000UL ) != 0x00030000UL )
         {
           error = FT_THROW( Unknown_File_Format );
           goto Exit;



reply via email to

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