Kaydet (Commit) 59e1fced authored tarafından Khaled Hosny's avatar Khaled Hosny

Remove unused macros

TYPEFLAG_PS_OPENTYPE is set but never used, and dropping it means we no
longer need TYPEFLAG_COPYRIGHT_MASK either.

Change-Id: Iefb45b32f53a806f2477ce54b7062b5846a6a806
Reviewed-on: https://gerrit.libreoffice.org/49427Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarKhaled Hosny <khaledhosny@eglug.org>
üst c6f39e81
...@@ -174,14 +174,10 @@ namespace vcl ...@@ -174,14 +174,10 @@ namespace vcl
int winDescent; /**< descender metric for Windows */ int winDescent; /**< descender metric for Windows */
bool symbolEncoded; /**< true: MS symbol encoded */ bool symbolEncoded; /**< true: MS symbol encoded */
sal_uInt8 panose[10]; /**< PANOSE classification number */ sal_uInt8 panose[10]; /**< PANOSE classification number */
sal_uInt32 typeFlags; /**< type flags (copyright bits + PS-OpenType flag) */ sal_uInt32 typeFlags; /**< type flags (copyright bits) */
sal_uInt16 fsSelection; /**< OS/2 fsSelection */ sal_uInt16 fsSelection; /**< OS/2 fsSelection */
} TTGlobalFontInfo; } TTGlobalFontInfo;
#define TYPEFLAG_INVALID 0x8000000
#define TYPEFLAG_COPYRIGHT_MASK 0x000000E
#define TYPEFLAG_PS_OPENTYPE 0x0010000
/** ControlPoint structure used by GetTTGlyphPoints() */ /** ControlPoint structure used by GetTTGlyphPoints() */
typedef struct { typedef struct {
sal_uInt32 flags; /**< 00000000 00000000 e0000000 bbbbbbbb */ sal_uInt32 flags; /**< 00000000 00000000 e0000000 bbbbbbbb */
......
...@@ -2392,8 +2392,6 @@ void GetTTGlobalFontInfo(TrueTypeFont *ttf, TTGlobalFontInfo *info) ...@@ -2392,8 +2392,6 @@ void GetTTGlobalFontInfo(TrueTypeFont *ttf, TTGlobalFontInfo *info)
} }
memcpy(info->panose, table + 32, 10); memcpy(info->panose, table + 32, 10);
info->typeFlags = GetUInt16( table, 8 ); info->typeFlags = GetUInt16( table, 8 );
if( getTable(ttf, O_CFF) )
info->typeFlags |= TYPEFLAG_PS_OPENTYPE;
} }
table = getTable(ttf, O_post); table = getTable(ttf, O_post);
......
...@@ -195,7 +195,7 @@ bool EmbeddedFontsHelper::sufficientTTFRights( const void* data, long size, Font ...@@ -195,7 +195,7 @@ bool EmbeddedFontsHelper::sufficientTTFRights( const void* data, long size, Font
GetTTGlobalFontInfo( font, &info ); GetTTGlobalFontInfo( font, &info );
CloseTTFont( font ); CloseTTFont( font );
// https://www.microsoft.com/typography/otspec/os2.htm#fst // https://www.microsoft.com/typography/otspec/os2.htm#fst
int copyright = info.typeFlags & TYPEFLAG_COPYRIGHT_MASK; int copyright = info.typeFlags;
switch( rights ) switch( rights )
{ {
case FontRights::ViewingAllowed: case FontRights::ViewingAllowed:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment