aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-09-22 21:57:03 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-09-22 21:57:03 +0000
commit485e1c01281f5c3632dc47d407ed8c7c86f83a74 (patch)
tree19d864acf3a4e071a042bbbf68ca9f9f8bfe07d3
parentb1b6a467402f14828bc1bea64963e7dbf73996f6 (diff)
Patch SkImage.h so Chrome will compile
git-svn-id: http://skia.googlecode.com/svn/trunk@11429 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--include/core/SkImage.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/core/SkImage.h b/include/core/SkImage.h
index 8e5b8cd02e..beede0338a 100644
--- a/include/core/SkImage.h
+++ b/include/core/SkImage.h
@@ -54,12 +54,12 @@ public:
kLastEnum_ColorType = kBGRA_8888_ColorType
};
- enum AlphaType {
- kIgnore_AlphaType = kIgnore_SkAlphaType,
- kOpaque_AlphaType = kOpaque_SkAlphaType,
- kPremul_AlphaType = kPremul_SkAlphaType,
- kUnpremul_AlphaType = kUnpremul_SkAlphaType,
- };
+ typedef SkAlphaType AlphaType;
+
+ static const SkAlphaType kIgnore_AlphaType = kIgnore_SkAlphaType;
+ static const SkAlphaType kOpaque_AlphaType = kOpaque_SkAlphaType;
+ static const SkAlphaType kPremul_AlphaType = kPremul_SkAlphaType;
+ static const SkAlphaType kUnpremul_AlphaType = kUnpremul_SkAlphaType;
struct Info {
int fWidth;