Skip to content

Commit

Permalink
#i126753# fix invalid parse of GSUB table for OpenType fonts
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1721674 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Tsutomu Uchino committed Dec 25, 2015
1 parent cf09c87 commit b784edb
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions main/vcl/source/glyphs/gcach_ftyp.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -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 )
Expand Down

0 comments on commit b784edb

Please sign in to comment.