diff options
author | 2014-03-20 13:26:45 +0000 | |
---|---|---|
committer | 2014-03-20 13:26:45 +0000 | |
commit | 180e36abf6e5da1688c9da5ef614a78c471834d5 (patch) | |
tree | 43708e07ed605d05e29169ef03ad705ce61cf29b /tools | |
parent | be41d38f1c076c9e4dc595a6e1a4eb5ccdbd307b (diff) |
Revert "hide Config8888 entirely". Broke a bunch of builds.
This reverts commit fa11c49cc11a6c9ebafbf9c59e118917f9b3cc56.
Revert "Sanitizing source files in Housekeeper-Nightly" to make the above revert clean.
This reverts commit b5787422c8eb2a27a9576777597fd9e06784acdb.
TBR=reed@google.com
TBR=jcgregorio@google.com
Review URL: https://codereview.chromium.org/205963003
git-svn-id: http://skia.googlecode.com/svn/trunk@13872 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tools')
-rw-r--r-- | tools/sk_tool_utils.cpp | 31 | ||||
-rw-r--r-- | tools/sk_tool_utils.h | 5 |
2 files changed, 36 insertions, 0 deletions
diff --git a/tools/sk_tool_utils.cpp b/tools/sk_tool_utils.cpp index 3eb55554b6..d13b0d81f8 100644 --- a/tools/sk_tool_utils.cpp +++ b/tools/sk_tool_utils.cpp @@ -17,6 +17,37 @@ const char* colortype_name(SkColorType ct) { } } +void config8888_to_imagetypes(SkCanvas::Config8888 config, SkColorType* ct, SkAlphaType* at) { + switch (config) { + case SkCanvas::kNative_Premul_Config8888: + *ct = kPMColor_SkColorType; + *at = kPremul_SkAlphaType; + break; + case SkCanvas::kNative_Unpremul_Config8888: + *ct = kPMColor_SkColorType; + *at = kUnpremul_SkAlphaType; + break; + case SkCanvas::kBGRA_Premul_Config8888: + *ct = kBGRA_8888_SkColorType; + *at = kPremul_SkAlphaType; + break; + case SkCanvas::kBGRA_Unpremul_Config8888: + *ct = kBGRA_8888_SkColorType; + *at = kUnpremul_SkAlphaType; + break; + case SkCanvas::kRGBA_Premul_Config8888: + *ct = kRGBA_8888_SkColorType; + *at = kPremul_SkAlphaType; + break; + case SkCanvas::kRGBA_Unpremul_Config8888: + *ct = kRGBA_8888_SkColorType; + *at = kUnpremul_SkAlphaType; + break; + default: + SkASSERT(0); + } +} + void write_pixels(SkCanvas* canvas, const SkBitmap& bitmap, int x, int y, SkColorType colorType, SkAlphaType alphaType) { SkBitmap tmp(bitmap); diff --git a/tools/sk_tool_utils.h b/tools/sk_tool_utils.h index 48fd716342..ac1cdabf15 100644 --- a/tools/sk_tool_utils.h +++ b/tools/sk_tool_utils.h @@ -16,6 +16,11 @@ namespace sk_tool_utils { const char* colortype_name(SkColorType); /** + * Return the colorType and alphaType that correspond to the specified Config8888 + */ + void config8888_to_imagetypes(SkCanvas::Config8888, SkColorType*, SkAlphaType*); + + /** * Call canvas->writePixels() by using the pixels from bitmap, but with an info that claims * the pixels are colorType + alphaType */ |