move kConfigCount out of Config enum, so we don't pullute type-checking
git-svn-id: http://skia.googlecode.com/svn/trunk@9759 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index ad18547..0a26f0d 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -59,8 +59,12 @@
* i.e. you may be able to draw from one, but you cannot draw into one.
*/
kRLE_Index8_Config,
-
- kConfigCount
+ };
+
+ // do not add this to the Config enum, otherwise the compiler will let us
+ // pass this as a valid parameter for Config.
+ enum {
+ kConfigCount = kRLE_Index8_Config + 1
};
/**
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 383f0ef..e308b88 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -662,7 +662,6 @@
return SkUnPreMultiply::PMColorToColor((*fColorTable)[dst]);
}
case kNo_Config:
- case kConfigCount:
SkASSERT(false);
return 0;
}