aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/bitmapfilters.cpp
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-02-23 03:59:35 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-02-23 03:59:35 +0000
commit8a2ad3cae710f05cca57e48dd1732d575dba2dc7 (patch)
tree65d3463543af4bc3d330de2bef37cffc6d10395e /gm/bitmapfilters.cpp
parentd5b294acad96ffa3ccb5c56f6290036922f76907 (diff)
add new copyTo version to SkBitmap, which takes SkColorType
BUG=skia: R=scroggo@google.com, halcanary@google.com, bsalomon@google.com Author: reed@google.com Review URL: https://codereview.chromium.org/171723007 git-svn-id: http://skia.googlecode.com/svn/trunk@13553 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/bitmapfilters.cpp')
-rw-r--r--gm/bitmapfilters.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/gm/bitmapfilters.cpp b/gm/bitmapfilters.cpp
index 7addf25c01..fb3b304eb9 100644
--- a/gm/bitmapfilters.cpp
+++ b/gm/bitmapfilters.cpp
@@ -85,9 +85,9 @@ class FilterGM : public GM {
}
fOnce = true;
make_bm(&fBM8);
- fBM8.copyTo(&fBM4444, SkBitmap::kARGB_4444_Config);
- fBM8.copyTo(&fBM16, SkBitmap::kRGB_565_Config);
- fBM8.copyTo(&fBM32, SkBitmap::kARGB_8888_Config);
+ fBM8.copyTo(&fBM4444, kARGB_4444_SkColorType);
+ fBM8.copyTo(&fBM16, kRGB_565_SkColorType);
+ fBM8.copyTo(&fBM32, kPMColor_SkColorType);
}
public:
SkBitmap fBM8, fBM4444, fBM16, fBM32;