diff -r bbf46f59e123 -r 25ffed67c7ef graphicsdeviceinterface/bitgdi/tbit/TFONT.CPP --- a/graphicsdeviceinterface/bitgdi/tbit/TFONT.CPP Tue Aug 31 16:31:06 2010 +0300 +++ b/graphicsdeviceinterface/bitgdi/tbit/TFONT.CPP Wed Sep 01 12:39:21 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -233,9 +233,6 @@ TInt top=0; TInt bottom=0; - // Maximum height of font allowed by iType rasteriser - const TInt KMaxITypeHeightInPixels = 256; - for (TInt count = 0; count < typefaces; count++) { iDev->TypefaceSupport(info,count); @@ -243,34 +240,11 @@ for (TInt index = 0; index < info.iNumHeights; index++) { TInt height = iDev->FontHeightInPixels(count,index); - if (height > KMaxITypeHeightInPixels) - { - continue; - } fs.iTypeface = info.iTypeface; fs.iHeight = height; User::LeaveIfError(GetNearestFontToDesignHeightInPixels(iFont,fs)); - TInt heightInPixels = iFont->HeightInPixels(); - if ( heightInPixels == height ) - { - TEST( ETrue ); - } - else - { - TOpenFontFaceAttrib attrib; - if( iFont->GetFaceAttrib( attrib ) ) - { - _LIT(KErrorMessageWithFontName, "Font: %S, pixel height requested: %d, pixel height of font: %d"); - INFO_PRINTF4(KErrorMessageWithFontName, &attrib.FullName(), height, heightInPixels); - } - else - { - _LIT(KErrorMessage, "Pixel height requested: %d, pixel height of font: %d"); - INFO_PRINTF3(KErrorMessage, height, heightInPixels); - } - TEST( EFalse ); - } + TEST(iFont->HeightInPixels() == height); if (height >= 5) {