diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-13 15:29:03 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-13 15:29:03 +0000 |
| commit | bda591c739001b41d77048d680f81e05723cbc05 (patch) | |
| tree | 80f0326a191c966bc34057e4011bdb3233bc2a50 /gm/gammatext.cpp | |
| parent | b2d93a91222dac2edb3c19128fd58fa2e74272aa (diff) | |
Revert of add peekPixels to SkCanvas and SkSurface (https://codereview.chromium.org/161733002/)
Reason for revert:
compile issues with gm/xfermodes3
Original issue's description:
> add peekPixels to SkCanvas and SkSurface
>
> clone of https://codereview.chromium.org/159723006/
>
> Committed: https://code.google.com/p/skia/source/detail?r=13427
R=jvanverth@google.com
NOTREECHECKS=true
NOTRY=true
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/163823002
git-svn-id: http://skia.googlecode.com/svn/trunk@13428 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/gammatext.cpp')
| -rw-r--r-- | gm/gammatext.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/gm/gammatext.cpp b/gm/gammatext.cpp index 7ee55db2fb..99642f6e3e 100644 --- a/gm/gammatext.cpp +++ b/gm/gammatext.cpp @@ -38,14 +38,14 @@ static bool setFont(SkPaint* paint, const char name[]) { #import <ApplicationServices/ApplicationServices.h> #define BITMAP_INFO_RGB (kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host) -static CGContextRef makeCG(const SkImageInfo& info, const void* addr, - size_t rowBytes) { - if (kPMColor_SkColorType != info.colorType() || NULL == addr) { +static CGContextRef makeCG(const SkBitmap& bm) { + if (SkBitmap::kARGB_8888_Config != bm.config() || + NULL == bm.getPixels()) { return NULL; } CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB(); - CGContextRef cg = CGBitmapContextCreate((void*)addr, info.width(), info.height(), - 8, rowBytes, space, BITMAP_INFO_RGB); + CGContextRef cg = CGBitmapContextCreate(bm.getPixels(), bm.width(), bm.height(), + 8, bm.rowBytes(), space, BITMAP_INFO_RGB); CFRelease(space); CGContextSetAllowsFontSubpixelQuantization(cg, false); @@ -143,15 +143,7 @@ protected: virtual void onDraw(SkCanvas* canvas) { #ifdef SK_BUILD_FOR_MAC - CGContextRef cg = 0; - { - SkImageInfo info; - size_t rowBytes; - const void* addr = canvas->peekPixels(&info, &rowBytes); - if (addr) { - cg = makeCG(info, addr, rowBytes); - } - } + CGContextRef cg = makeCG(canvas->getDevice()->accessBitmap(false)); #endif drawGrad(canvas); |