diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-09 20:45:29 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-09 20:45:29 +0000 |
| commit | 149e9a107c356b0151433fb23c2b1c8d0634947c (patch) | |
| tree | 7db3bbc9bba71665f1d0c2720c98682afcda2bda /tools | |
| parent | 2a6f221bf8cea98bd7b44b02ce5c13a6b334a70d (diff) | |
Rename kPMColor_SkColorType to kN32_SkColorType.
The new name better represents what this flag means.
BUG=skia:2384
R=reed@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/227433009
git-svn-id: http://skia.googlecode.com/svn/trunk@14117 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/skdiff_utils.cpp | 2 | ||||
| -rw-r--r-- | tools/skimage_main.cpp | 4 | ||||
| -rw-r--r-- | tools/skpdiff/SkDiffContext.cpp | 2 | ||||
| -rw-r--r-- | tools/skpdiff/SkPMetric.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tools/skdiff_utils.cpp b/tools/skdiff_utils.cpp index 2f052395c8..5ca3d8085d 100644 --- a/tools/skdiff_utils.cpp +++ b/tools/skdiff_utils.cpp @@ -85,7 +85,7 @@ static void force_all_opaque(const SkBitmap& bitmap) { bool write_bitmap(const SkString& path, const SkBitmap& bitmap) { SkBitmap copy; - bitmap.copyTo(©, kPMColor_SkColorType); + bitmap.copyTo(©, kN32_SkColorType); force_all_opaque(copy); return SkImageEncoder::EncodeFile(path.c_str(), copy, SkImageEncoder::kPNG_Type, 100); diff --git a/tools/skimage_main.cpp b/tools/skimage_main.cpp index d34d57cd35..634a71d46a 100644 --- a/tools/skimage_main.cpp +++ b/tools/skimage_main.cpp @@ -164,7 +164,7 @@ static bool write_bitmap(const char outDir[], const char src[], return true; } - if (bm.colorType() == kPMColor_SkColorType) { + if (bm.colorType() == kN32_SkColorType) { // First attempt at encoding failed, and the bitmap was already 8888. Making // a copy is not going to help. return false; @@ -172,7 +172,7 @@ static bool write_bitmap(const char outDir[], const char src[], // Encoding failed. Copy to 8888 and try again. SkBitmap bm8888; - if (!bm.copyTo(&bm8888, kPMColor_SkColorType)) { + if (!bm.copyTo(&bm8888, kN32_SkColorType)) { return false; } return SkImageEncoder::EncodeFile(filename.c_str(), bm8888, SkImageEncoder::kPNG_Type, 100); diff --git a/tools/skpdiff/SkDiffContext.cpp b/tools/skpdiff/SkDiffContext.cpp index b9c55c1fa7..6f0b09f082 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(©, kPMColor_SkColorType); + diffData.fResult.poiAlphaMask.copyTo(©, kN32_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 ed807636b6..beba4974b7 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->colorType() != kPMColor_SkColorType) { - if (!bitmap->copyTo(&bm8888, kPMColor_SkColorType)) { + if (bitmap->colorType() != kN32_SkColorType) { + if (!bitmap->copyTo(&bm8888, kN32_SkColorType)) { return false; } bitmap = &bm8888; |