diff -r b9ad20498fb4 -r 8b9155204a54 fontservices/fontstore/src/FNTSTD.H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fontservices/fontstore/src/FNTSTD.H	Fri Jun 04 10:37:54 2010 +0100
@@ -0,0 +1,132 @@
+/*
+* Copyright (c) 1996-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+#ifndef __FNTSTD_H__
+#define __FNTSTD_H__
+
+#include <e32std.h>
+#include <graphics/shapeimpl.h>
+
+/**
+@internalComponent
+*/
+enum TFntStorePanic
+	{
+	EFntTypefaceIndexOutOfRange,
+	EFntHeightIndexOutOfRange,
+	EFntNoTypefaces,
+	EFntNoTypefaceFontBitmaps,
+	EFntTypefaceHasNoFontBitmaps,
+	EFntFontBitmapNotLoaded,
+	EFntFontAccessCountNonZero,
+	EFntFontStoreFileInUse,
+	EFntKPixelHeightInTwipsZero,
+	EFntSessionCacheIndexOutOfRange,
+	EFntMetricsIndexOutOfBounds,
+	EFntNoFontFound,
+	EFntRemovingAlreadyDeletedLinkedFont,
+	EFntOverFlow,
+	EFntMetricsNotOnHeap,
+	EFntPointerNotByteAligned,
+	};
+
+/**
+@internalComponent
+*/
+GLREF_C void Panic(TFntStorePanic aPanic);
+
+// COpenFontSessionCacheList is placed here rather than openfont.cpp because it is used in fntstore.cpp as well.
+
+class COpenFontSessionCacheListItem;
+class COpenFont;
+
+class COpenFontSessionCacheList
+/**
+@internalComponent
+*/
+	{
+public:
+	inline COpenFontSessionCacheList();
+	void Delete(RHeap* aHeap);
+	void DeleteCache(RHeap* aHeap,TInt aSessionHandle);
+
+	COpenFontSessionCacheListItem* Start();
+	void SetStart(COpenFontSessionCacheListItem* aItem);
+
+	void DeleteFontGlyphs(RHeap* aHeap,const COpenFont* aFont);
+
+	TInt iStartOffset;
+	};
+
+inline COpenFontSessionCacheList::COpenFontSessionCacheList():
+	iStartOffset(0)
+	{
+	}
+
+/**
+@internalComponent
+*/
+#ifdef __GCC32__
+#define PACKED_STRUCTURE_PREFIX
+#define PACKED_STRUCTURE_SUFFIX __attribute__(( __packed__))
+#elif defined(__ARMCC__)
+#define PACKED_STRUCTURE_PREFIX __packed
+#define PACKED_STRUCTURE_SUFFIX
+#else
+#define PACKED_STRUCTURE_PREFIX
+#define PACKED_STRUCTURE_SUFFIX
+#endif
+
+PACKED_STRUCTURE_PREFIX class TBitmapFontCharacterOffset
+/**
+Class to store an offset to the given position of a characters binary data in the 
+bitmap section of the font file.
+@internalComponent
+*/
+
+	{
+public:
+	TBitmapFontCharacterOffset();
+	void InternalizeL(RReadStream& aStream);
+public:
+	TUint16 iBitmapOffset;  // restricts bitmap to 64k
+	} PACKED_STRUCTURE_SUFFIX;
+
+PACKED_STRUCTURE_PREFIX class TBitmapFontCharacterMetrics
+/**
+Character metrics stored in .GDR files.
+
+This structure cannot be changed without changing the format of bitmap font
+files (.GDR files). This is because a pointer to TBitmapFontCharacterMetrics is made to point
+to part of the .GDR file in ROM.
+@internalComponent
+*/
+
+	{
+	public:
+	TBitmapFontCharacterMetrics();
+	void InternalizeL(RReadStream& aStream);
+
+	TInt8 iAscentInPixels;
+	TInt8 iHeightInPixels;
+	TInt8 iLeftAdjustInPixels;
+	TInt8 iMoveInPixels;
+	TInt8 iRightAdjustInPixels;
+	} PACKED_STRUCTURE_SUFFIX;
+
+#endif