diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2013-06-04 00:16:06 +0200 |
---|---|---|
committer | Noel Power <noel.power@suse.com> | 2013-06-20 10:29:15 +0000 |
commit | 7bd45e29ed9e740568f42134e9da840d26dc6c00 (patch) | |
tree | 68ca494127600fcf60fdc8b9f3a604d1c75f8114 /vcl | |
parent | 36b4c3b0836717a414d5dc327eb90200f583a6b9 (diff) |
Drop "CJK extra leading" crack
It have been unused on Mac OS X since since 2008 (commit
da4d070d9d2d563f6e1401496957b22b51c81ff9).
Change-Id: I4b3eabe71a54021903009310a87319c9caecfd4c
(cherry picked from commit a3e97576aa0a7d7c5d51a8ca2f9d220e7d342d87)
Reviewed-on: https://gerrit.libreoffice.org/4377
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/aqua/source/gdi/atsui/salgdi.cxx | 42 | ||||
-rw-r--r-- | vcl/coretext/salgdi2.cxx | 43 | ||||
-rw-r--r-- | vcl/inc/aqua/atsui/salgdi.h | 2 | ||||
-rw-r--r-- | vcl/inc/coretext/salgdi2.h | 2 |
4 files changed, 0 insertions, 89 deletions
diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx b/vcl/aqua/source/gdi/atsui/salgdi.cxx index f4518f9fb461..7a6ce9595d8a 100644 --- a/vcl/aqua/source/gdi/atsui/salgdi.cxx +++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx @@ -66,7 +66,6 @@ ImplMacFontData::ImplMacFontData( const ImplDevFontAttributes& rDFA, ATSUFontID , mbOs2Read( false ) , mbHasOs2Table( false ) , mbCmapEncodingRead( false ) -, mbHasCJKSupport( false ) , mbFontCapabilitiesRead( false ) {} @@ -110,7 +109,6 @@ inline FourCharCode GetTag(const char aTagName[5]) } static unsigned GetUShort( const unsigned char* p ){return((p[0]<<8)+p[1]);} -static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);} #if MACOSX_SDK_VERSION >= 1070 extern "C" { @@ -240,16 +238,6 @@ void ImplMacFontData::ReadOs2Table( void ) const // parse the OS/2 raw data // TODO: also analyze panose info, etc. - - // check if the fonts needs the "CJK extra leading" heuristic - const unsigned char* pOS2map = &aBuffer[0]; - const sal_uInt32 nVersion = GetUShort( pOS2map ); - if( nVersion >= 0x0001 ) - { - sal_uInt32 ulUnicodeRange2 = GetUInt( pOS2map + 46 ); - if( ulUnicodeRange2 & 0x2DF00000 ) - mbHasCJKSupport = true; - } } void ImplMacFontData::ReadMacCmapEncoding( void ) const @@ -281,36 +269,6 @@ void ImplMacFontData::ReadMacCmapEncoding( void ) const return; if( GetUShort( pCmap ) != 0x0000 ) return; - - // check if the fonts needs the "CJK extra leading" heuristic - int nSubTables = GetUShort( pCmap + 2 ); - - for( const unsigned char* p = pCmap + 4; --nSubTables >= 0; p += 8 ) - { - int nPlatform = GetUShort( p ); - if( nPlatform == kFontMacintoshPlatform ) { - int nEncoding = GetUShort (p + 2 ); - if( nEncoding == kFontJapaneseScript || - nEncoding == kFontTraditionalChineseScript || - nEncoding == kFontKoreanScript || - nEncoding == kFontSimpleChineseScript ) - { - mbHasCJKSupport = true; - break; - } - } - } -} - -// ----------------------------------------------------------------------- - -bool ImplMacFontData::HasCJKSupport( void ) const -{ - ReadOs2Table(); - if( !mbHasOs2Table ) - ReadMacCmapEncoding(); - - return mbHasCJKSupport; } // ======================================================================= diff --git a/vcl/coretext/salgdi2.cxx b/vcl/coretext/salgdi2.cxx index 8e98f847d98c..00ee7e348691 100644 --- a/vcl/coretext/salgdi2.cxx +++ b/vcl/coretext/salgdi2.cxx @@ -77,7 +77,6 @@ ImplMacFontData::ImplMacFontData( const ImplMacFontData& rSrc ) , mbOs2Read( rSrc.mbOs2Read ) , mbHasOs2Table( rSrc.mbHasOs2Table ) , mbCmapEncodingRead( rSrc.mbCmapEncodingRead ) -, mbHasCJKSupport( rSrc.mbHasCJKSupport ) { if( mpCharMap ) mpCharMap->AddReference(); @@ -92,7 +91,6 @@ ImplMacFontData::ImplMacFontData( const ImplDevFontAttributes& rDFA, sal_IntPtr , mbOs2Read( false ) , mbHasOs2Table( false ) , mbCmapEncodingRead( false ) -, mbHasCJKSupport( false ) , mbFontCapabilitiesRead( false ) {} @@ -121,7 +119,6 @@ ImplFontEntry* ImplMacFontData::CreateFontInstance(FontSelectPattern& rFSD) cons // ----------------------------------------------------------------------- static unsigned GetUShort( const unsigned char* p ){return((p[0]<<8)+p[1]);} -static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);} const ImplFontCharMap* ImplMacFontData::GetImplFontCharMap() const { @@ -233,16 +230,6 @@ void ImplMacFontData::ReadOs2Table( void ) const // parse the OS/2 raw data // TODO: also analyze panose info, etc. - - // check if the fonts needs the "CJK extra leading" heuristic - const unsigned char* pOS2map = &aBuffer[0]; - const sal_uInt32 nVersion = GetUShort( pOS2map ); - if( nVersion >= 0x0001 ) - { - sal_uInt32 ulUnicodeRange2 = GetUInt( pOS2map + 46 ); - if( ulUnicodeRange2 & 0x2DF00000 ) - mbHasCJKSupport = true; - } } void ImplMacFontData::ReadMacCmapEncoding( void ) const @@ -266,40 +253,10 @@ void ImplMacFontData::ReadMacCmapEncoding( void ) const const unsigned char* pCmap = &aBuffer[0]; if( GetUShort( pCmap ) != 0x0000 ) return; - - // check if the fonts needs the "CJK extra leading" heuristic - int nSubTables = GetUShort( pCmap + 2 ); - - for( const unsigned char* p = pCmap + 4; --nSubTables >= 0; p += 8 ) - { - int nPlatform = GetUShort( p ); - if( nPlatform == kFontMacintoshPlatform ) { - int nEncoding = GetUShort (p + 2 ); - if( nEncoding == kFontJapaneseScript || - nEncoding == kFontTraditionalChineseScript || - nEncoding == kFontKoreanScript || - nEncoding == kFontSimpleChineseScript ) - { - mbHasCJKSupport = true; - break; - } - } - } } // ----------------------------------------------------------------------- -bool ImplMacFontData::HasCJKSupport( void ) const -{ - ReadOs2Table(); - if( !mbHasOs2Table ) - ReadMacCmapEncoding(); - - return mbHasCJKSupport; -} - -// ======================================================================= - AquaSalGraphics::AquaSalGraphics() : mpFrame( NULL ) , mxLayer( NULL ) diff --git a/vcl/inc/aqua/atsui/salgdi.h b/vcl/inc/aqua/atsui/salgdi.h index 288713726d6e..2591521b9739 100644 --- a/vcl/inc/aqua/atsui/salgdi.h +++ b/vcl/inc/aqua/atsui/salgdi.h @@ -60,7 +60,6 @@ public: void ReadOs2Table() const; void ReadMacCmapEncoding() const; - bool HasCJKSupport() const; private: const ATSUFontID mnFontId; @@ -69,7 +68,6 @@ private: mutable bool mbOs2Read; // true if OS2-table related info is valid mutable bool mbHasOs2Table; mutable bool mbCmapEncodingRead; // true if cmap encoding of Mac font is read - mutable bool mbHasCJKSupport; // #i78970# CJK fonts need extra leading mutable bool mbFontCapabilitiesRead; }; diff --git a/vcl/inc/coretext/salgdi2.h b/vcl/inc/coretext/salgdi2.h index 76937376668f..ffe0632944cc 100644 --- a/vcl/inc/coretext/salgdi2.h +++ b/vcl/inc/coretext/salgdi2.h @@ -71,7 +71,6 @@ public: void ReadOs2Table() const; void ReadMacCmapEncoding() const; - bool HasCJKSupport() const; protected: ImplMacFontData( const ImplMacFontData&); @@ -82,7 +81,6 @@ private: mutable bool mbOs2Read; // true if OS2-table related info is valid mutable bool mbHasOs2Table; mutable bool mbCmapEncodingRead; // true if cmap encoding of Mac font is read - mutable bool mbHasCJKSupport; // #i78970# CJK fonts need extra leading mutable bool mbFontCapabilitiesRead; }; |