Win32 build fix (unreviewed).
authorsenorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>
Wed, 25 Nov 2009 17:14:32 +0000 (17:14 +0000)
committersenorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>
Wed, 25 Nov 2009 17:14:32 +0000 (17:14 +0000)
git-svn-id: http://skia.googlecode.com/svn/trunk@446 2bbb7eff-a529-9590-31e7-b0007b416f81

src/core/SkScalerContext.cpp

index afa9e48665b23a24a60ce77eed2207373b24b3ee..30acff7eb97129e2692003f9f6956165c2535510 100644 (file)
@@ -312,7 +312,7 @@ void SkScalerContext::getMetrics(SkGlyph* glyph) {
                 glyph->fWidth   = SkToU16(mask.fBounds.width());
                 glyph->fHeight  = SkToU16(mask.fBounds.height());
             } else {
-                goto ERROR;
+                goto SK_ERROR;
             }
         } else {
             // just use devPath
@@ -320,7 +320,7 @@ void SkScalerContext::getMetrics(SkGlyph* glyph) {
             devPath.getBounds().roundOut(&ir);
             
             if (ir.isEmpty() || !ir.is16Bit()) {
-                goto ERROR;
+                goto SK_ERROR;
             }
             glyph->fLeft    = ir.fLeft;
             glyph->fTop     = ir.fTop;
@@ -350,7 +350,7 @@ void SkScalerContext::getMetrics(SkGlyph* glyph) {
     }
     return;
     
-ERROR:
+SK_ERROR:
     // draw nothing 'cause we failed
     glyph->fLeft    = 0;
     glyph->fTop     = 0;