summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CropImage.java
diff options
context:
space:
mode:
authorChih-Chung Chang <chihchung@google.com>2009-07-27 13:03:29 +0800
committerChih-Chung Chang <chihchung@google.com>2009-07-27 14:22:38 +0800
commitce033a5871a0b678521411f9a3acaee2ab279178 (patch)
tree27889d2a8360f96af63e7206330e2cfbb3ed1af0 /src/com/android/camera/CropImage.java
parent187e9f4fd03bdba56ddb4ff4584800abdbef1952 (diff)
downloadLegacyCamera-ce033a5871a0b678521411f9a3acaee2ab279178.zip
LegacyCamera-ce033a5871a0b678521411f9a3acaee2ab279178.tar.gz
LegacyCamera-ce033a5871a0b678521411f9a3acaee2ab279178.tar.bz2
Fix http://b/1991523 by limiting the size of a bitmap when we decode a full image.
computeSampleSize() now accepts not only targetWidthOrHeight but also the size of a bitmap.
Diffstat (limited to 'src/com/android/camera/CropImage.java')
-rw-r--r--src/com/android/camera/CropImage.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/CropImage.java b/src/com/android/camera/CropImage.java
index 8391ca6..0612dc3 100644
--- a/src/com/android/camera/CropImage.java
+++ b/src/com/android/camera/CropImage.java
@@ -179,7 +179,8 @@ public class CropImage extends MonitoredActivity {
public void run() {
final CountDownLatch latch = new CountDownLatch(1);
final Bitmap b = (mImage != null)
- ? mImage.fullSizeBitmap(500)
+ ? mImage.fullSizeBitmap(IImage.UNCONSTRAINED,
+ 1024 * 1024)
: mBitmap;
mHandler.post(new Runnable() {
public void run() {