rpms/mozilla/devel firefox-1.0-pango-rounding.patch, NONE, 1.1 mozilla.sh.in, 1.6, 1.7 mozilla.spec, 1.53, 1.54 sources, 1.27, 1.28
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Mar 22 22:15:01 UTC 2005
Update of /cvs/dist/rpms/mozilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8061
Modified Files:
mozilla.sh.in mozilla.spec sources
Added Files:
firefox-1.0-pango-rounding.patch
Log Message:
* Tue Mar 22 2005 Christopher Aillon <caillon at redhat.com> 37:1.7.6-2
- Update to 1.7.6 final version
- Add patch from blizzard to hopefully fix issue with italic rendering
with some fonts (e.g. Tahoma)
firefox-1.0-pango-rounding.patch:
nsFontMetricsPango.cpp | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
--- NEW FILE firefox-1.0-pango-rounding.patch ---
--- mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.foo 2005-03-21 17:09:14.000000000 -0500
+++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp 2005-03-21 17:16:53.000000000 -0500
@@ -501,13 +501,11 @@
pango_layout_get_size(layout, &width, &height);
- width /= PANGO_SCALE;
-
g_object_unref(layout);
float f;
f = mDeviceContext->DevUnitsToAppUnits();
- aWidth = NSToCoordRound(width * f);
+ aWidth = NSToCoordRound(width * f / PANGO_SCALE);
// printf("GetWidth (char *) %d\n", aWidth);
@@ -541,11 +539,9 @@
FixupSpaceWidths(layout, text);
pango_layout_get_size(layout, &width, &height);
- width /= PANGO_SCALE;
-
float f;
f = mDeviceContext->DevUnitsToAppUnits();
- aWidth = NSToCoordRound(width * f);
+ aWidth = NSToCoordRound(width * f / PANGO_SCALE);
// printf("GetWidth %d\n", aWidth);
@@ -601,9 +597,9 @@
float P2T;
P2T = mDeviceContext->DevUnitsToAppUnits();
- aDimensions.width = NSToCoordRound(rect.width / PANGO_SCALE * P2T);
- aDimensions.ascent = NSToCoordRound(PANGO_ASCENT(rect) / PANGO_SCALE * P2T);
- aDimensions.descent = NSToCoordRound(PANGO_DESCENT(rect) / PANGO_SCALE * P2T);
+ aDimensions.width = NSToCoordRound(rect.width * P2T / PANGO_SCALE);
+ aDimensions.ascent = NSToCoordRound(PANGO_ASCENT(rect) * P2T / PANGO_SCALE);
+ aDimensions.descent = NSToCoordRound(PANGO_DESCENT(rect) * P2T / PANGO_SCALE);
// printf("GetTextDimensions %d %d %d\n", aDimensions.width,
//aDimensions.ascent, aDimensions.descent);
@@ -880,12 +876,12 @@
P2T = mDeviceContext->DevUnitsToAppUnits();
aBoundingMetrics.leftBearing =
- NSToCoordRound(rect.x / PANGO_SCALE * P2T);
+ NSToCoordRound(rect.x * P2T / PANGO_SCALE);
aBoundingMetrics.rightBearing =
- NSToCoordRound(rect.width / PANGO_SCALE * P2T);
- aBoundingMetrics.width = NSToCoordRound((rect.x + rect.width) / PANGO_SCALE * P2T);
- aBoundingMetrics.ascent = NSToCoordRound(rect.y / PANGO_SCALE * P2T);
- aBoundingMetrics.descent = NSToCoordRound(rect.height / PANGO_SCALE * P2T);
+ NSToCoordRound(rect.width * P2T / PANGO_SCALE);
+ aBoundingMetrics.width = NSToCoordRound((rect.x + rect.width) * P2T / PANGO_SCALE);
+ aBoundingMetrics.ascent = NSToCoordRound(rect.y * P2T / PANGO_SCALE);
+ aBoundingMetrics.descent = NSToCoordRound(rect.height * P2T / PANGO_SCALE);
loser:
g_free(text);
@@ -1118,11 +1114,11 @@
// Convert the width into app units
for (int i = 0; i < n_ranges; i++) {
- aWidth += (ranges[(i * 2) + 1] - ranges[(i * 2)]) / PANGO_SCALE;
+ aWidth += (ranges[(i * 2) + 1] - ranges[(i * 2)]);
}
f = mDeviceContext-> DevUnitsToAppUnits();
- aWidth = nscoord(aWidth * f);
+ aWidth = nscoord(aWidth * f / PANGO_SCALE);
loser:
if (ranges)
Index: mozilla.sh.in
===================================================================
RCS file: /cvs/dist/rpms/mozilla/devel/mozilla.sh.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mozilla.sh.in 20 Dec 2004 19:57:50 -0000 1.6
+++ mozilla.sh.in 22 Mar 2005 22:14:58 -0000 1.7
@@ -79,7 +79,6 @@
MOZ_ENABLE_PANGO=1
export MOZ_ENABLE_PANGO
-
# Figure out if we need to ser LD_ASSUME_KERNEL for older versions of the JVM.
function set_jvm_vars() {
Index: mozilla.spec
===================================================================
RCS file: /cvs/dist/rpms/mozilla/devel/mozilla.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- mozilla.spec 17 Mar 2005 00:06:44 -0000 1.53
+++ mozilla.spec 22 Mar 2005 22:14:58 -0000 1.54
@@ -9,11 +9,10 @@
Name: mozilla
Summary: Web browser and mail reader
Version: 1.7.6
-Release: 0.cvs.20050313
+Release: 2
Epoch: 37
License: MPL/NPL/GPL/LGPL
-#Source0: mozilla-source-%{version}.tar.bz2
-Source0: mozilla-1.7.6-cvs20050313.tar.bz2
+Source0: mozilla-source-%{version}.tar.bz2
Source1: mozilla.sh.in
Source2: mozilla-icon.png
Source4: mozilla.desktop
@@ -46,6 +45,7 @@
Patch40: mozilla-1.7.3-pango-render.patch
Patch41: firefox-1.0-pango-selection.patch
Patch42: firefox-1.0-pango-space-width.patch
+Patch43: firefox-1.0-pango-rounding.patch
Patch91: mozilla-1.7.3-gtk-file-chooser-trunk.patch
Patch92: mozilla-1.7.3-gtk-file-chooser-updates.patch
@@ -209,6 +209,7 @@
%patch40 -p1
%patch41 -p1
%patch42 -p1
+%patch43 -p1
# GTK+ File Chooser
%patch91 -p0
@@ -786,6 +787,11 @@
%{mozdir}/xpt_link
%changelog
+* Tue Mar 22 2005 Christopher Aillon <caillon at redhat.com> 37:1.7.6-2
+- Update to 1.7.6 final version
+- Add patch from blizzard to hopefully fix issue with italic rendering
+ with some fonts (e.g. Tahoma)
+
* Wed Mar 16 2005 Christopher Aillon <caillon at redhat.com>
- Correct the location for the gre.conf to /etc/gre.d/
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mozilla/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources 13 Mar 2005 17:49:32 -0000 1.27
+++ sources 22 Mar 2005 22:14:58 -0000 1.28
@@ -1 +1 @@
-1c3817e6825a5dfdfc1a707081ac2d2e mozilla-1.7.6-cvs20050313.tar.bz2
+09c78e9e51d8b11b2d3059987ef42fd0 mozilla-source-1.7.6.tar.bz2
More information about the fedora-cvs-commits
mailing list