Index: src/images/SkImageDecoder_libjpeg.cpp |
diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp |
index 14df6e38b223c919ed739dcaf497a65591eba4b6..d5303ec434e674318f37c8b852cf863f9745ff41 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 |