[Libreoffice-commits] core.git: vcl/generic

[Tsutomu Uchino]

 vcl/generic/glyphs/gcach_ftyp.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4b57845388624251b121a3198ea9117a2b81ba14
Author: Tsutomu Uchino <hanya at apache.org>
Date:   Fri Dec 25 13:29:02 2015 +0000

    Resolves: #i126753# fix invalid parse of GSUB table for OpenType fonts
    
    (cherry picked from commit 9396ecb77711fb7da043f9865f9803a12d830daa)
    
    Change-Id: Ib34aa2310d83afec83b4a85f1661b763415159ed

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 5df5e2f..36b967f 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -1403,6 +1403,7 @@ bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
         }
 
         const FT_Byte* pFeatureTable = pGsubBase + nOfsFeatureTable + nOffset;
+        pFeatureTable += 2; // ignore FeatureParams
         const sal_uInt16 nCntLookups = GetUShort( pFeatureTable+0 );
         pFeatureTable += 2;
         for( sal_uInt16 i = 0; i < nCntLookups; ++i )