From 28fcae2ec77eb16a79e155f8d788b20457f1c951 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 11 Apr 2014 17:15:40 +0000 Subject: Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/234243002/) Reason for revert: Want to reland the original CL. 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, bensong@google.com TBR=bensong@google.com, reed@google.com NOTREECHECKS=true NOTRY=true BUG=skia:2384 Author: scroggo@google.com Review URL: https://codereview.chromium.org/235523003 git-svn-id: http://skia.googlecode.com/svn/trunk@14156 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm/gammatext.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gm/gammatext.cpp') diff --git a/gm/gammatext.cpp b/gm/gammatext.cpp index 7ee55db2fb..f520754123 100644 --- a/gm/gammatext.cpp +++ b/gm/gammatext.cpp @@ -40,7 +40,7 @@ static bool setFont(SkPaint* paint, const char name[]) { static CGContextRef makeCG(const SkImageInfo& info, const void* addr, size_t rowBytes) { - if (kPMColor_SkColorType != info.colorType() || NULL == addr) { + if (kN32_SkColorType != info.colorType() || NULL == addr) { return NULL; } CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB(); -- cgit v1.2.3