diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-11 18:38:46 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-11 18:38:46 +0000 |
| commit | f3aead2829fa515f790631ee65784a7b9b073343 (patch) | |
| tree | 24de164e4a739d5aa0d03b875775b94b86e0c9e6 /samplecode/SamplePicture.cpp | |
| parent | 6a32add491cc736aab95561d137909cd7c5d65ef (diff) | |
remvoe duplicate impl for SkImageInfo flattening
Revert "Revert "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.""""""
This reverts commit eabd6b2ed4e494b323c08f32358f45950a0368c3.
BUG=
Review URL: https://codereview.chromium.org/108773003
git-svn-id: http://skia.googlecode.com/svn/trunk@12624 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(); } } |