commit 7f00acbda6d35d2ba445a1e2909bb599b156cc5c
author zoran.jovanovic <zoran.jovanovic@sonymobile.com> Wed Apr 15 05:48:54 2015 -0700
committer Commit bot <commit-bot@chromium.org> Wed Apr 15 05:48:54 2015 -0700
tree 7a19b0ca5c81881d33d91a3b892b74b0d0ca418a
parent ad802c66c96e40016d4ba13b6dac3e6c6f17a774

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

src/images/SkImageDecoder_libjpeg.cpp

diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp
index 14df6e3..d5303ec 100644
--- a/src/images/SkImageDecoder_libjpeg.cpp
+++ b/src/images/SkImageDecoder_libjpeg.cpp
@@ -1125,11 +1125,11 @@
 
         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 @@
     }
     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