Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No bug

Browse Source 
r=pedemont, sr=blizzard
OS/2 only - bitmap fonts don't display at all if DPI is neither 96 nor 120


git-svn-id: svn://10.0.0.236/trunk@104756 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkaply%us.ibm.com 2001-10-07 03:48:05 +00:00
parent 03eeb2e9f4
commit 813f42c962
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/gfx/src/os2/nsFontMetricsOS2.cpp
View File

@ -965,7 +965,7 @@ nsresult nsFontMetricsOS2::RealizeFont()
// points size is less than the minimum or more than the maximum point
// size available for Tms Rmn and Helv.
if( gSubstituteVectorFonts &&
(points > 18 || points < 8) &&
(points > 18 || points < 8 || (gDPI != 96 && gDPI != 120)) &&
GetVectorSubstitute( ps, fattrs->szFacename, bBold, bItalic, alias) )
{
PL_strcpy( fattrs->szFacename, alias );
@ -979,10 +979,18 @@ nsresult nsFontMetricsOS2::RealizeFont()
long lFonts = 0;
PFONTMETRICS pMetrics = getMetrics( lFonts, fattrs->szFacename, ps);
nscoord tempDPI;
/* No vector substitute and we still have odd DPI - fix it */
if (gDPI <= 96 ) {
tempDPI = 96;
} else {
tempDPI = 120;
}
int curPoints = 0;
for( int i = 0; i < lFonts; i++)
{
if( pMetrics[i].sYDeviceRes == gDPI )
if( pMetrics[i].sYDeviceRes == tempDPI )
{
if (pMetrics[i].sNominalPointSize / 10 == points)
{