diff options
| author |  zoran.jovanovic <zoran.jovanovic@sonymobile.com> | 2015-04-15 05:48:54 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-15 05:48:54 -0700 |
| commit | 7f00acbda6d35d2ba445a1e2909bb599b156cc5c (patch) | |
| tree | 7a19b0ca5c81881d33d91a3b892b74b0d0ca418a /src/images | |
| parent | ad802c66c96e40016d4ba13b6dac3e6c6f17a774 (diff) | |
Return cropBitmap
cropBitmap returns 'true' on success and 'false' on failure.
Propagate its return value so that cascading failures can be avoided.
Signed-off-by: Mykola Kondratenko <mykola.kondratenko@sonymobile.com>
BUG=skia:
Review URL: https://codereview.chromium.org/1088093003
Diffstat (limited to 'src/images')
| -rw-r--r-- | src/images/SkImageDecoder_libjpeg.cpp | 15 | ||||
| -rw-r--r-- | src/images/SkImageDecoder_libwebp.cpp | 4 |
2 files changed, 9 insertions, 10 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 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; } |