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/bitmapcopy.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/bitmapcopy.cpp')
| -rw-r--r-- | gm/bitmapcopy.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gm/bitmapcopy.cpp b/gm/bitmapcopy.cpp index f210b4aa5e..928b4037c1 100644 --- a/gm/bitmapcopy.cpp +++ b/gm/bitmapcopy.cpp @@ -62,14 +62,14 @@ protected: virtual void onDraw(SkCanvas* canvas) { SkPaint paint; - SkScalar horizMargin = 10; - SkScalar vertMargin = 10; + SkScalar horizMargin(SkIntToScalar(10)); + SkScalar vertMargin(SkIntToScalar(10)); - SkBitmap src; - src.allocN32Pixels(40, 40); - SkCanvas canvasTmp(src); + SkBitmapDevice devTmp(SkBitmap::kARGB_8888_Config, 40, 40, false); + SkCanvas canvasTmp(&devTmp); draw_checks(&canvasTmp, 40, 40); + SkBitmap src = canvasTmp.getTopDevice()->accessBitmap(false); for (unsigned i = 0; i < NUM_CONFIGS; ++i) { if (!src.deepCopyTo(&fDst[i], gConfigs[i])) { |