diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-25 12:00:30 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-25 12:00:30 +0000 |
| commit | 1121170477302e25ef2a020cf2092aa6b399b3ef (patch) | |
| tree | 8202440265569ad57c1aa3238f643be66b25506d /tools | |
| parent | 9b62aa156bcf1db6f11af9302bf8bb8ef2567142 (diff) | |
implement readPixels and writePixels natively, w/o using the (deprecated)
SkCanvas::Config8888 enum.
Revert "Revert "hide Config8888 entirely". Broke a bunch of builds."
This reverts commit 763277ba157fef0f651004bb98a189e9f1ac730b.
Needs chrome to remove the READPIXELS guard from skia's .gyp
Review URL: https://codereview.chromium.org/199733016
git-svn-id: http://skia.googlecode.com/svn/trunk@13931 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, 0 insertions, 36 deletions
diff --git a/tools/sk_tool_utils.cpp b/tools/sk_tool_utils.cpp index d13b0d81f8..3eb55554b6 100644 --- a/tools/sk_tool_utils.cpp +++ b/tools/sk_tool_utils.cpp @@ -17,37 +17,6 @@ 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 ac1cdabf15..48fd716342 100644 --- a/tools/sk_tool_utils.h +++ b/tools/sk_tool_utils.h @@ -16,11 +16,6 @@ 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 */ |