diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-23 03:59:35 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-23 03:59:35 +0000 |
| commit | 8a2ad3cae710f05cca57e48dd1732d575dba2dc7 (patch) | |
| tree | 65d3463543af4bc3d330de2bef37cffc6d10395e /tools/skpdiff | |
| parent | d5b294acad96ffa3ccb5c56f6290036922f76907 (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 'tools/skpdiff')
| -rw-r--r-- | tools/skpdiff/SkDiffContext.cpp | 2 | ||||
| -rw-r--r-- | tools/skpdiff/SkPMetric.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/skpdiff/SkDiffContext.cpp b/tools/skpdiff/SkDiffContext.cpp index df1c93dfd2..b9c55c1fa7 100644 --- a/tools/skpdiff/SkDiffContext.cpp +++ b/tools/skpdiff/SkDiffContext.cpp @@ -122,7 +122,7 @@ void SkDiffContext::addDiff(const char* baselinePath, const char* testPath) { // compute the image diff and output it SkBitmap copy; - diffData.fResult.poiAlphaMask.copyTo(©, SkBitmap::kARGB_8888_Config); + diffData.fResult.poiAlphaMask.copyTo(©, kPMColor_SkColorType); SkImageEncoder::EncodeFile(newRecord->fDifferencePath.c_str(), copy, SkImageEncoder::kPNG_Type, 100); diff --git a/tools/skpdiff/SkPMetric.cpp b/tools/skpdiff/SkPMetric.cpp index 22337d854d..ed807636b6 100644 --- a/tools/skpdiff/SkPMetric.cpp +++ b/tools/skpdiff/SkPMetric.cpp @@ -125,8 +125,8 @@ static void adobergb_to_cielab(float r, float g, float b, LAB* lab) { /// Converts a 8888 bitmap to LAB color space and puts it into the output static bool bitmap_to_cielab(const SkBitmap* bitmap, ImageLAB* outImageLAB) { SkBitmap bm8888; - if (bitmap->config() != SkBitmap::kARGB_8888_Config) { - if (!bitmap->copyTo(&bm8888, SkBitmap::kARGB_8888_Config)) { + if (bitmap->colorType() != kPMColor_SkColorType) { + if (!bitmap->copyTo(&bm8888, kPMColor_SkColorType)) { return false; } bitmap = &bm8888; |