commit b2f92f07d7b6d17b30ce5e89393ce2016a35abc4
author reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Apr 23 05:06:33 2009 +0000
committer reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Apr 23 05:06:33 2009 +0000
tree 61c915655e132a216fb4d805089df3a7dd59ee67
parent cc3096ba6d437b29f1cbd34c237607419cbed72b

fix mac build



git-svn-id: http://skia.googlecode.com/svn/trunk@158 2bbb7eff-a529-9590-31e7-b0007b416f81

src/ports/SkFontHost_mac.cpp

diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp
index 2d07a6d..e9dfc6a 100755
--- a/src/ports/SkFontHost_mac.cpp
+++ b/src/ports/SkFontHost_mac.cpp
@@ -244,12 +244,6 @@
     glyph->fHeight = screenMetrics.height + 2;
     glyph->fLeft = sk_float_round2int(screenMetrics.topLeft.x) - 1;
     glyph->fTop = -sk_float_round2int(screenMetrics.topLeft.y) - 1;
-
-    // FIXME:
-    mx->fAvgCharWidth = 0;
-    mx->fXMin = 0;
-    mx->fXMax = 0;
-    mx->fXHeight = 0;
 }
 
 void SkScalerContext_Mac::generateImage(const SkGlyph& glyph)
@@ -387,6 +381,11 @@
         mx->fDescent = pts[2].fX;
         mx->fBottom = pts[3].fX;
         mx->fLeading = pts[4].fX;
+        // FIXME:
+        mx->fAvgCharWidth = 0;
+        mx->fXMin = 0;
+        mx->fXMax = 0;
+        mx->fXHeight = 0;
     }
     if (my) {
         my->fTop = pts[0].fY;
@@ -394,6 +393,11 @@
         my->fDescent = pts[2].fY;
         my->fBottom = pts[3].fY;
         my->fLeading = pts[4].fY;
+        // FIXME:
+        my->fAvgCharWidth = 0;
+        my->fXMin = 0;
+        my->fXMax = 0;
+        my->fXHeight = 0;
     }
 }