summaryrefslogtreecommitdiff
path: root/time/sunbird/patches/patch-ai
diff options
context:
space:
mode:
Diffstat (limited to 'time/sunbird/patches/patch-ai')
-rw-r--r--time/sunbird/patches/patch-ai21
1 files changed, 15 insertions, 6 deletions
diff --git a/time/sunbird/patches/patch-ai b/time/sunbird/patches/patch-ai
index 46dca913c53..8be97ea2ef7 100644
--- a/time/sunbird/patches/patch-ai
+++ b/time/sunbird/patches/patch-ai
@@ -1,8 +1,17 @@
-$NetBSD: patch-ai,v 1.1.1.1 2006/02/05 21:56:25 ghen Exp $
+$NetBSD: patch-ai,v 1.2 2006/10/19 10:27:06 markd Exp $
---- gfx/src/ps/nsFontMetricsPS.cpp.orig 2006-02-02 16:57:57.000000000 +0100
+--- gfx/src/ps/nsFontMetricsPS.cpp.orig 2006-05-07 14:01:25.000000000 +1200
+++ gfx/src/ps/nsFontMetricsPS.cpp
-@@ -1859,10 +1859,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
+@@ -993,7 +993,7 @@ nsFontPSXft::FindFont(PRUnichar aChar, c
+
+ fontps *fps = new fontps;
+ fps->entry = xftEntry;
+- fps->charset = fc_charset;
++ fps->charset = FcCharSetCopy (fc_charset);
+ fps->fontps = nsnull;
+ fpi.fontps->AppendElement(fps);
+ }
+@@ -1868,10 +1868,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
mPixelSize = NSToIntRound(app2dev * mFont->size);
@@ -17,7 +26,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2006/02/05 21:56:25 ghen Exp $
nsresult rv;
mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1896,7 +1896,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
+@@ -1905,7 +1905,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
if (!face)
return 0;
@@ -26,7 +35,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2006/02/05 21:56:25 ghen Exp $
nsresult rv = mFt2->GetImageCache(&iCache);
if (NS_FAILED(rv)) {
NS_ERROR("Failed to get Image Cache");
-@@ -1934,8 +1934,8 @@ nsFontPSFreeType::getFTFace()
+@@ -1943,8 +1943,8 @@ nsFontPSFreeType::getFTFace()
FTC_Manager cManager;
mFt2->GetFTCacheManager(&cManager);
@@ -37,7 +46,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2006/02/05 21:56:25 ghen Exp $
NS_ASSERTION(rv==0, "failed to get face/size");
if (rv)
return nsnull;
-@@ -2379,16 +2379,16 @@ void nsFT2Type1Generator::GeneratePSFont
+@@ -2388,16 +2388,16 @@ void nsFT2Type1Generator::GeneratePSFont
mEntry->GetFamilyName(fontName);
mEntry->GetStyleName(styleName);