diff options
Diffstat (limited to 'src/images/SkImageDecoder_libjpeg.cpp')
| -rw-r--r-- | src/images/SkImageDecoder_libjpeg.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
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 |