--- a/fontservices/fontstore/inc/OPENFONT.H Tue Aug 31 17:01:26 2010 +0300
+++ b/fontservices/fontstore/inc/OPENFONT.H Wed Sep 01 12:39:40 2010 +0100
@@ -81,7 +81,6 @@
@released
*/
const TUid KUidOpenFontTrueTypeExtension = {0x1027553E};
-const TUid KUidOpenFontGlyphOutlineExtension = {0x102872CE};
/**
Supplied to CShaper::ExtendedInterface() to get the language and script
@@ -328,7 +327,7 @@
TBool HasCharacterL(TInt aCode) const;
TBool GetCharacterData(TInt aSessionHandle,TInt aCode,const TOpenFontCharMetrics*& aMetrics,const TUint8*& aBitmap) const;
void OnFileDeleted();
- COpenFontGlyphCache* GetGlyphCache() const;
+ COpenFontGlyphCache* GetGlyphCache();
inline TInt FontCapitalAscent() const;
inline TInt FontMaxAscent() const;
inline TInt FontStandardDescent() const;
@@ -336,8 +335,6 @@
inline TInt FontLineGap() const;
inline TInt FontMaxHeight() const;
void DeleteShaper() const;
- TInt GetFontTable(TUint32 aTag, TAny*& aTableContent, TInt& aLength);
- TInt GetGlyphOutline(TUint aCode, TBool aHinted, TAny*& aOutline, TInt& aLength);
protected:
RHeap* iHeap;
@@ -371,7 +368,7 @@
private:
const COpenFontGlyph* Glyph(TInt aSessionHandle,TInt aCode) const;
- const COpenFontGlyph* FontCacheGlyph(TInt aCode) const;
+ const COpenFontGlyph* FontCacheGlyph(TInt aCode);
void SetGlyphCache(COpenFontGlyphCache* aGlyphCache);
@@ -536,12 +533,6 @@
virtual TBool HasTrueTypeTable(TUint32 aTag) = 0;
};
-class MOpenFontGlyphOutlineExtension
- {
-public:
- virtual TInt GetGlyphOutline(TUint aCode, TBool aIsGlyphId,
- TBool aHinted, TAny*& aOutline, TInt& aLength) = 0;
- };
/**
Font attribute base class.