summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2012-11-01 12:54:31 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-01 12:54:31 -0700
commite226d337ec69337fb35c664fda8c83ac7e54c36a (patch)
treeaa8137a7682baadf6fb959392008acd831a0888b
parent37dfa8109d0147a076bdc64bca696a494dce756e (diff)
parent4f4c036e8537ab76301f7ad0faadf42a15538d7e (diff)
downloadandroid_packages_apps_Snap-e226d337ec69337fb35c664fda8c83ac7e54c36a.tar.gz
android_packages_apps_Snap-e226d337ec69337fb35c664fda8c83ac7e54c36a.tar.bz2
android_packages_apps_Snap-e226d337ec69337fb35c664fda8c83ac7e54c36a.zip
am 769d38db: Fix tiny planet not using XMP metadata anymore
* commit '769d38db5736cd690ab7837c0824572739c39184': Fix tiny planet not using XMP metadata anymore
-rw-r--r--src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
index 61aa21b33..423e55828 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
@@ -80,10 +80,14 @@ public class ImageFilterTinyPlanet extends ImageFilter {
int w = bitmapIn.getWidth();
int h = bitmapIn.getHeight();
int outputSize = (int) (w / 2f);
-
ImagePreset preset = getImagePreset();
- if (preset != null && preset.isPanoramaSafe()) {
- bitmapIn = applyXmp(bitmapIn, preset, w);
+
+ if (preset != null) {
+ XMPMeta xmp = preset.getImageLoader().getXmpObject();
+ // Do nothing, just use bitmapIn as is if we don't have XMP.
+ if(xmp != null) {
+ bitmapIn = applyXmp(bitmapIn, xmp, w);
+ }
}
Bitmap mBitmapOut = Bitmap.createBitmap(
@@ -93,13 +97,8 @@ public class ImageFilterTinyPlanet extends ImageFilter {
return mBitmapOut;
}
- private Bitmap applyXmp(Bitmap bitmapIn, ImagePreset preset, int intermediateWidth) {
+ private Bitmap applyXmp(Bitmap bitmapIn, XMPMeta xmp, int intermediateWidth) {
try {
- XMPMeta xmp = preset.getImageLoader().getXmpObject();
- if (xmp == null) {
- // Do nothing, just use bitmapIn as is.
- return bitmapIn;
- }
int croppedAreaWidth =
getInt(xmp, CROPPED_AREA_IMAGE_WIDTH_PIXELS);
int croppedAreaHeight =