commit 149e9a107c356b0151433fb23c2b1c8d0634947c
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Apr 09 20:45:29 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Apr 09 20:45:29 2014 +0000
tree 7db3bbc9bba71665f1d0c2720c98682afcda2bda
parent 2a6f221bf8cea98bd7b44b02ce5c13a6b334a70d

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

samplecode/SampleEncode.cpp

diff --git a/samplecode/SampleEncode.cpp b/samplecode/SampleEncode.cpp
index 4769fbb..080c05f 100644
--- a/samplecode/SampleEncode.cpp
+++ b/samplecode/SampleEncode.cpp
@@ -43,7 +43,7 @@
                       SkIntToScalar(width)/2, paint);
 
     switch (ct) {
-        case kPMColor_SkColorType:
+        case kN32_SkColorType:
             bm->swap(device);
             break;
         case kRGB_565_SkColorType: {
@@ -81,7 +81,7 @@
 
 // configs to build the original bitmap in. Can be at most these 3
 static const SkColorType gColorTypes[] = {
-    kPMColor_SkColorType,
+    kN32_SkColorType,
     kRGB_565_SkColorType,
     kIndex_8_SkColorType,   // opaque
     kIndex_8_SkColorType    // alpha