From d923288e50b5a69afb0bdd5c161191b24cab8345 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 10 Apr 2014 22:49:20 +0000 Subject: Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/234243002/) Reason for revert: fixes on the chrome side are landing (brettw), keep fingers crossed. Original issue's description: > Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/227433009/) > > Reason for revert: > breaking the Chrome deps roll. > http://build.chromium.org/p/chromium.linux/builders/Linux%20GN%20%28dbg%29/builds/839/steps/compile/logs/stdio > > Original issue's description: > > Rename kPMColor_SkColorType to kN32_SkColorType. > > > > The new name better represents what this flag means. > > > > BUG=skia:2384 > > > > Committed: http://code.google.com/p/skia/source/detail?r=14117 > > TBR=reed@google.com,scroggo@google.com > NOTREECHECKS=true > NOTRY=true > BUG=skia:2384 > > Committed: http://code.google.com/p/skia/source/detail?r=14144 R=reed@google.com, scroggo@google.com TBR=reed@google.com, scroggo@google.com NOTREECHECKS=true NOTRY=true BUG=skia:2384 Author: bensong@google.com Review URL: https://codereview.chromium.org/233813004 git-svn-id: http://skia.googlecode.com/svn/trunk@14145 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm/bitmapfilters.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gm/bitmapfilters.cpp') diff --git a/gm/bitmapfilters.cpp b/gm/bitmapfilters.cpp index fb3b304eb9..5fa213062b 100644 --- a/gm/bitmapfilters.cpp +++ b/gm/bitmapfilters.cpp @@ -87,7 +87,7 @@ class FilterGM : public GM { make_bm(&fBM8); fBM8.copyTo(&fBM4444, kARGB_4444_SkColorType); fBM8.copyTo(&fBM16, kRGB_565_SkColorType); - fBM8.copyTo(&fBM32, kPMColor_SkColorType); + fBM8.copyTo(&fBM32, kN32_SkColorType); } public: SkBitmap fBM8, fBM4444, fBM16, fBM32; -- cgit v1.2.3