commit f58161a735f2d61c4a44bf6a58c99a1822f988c9
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Oct 21 14:12:13 2013 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Oct 21 14:12:13 2013 +0000
tree dfd22f4986819b2b75731e8181458823d48748b4
parent f183a595d32aff678fe3a72ca2d0ea1f40b2a7a6

change ERROR label to BAD_CONFIG -- avoid windows complaint

BUG=

Review URL: https://codereview.chromium.org/32623002

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

core/SkBitmap.cpp

diff --git a/core/SkBitmap.cpp b/core/SkBitmap.cpp
index bad63ba..05f5208 100644
--- a/core/SkBitmap.cpp
+++ b/core/SkBitmap.cpp
@@ -299,17 +299,17 @@
 bool SkBitmap::setConfig(Config config, int width, int height, size_t rowBytes,
                          SkAlphaType alphaType) {
     if ((width | height) < 0) {
-        goto ERROR;
+        goto BAD_CONFIG;
     }
     if (rowBytes == 0) {
         rowBytes = SkBitmap::ComputeRowBytes(config, width);
         if (0 == rowBytes && kNo_Config != config) {
-            goto ERROR;
+            goto BAD_CONFIG;
         }
     }
 
     if (!validate_alphaType(config, alphaType, &alphaType)) {
-        goto ERROR;
+        goto BAD_CONFIG;
     }
 
     this->freePixels();
@@ -326,7 +326,7 @@
     return true;
 
     // if we got here, we had an error, so we reset the bitmap to empty
-ERROR:
+BAD_CONFIG:
     this->reset();
     return false;
 }