diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | src/images/SkImageDecoder_libjpeg.cpp | 15 | ||||
| -rw-r--r-- | src/images/SkImageDecoder_libwebp.cpp | 4 |
3 files changed, 10 insertions, 10 deletions
@@ -31,6 +31,7 @@ Samsung <*@samsung.com> Samsung Open Source Group <*@osg.samsung.com> Skia <*@skia.org> Skia Buildbots <skia.buildbots@gmail.com> +Sony Mobile Communications Inc. <*@sonymobile.com> Steve Singer <steve@ssinger.info> The Chromium Authors <*@chromium.org> Thiago Fransosi Farina <thiago.farina@gmail.com> diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp index 14df6e38b2..d5303ec434 100644 --- a/src/images/SkImageDecoder_libjpeg.cpp +++ b/src/images/SkImageDecoder_libjpeg.cpp @@ -1125,11 +1125,11 @@ bool SkJPEGImageDecoder::onDecodeSubset(SkBitmap* bm, const SkIRect& region) { if (swapOnly) { bm->swap(bitmap); - } else { - cropBitmap(bm, &bitmap, actualSampleSize, region.x(), region.y(), - region.width(), region.height(), startX, startY); + return true; } - return true; + + return cropBitmap(bm, &bitmap, actualSampleSize, region.x(), region.y(), + region.width(), region.height(), startX, startY); } #endif @@ -1184,11 +1184,10 @@ bool SkJPEGImageDecoder::onDecodeSubset(SkBitmap* bm, const SkIRect& region) { } if (swapOnly) { bm->swap(bitmap); - } else { - cropBitmap(bm, &bitmap, actualSampleSize, region.x(), region.y(), - region.width(), region.height(), startX, startY); + return true; } - return true; + return cropBitmap(bm, &bitmap, actualSampleSize, region.x(), region.y(), + region.width(), region.height(), startX, startY); } #endif diff --git a/src/images/SkImageDecoder_libwebp.cpp b/src/images/SkImageDecoder_libwebp.cpp index decccd17fb..a7c9610d07 100644 --- a/src/images/SkImageDecoder_libwebp.cpp +++ b/src/images/SkImageDecoder_libwebp.cpp @@ -395,8 +395,8 @@ bool SkWEBPImageDecoder::onDecodeSubset(SkBitmap* decodedBitmap, } if (!directDecode) { - cropBitmap(decodedBitmap, bitmap, sampleSize, region.x(), region.y(), - region.width(), region.height(), rect.x(), rect.y()); + return cropBitmap(decodedBitmap, bitmap, sampleSize, region.x(), region.y(), + region.width(), region.height(), rect.x(), rect.y()); } return true; } |