#i126753# fix invalid parse of GSUB table for OpenType fonts

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1721674 13f79535-47bb-0310-9956-ffa450edef68
apache · Dec 25, 2015 · b784edb · b784edb
1 parent cf09c87
commit b784edb
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/main/vcl/source/glyphs/gcach_ftyp.cxx b/main/vcl/source/glyphs/gcach_ftyp.cxx
@@ -721,8 +721,8 @@ FreetypeServerFont::FreetypeServerFont( const ImplFontSelectData& rFSD, FtFontIn
     maFaceFT = pFI->GetFaceFT();
 
 #ifdef HDU_DEBUG
-    fprintf( stderr, "FTSF::FTSF(\"%s\", h=%d, w=%d, sy=%d) => %d\n",
-        pFI->GetFontFileName()->getStr(), rFSD.mnHeight, rFSD.mnWidth, pFI->IsSymbolFont(), maFaceFT!=0 );
+    fprintf( stderr, "FTSF::FTSF(\"%s\", h=%d, w=%d, vt=%d, sy=%d) => %d\n",
+        pFI->GetFontFileName()->getStr(), rFSD.mnHeight, rFSD.mnWidth, rFSD.mbVertical, pFI->IsSymbolFont(), maFaceFT!=0 );
 #endif
 
     if( !maFaceFT )
@@ -2469,6 +2469,7 @@ bool FreetypeServerFont::ApplyGSUB( const ImplFontSelectData& 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 )