From 9cfce6733f5f3161c3dfc6a8d39283e705df0343 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Fri, 5 Aug 2005 11:52:53 +0000 Subject: INTEGRATION: CWS gslpatches2 (1.22.22); FILE MERGED 2005/06/08 12:58:51 pl 1.22.22.2: #i50482# 64bit fix and type cleanup from kendy 2005/05/31 09:10:19 pl 1.22.22.1: #i50067# forward decls (thanks to pmladek) --- psprint/inc/psprint/fontmanager.hxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'psprint') diff --git a/psprint/inc/psprint/fontmanager.hxx b/psprint/inc/psprint/fontmanager.hxx index aafe2d269cac..fc77e340241d 100644 --- a/psprint/inc/psprint/fontmanager.hxx +++ b/psprint/inc/psprint/fontmanager.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fontmanager.hxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: rt $ $Date: 2005-01-31 08:58:54 $ + * last change: $Author: hr $ $Date: 2005-08-05 12:52:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -243,6 +243,8 @@ struct KernPair KernPair() : first( 0 ), second( 0 ), kern_x( 0 ), kern_y( 0 ) {} }; +class FontCache; + // a class to manage printable fonts // aims are type1 and truetype fonts @@ -434,7 +436,7 @@ class PrintFontManager PrintFont* getFont( fontID nID ) const { - std::hash_map< int, PrintFont* >::const_iterator it; + std::hash_map< fontID, PrintFont* >::const_iterator it; it = m_aFonts.find( nID ); return it == m_aFonts.end() ? NULL : it->second; } -- cgit