aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2009-11-25 17:14:32 +0000
committerGravatar senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2009-11-25 17:14:32 +0000
commit7767cd87fdadeed868457a2407e8b0a50006fc4a (patch)
treea3d3cd767cd871d404ced973ff98eae1ea125c99
parent55e76b209c9249308a9ba3d75c2472dd55e9d298 (diff)
Win32 build fix (unreviewed).
git-svn-id: http://skia.googlecode.com/svn/trunk@446 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--src/core/SkScalerContext.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp
index afa9e48665..30acff7eb9 100644
--- a/src/core/SkScalerContext.cpp
+++ b/src/core/SkScalerContext.cpp
@@ -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;