From 7f00acbda6d35d2ba445a1e2909bb599b156cc5c Mon Sep 17 00:00:00 2001
From: "zoran.jovanovic" <zoran.jovanovic@sonymobile.com>
Date: Wed, 15 Apr 2015 05:48:54 -0700
Subject: 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
---
 AUTHORS                               |  1 +
 src/images/SkImageDecoder_libjpeg.cpp | 15 +++++++--------
 src/images/SkImageDecoder_libwebp.cpp |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 915393b223..76e2f44de0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -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;
 }
-- 
cgit v1.2.3