diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2021-09-03 02:19:33 +1000 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-09-28 08:20:32 +0200 |
| commit | 4dd6af856d574ad66ebb4b822a36ba70af9945e2 (patch) | |
| tree | c67ddea9c5551e069cb75fe0901cdcfa3f00b054 /vcl/unx/generic | |
| parent | 1734e97222324c137ecd084ad2464abdff2698d1 (diff) | |
vcl: rename OutDevState to Stack
I have moved the header file to include/vcl/rendercontext as this will
eventually be part of the RenderContext split from OutputDevice.
State and associated enums have also been moved to the vcl namespace. I
have also moved ComplexTextLayoutFlags into the vcl::text namespace.
Change-Id: I0abbf560e75b45a272854b267e948c240cd69091
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121524
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/unx/generic')
| -rw-r--r-- | vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 9b11ced5ec83..77c1566727d4 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -256,9 +256,9 @@ const unsigned char* FreetypeFontInfo::GetTable( const char* pTag, sal_uLong* pL unsigned nFormat = GetUInt( pBuffer ); const unsigned char* p = pBuffer + 12; - if( nFormat == T_ttcf ) // TTC_MAGIC + if( nFormat == ::T_ttcf ) // TTC_MAGIC p += GetUInt( p + 4 * mnFaceNum ); - else if( nFormat != 0x00010000 && nFormat != T_true && nFormat != T_otto) // TTF_MAGIC and Apple TTF Magic and PS-OpenType font + else if( nFormat != 0x00010000 && nFormat != ::T_true && nFormat != ::T_otto) // TTF_MAGIC and Apple TTF Magic and PS-OpenType font return nullptr; // walk table directory until match |