summaryrefslogtreecommitdiff
path: root/graphics/java
diff options
context:
space:
mode:
author Owen Lin <owenlin@google.com> 2012-05-21 12:42:33 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2012-05-21 12:42:33 -0700
commit4405a21a6f65beeb06a37ab28ab6315849aefbac (patch)
tree510720db8d28e12e083c225561ad299755a42801 /graphics/java
parent32d5bad602b95050d4ab6bf8bfb7189c5479e56e (diff)
parent5558f66efe43654c97b851b67a099df0de5429ad (diff)
am 5558f66e: am cb949887: Merge "Release the constraint on the requested version." into jb-dev
* commit '5558f66efe43654c97b851b67a099df0de5429ad': Release the constraint on the requested version.
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/graphics/BitmapRegionDecoder.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/graphics/java/android/graphics/BitmapRegionDecoder.java b/graphics/java/android/graphics/BitmapRegionDecoder.java
index 496e0c71d837..c1d34076c9d5 100644
--- a/graphics/java/android/graphics/BitmapRegionDecoder.java
+++ b/graphics/java/android/graphics/BitmapRegionDecoder.java
@@ -180,9 +180,9 @@ public final class BitmapRegionDecoder {
*/
public Bitmap decodeRegion(Rect rect, BitmapFactory.Options options) {
checkRecycled("decodeRegion called on recycled region decoder");
- if (rect.left < 0 || rect.top < 0 || rect.right > getWidth()
- || rect.bottom > getHeight())
- throw new IllegalArgumentException("rectangle is not inside the image");
+ if (rect.right <= 0 || rect.bottom <= 0 || rect.left >= getWidth()
+ || rect.top >= getHeight())
+ throw new IllegalArgumentException("rectangle is outside the image");
return nativeDecodeRegion(mNativeBitmapRegionDecoder, rect.left, rect.top,
rect.right - rect.left, rect.bottom - rect.top, options);
}