diff options
| author |  msarett <msarett@google.com> | 2016-05-19 07:50:24 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-19 07:50:24 -0700 |
| commit | 3d477329f2ce93adc2b09dd5d5f20ad2ab4b4f47 (patch) | |
| tree | 810d6b986354c81cf53b471da76e4b333553cfec /src/android | |
| parent | de3c3568ee5137fa8752491362893ae1d701d709 (diff) | |
Delete workaround for matching bitmap and pixel ref rowbytes
We now handle this in:
https://googleplex-android-review.git.corp.google.com/#/c/1051261/
BUG=skia:4538
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1992143003
Review-Url: https://codereview.chromium.org/1992143003
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/SkBitmapRegionCodec.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/android/SkBitmapRegionCodec.cpp b/src/android/SkBitmapRegionCodec.cpp index 065351d2ba..b9c82d941a 100644 --- a/src/android/SkBitmapRegionCodec.cpp +++ b/src/android/SkBitmapRegionCodec.cpp @@ -115,15 +115,8 @@ bool SkBitmapRegionCodec::decodeRegion(SkBitmap* bitmap, SkBRDAllocator* allocat options.fZeroInitialized = zeroInit; void* dst = bitmap->getAddr(scaledOutX, scaledOutY); - // FIXME: skbug.com/4538 - // It is important that we use the rowBytes on the pixelRef. They may not be - // set properly on the bitmap. - SkPixelRef* pr = SkRef(bitmap->pixelRef()); - size_t rowBytes = pr->rowBytes(); - bitmap->setInfo(outInfo, rowBytes); - bitmap->setPixelRef(pr)->unref(); - bitmap->lockPixels(); - SkCodec::Result result = fCodec->getAndroidPixels(decodeInfo, dst, rowBytes, &options); + SkCodec::Result result = fCodec->getAndroidPixels(decodeInfo, dst, bitmap->rowBytes(), + &options); if (SkCodec::kSuccess != result && SkCodec::kIncompleteInput != result) { SkCodecPrintf("Error: Could not get pixels.\n"); return false; |