Author: hanya
Date: Fri Dec 25 13:29:02 2015
New Revision: 1721674
URL: http://svn.apache.org/viewvc?rev=1721674&view=rev
Log:
#i126753# fix invalid parse of GSUB table for OpenType fonts
Modified:
openoffice/trunk/main/vcl/source/glyphs/gcach_ftyp.cxx
Modified: openoffice/trunk/main/vcl/source/glyphs/gcach_ftyp.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/glyphs/gcach_ftyp.cxx?rev=1721674&r1=1721673&r2=1721674&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/glyphs/gcach_ftyp.cxx (original)
+++ openoffice/trunk/main/vcl/source/glyphs/gcach_ftyp.cxx Fri Dec 25 13:29:02
2015
@@ -721,8 +721,8 @@ FreetypeServerFont::FreetypeServerFont(
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( cons
}
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 )
