commit | 682163e115a8e679b3038f4cb9886851e12a4035 | [log] [tgz] |
---|---|---|
author | Mangesh Ghiware <mghiware@google.com> | Wed Oct 10 14:58:35 2012 -0700 |
committer | Mangesh Ghiware <mghiware@google.com> | Wed Oct 10 14:58:35 2012 -0700 |
tree | 8ee6b1b1158aba65020ccc144d9aafa6770fa402 | |
parent | 21832eb7fba76cd101ad5ef7b131292aa24f3864 [diff] |
Disable in-place crop for 360 panorama Bug: 7281479 Change-Id: Id89e25a883a5eab8a91604ebfeab4f178ba1066f
diff --git a/src/com/android/gallery3d/data/LocalImage.java b/src/com/android/gallery3d/data/LocalImage.java index 7006b0a..5d6d39d 100644 --- a/src/com/android/gallery3d/data/LocalImage.java +++ b/src/com/android/gallery3d/data/LocalImage.java
@@ -259,8 +259,8 @@ operation |= SUPPORT_PANORAMA; if (isPanorama360()) { operation |= SUPPORT_PANORAMA360; - // disable destructive rotate for 360 degree panorama - operation &= ~SUPPORT_ROTATE; + // disable destructive rotate and crop for 360 degree panorama + operation &= ~(SUPPORT_ROTATE | SUPPORT_CROP); } } return operation;
diff --git a/src/com/android/gallery3d/data/UriImage.java b/src/com/android/gallery3d/data/UriImage.java index a72ced2..b2cbc7d 100644 --- a/src/com/android/gallery3d/data/UriImage.java +++ b/src/com/android/gallery3d/data/UriImage.java
@@ -224,6 +224,8 @@ supported |= SUPPORT_PANORAMA; if (isPanorama360()) { supported |= SUPPORT_PANORAMA360; + // disable destructive crop for 360 degree panorama + supported &= ~SUPPORT_CROP; } } return supported;