diff options
author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-06-18 00:55:18 +0800 |
---|---|---|
committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-06-18 00:55:18 +0800 |
commit | 3e42f71127c1dd30339c8dc6a0d6373db4ce2874 (patch) | |
tree | 23142c39dccb057b3bc731ab6f1ea75464d03635 /www/mozilla/files/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp | |
parent | 41658ef327064067dec9ac88a70424493e202f5b (diff) | |
download | marcuscom-ports-3e42f71127c1dd30339c8dc6a0d6373db4ce2874.tar.gz marcuscom-ports-3e42f71127c1dd30339c8dc6a0d6373db4ce2874.tar.zst marcuscom-ports-3e42f71127c1dd30339c8dc6a0d6373db4ce2874.zip |
These ports have been moved to ports-stable. For the ports module users, be
sure to run 'mergemaster -U'. After that, checkout ports-stable first then
ports second.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11072 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www/mozilla/files/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp')
-rw-r--r-- | www/mozilla/files/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/www/mozilla/files/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp b/www/mozilla/files/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp deleted file mode 100644 index 84392bd4a..000000000 --- a/www/mozilla/files/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-by,v 1.2 2004/07/05 14:22:42 taya Exp $ - -diff -ru ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp ---- ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp 2004-03-19 10:36:16.000000000 +0900 -+++ ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp 2004-07-04 22:59:19.000000000 +0900 -@@ -155,15 +155,15 @@ - - static NS_NAMED_LITERAL_STRING(arial, "arial"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"), -- &arial); -+ (nsDependentString *)&arial); - - static NS_NAMED_LITERAL_STRING(courier, "courier new"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("courier"), -- &courier); -+ (nsDependentString *)&courier); - - static NS_NAMED_LITERAL_STRING(times, "times new roman"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("times"), -- ×); -+ (nsDependentString *)×); - } - - void NS_FreeSVGLibartGlyphMetricsFTGlobals() -@@ -440,19 +440,19 @@ - return; - } - -- FTC_Image_Desc imageDesc; -- imageDesc.font.face_id=(void*)font_data.font_entry.get(); // XXX do we need to addref? -+ FTC_ImageType imageDesc; -+ imageDesc->face_id = (FTC_FaceID)font_data.font_entry.get(); // XXX do we need to addref? - float twipstopixel = GetTwipsToPixels(); - float scale = GetPixelScale(); -- imageDesc.font.pix_width = (int)((float)(font_data.font.size)*twipstopixel/scale); -- imageDesc.font.pix_height = (int)((float)(font_data.font.size)*twipstopixel/scale); -- imageDesc.image_type |= ftc_image_grays; -+ imageDesc->width = (int)((float)(font_data.font.size)*twipstopixel/scale); -+ imageDesc->height = (int)((float)(font_data.font.size)*twipstopixel/scale); -+ imageDesc->flags = 0; - - // get the face - nsresult rv; - FTC_Manager mgr; - nsSVGLibartFreetype::ft2->GetFTCacheManager(&mgr); -- rv = nsSVGLibartFreetype::ft2->ManagerLookupSize(mgr, &imageDesc.font, &mFace, nsnull); -+ rv = nsSVGLibartFreetype::ft2->ManagerLookupFace(mgr, imageDesc->face_id, &mFace); - NS_ASSERTION(mFace, "failed to get face/size"); - } - |