From 115ac10ec99e0796daba3f79aa5fe61b7386dba3 Mon Sep 17 00:00:00 2001 From: "smontagu%netscape.com" Date: Wed, 7 Aug 2002 23:40:35 +0000 Subject: [PATCH] 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 --- mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp | 10 ++++++---- mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp b/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp index cd57245aa8c..94e9e12d602 100644 --- a/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp +++ b/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp @@ -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); diff --git a/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp b/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp index 3e7298f58a0..6671ba664bc 100644 --- a/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp +++ b/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp @@ -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);