diff options
author | 2013-12-11 18:04:56 +0000 | |
---|---|---|
committer | 2013-12-11 18:04:56 +0000 | |
commit | 6965a0a2df9d35cd0a25e1738f0388272d03f399 (patch) | |
tree | c7831828095cbd2ea1efe9b44ab876f1aa374f80 /samplecode/SamplePicture.cpp | |
parent | 3a6143d91f06d01f07b3b0e8adfa703a574d2bec (diff) |
PixelRef now returns (nearly) everything that is currently in SkBitmap. The goal is to refactor bitmap later to remove redundancy, and more interestingly, remove the chance for a disconnect between the actual (pixelref) rowbytes and config, and the one claimed by the bitmap.""""
BUG=
Review URL: https://codereview.chromium.org/110503003
git-svn-id: http://skia.googlecode.com/svn/trunk@12622 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode/SamplePicture.cpp')
-rw-r--r-- | samplecode/SamplePicture.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/samplecode/SamplePicture.cpp b/samplecode/SamplePicture.cpp index 66289affe0..2f7d691d17 100644 --- a/samplecode/SamplePicture.cpp +++ b/samplecode/SamplePicture.cpp @@ -40,7 +40,9 @@ static SkBitmap load_bitmap() { if (SkImageDecoder::DecodeStream(stream, &bm, SkBitmap::kNo_Config, SkImageDecoder::kDecodeBounds_Mode)) { - SkPixelRef* pr = new SkImageRef_GlobalPool(stream, bm.config(), 1); + SkImageInfo info; + bm.asImageInfo(&info); + SkPixelRef* pr = new SkImageRef_GlobalPool(info, stream, 1); bm.setPixelRef(pr)->unref(); } } |