Bug 161556: Arabic bitmap fonts are printed too small. Author=Roland.Mainz@informatik.med.uni-giessen.de, r=smontagu, sr=darin

git-svn-id: svn://10.0.0.236/trunk@126694 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
smontagu%netscape.com 2002-08-07 23:40:35 +00:00
parent b526e4d0db
commit 115ac10ec9
2 changed files with 12 additions and 8 deletions

View File

@ -4076,10 +4076,6 @@ GetFontNames(const char* aPattern, PRBool aAnyFoundry, PRBool aOnlyOutlineScaled
points = atoi(pointSize);
if (pixels) {
if (!NodeAddSize(stretch, pixels, points, 1.0f, resX, resY, name, familyName, weightName,
slant, setWidth, addStyle, spacing, charSetName, charSetInfo))
continue;
if (gScaleBitmapFontsWithDevScale && (gDevScale > 1.0f)) {
/* Add a font size which is exactly scaled as the scaling factor ... */
if (!NodeAddSize(stretch, pixels, points, gDevScale, resX, resY, name, familyName, weightName,
@ -4102,6 +4098,12 @@ GetFontNames(const char* aPattern, PRBool aAnyFoundry, PRBool aOnlyOutlineScaled
continue; /* |NodeAddSize| returned an error in the loop above... */
}
}
else
{
if (!NodeAddSize(stretch, pixels, points, 1.0f, resX, resY, name, familyName, weightName,
slant, setWidth, addStyle, spacing, charSetName, charSetInfo))
continue;
}
}
}
XFreeFontNames(list);

View File

@ -4470,10 +4470,6 @@ GetFontNames(const char* aPattern, PRBool aAnyFoundry, PRBool aOnlyOutlineScaled
points = atoi(pointSize);
if (pixels) {
if (!NodeAddSize(stretch, pixels, points, 1.0f, resX, resY, name, familyName, weightName,
slant, setWidth, addStyle, spacing, charSetName, charSetInfo))
continue;
if (gScaleBitmapFontsWithDevScale && (gDevScale > 1.0f)) {
/* Add a font size which is exactly scaled as the scaling factor ... */
if (!NodeAddSize(stretch, pixels, points, gDevScale, resX, resY, name, familyName, weightName,
@ -4496,6 +4492,12 @@ GetFontNames(const char* aPattern, PRBool aAnyFoundry, PRBool aOnlyOutlineScaled
continue; /* |NodeAddSize| returned an error in the loop above... */
}
}
else
{
if (!NodeAddSize(stretch, pixels, points, 1.0f, resX, resY, name, familyName, weightName,
slant, setWidth, addStyle, spacing, charSetName, charSetInfo))
continue;
}
}
}
XFreeFontNames(list);