diff options
author | Hung-ying Tyan <tyanh@google.com> | 2012-07-03 18:55:25 +0800 |
---|---|---|
committer | Hung-ying Tyan <tyanh@google.com> | 2012-07-03 18:59:29 +0800 |
commit | 36d9adcad2a0e74c796737d6521ac2d29afe944c (patch) | |
tree | 71e5203c45f4fe2f675637792df4bb2ec11ff2d0 /src/com/android/gallery3d/app/CropImage.java | |
parent | 7aac26484af3d40df81e1d08c673bd925856a7fa (diff) | |
download | android_packages_apps_Snap-36d9adcad2a0e74c796737d6521ac2d29afe944c.tar.gz android_packages_apps_Snap-36d9adcad2a0e74c796737d6521ac2d29afe944c.tar.bz2 android_packages_apps_Snap-36d9adcad2a0e74c796737d6521ac2d29afe944c.zip |
Add ExifTags to hold tag names that are not available in ExifInterface
prior to API level 11.
Bug: 6775786
Change-Id: Iab564f577d9a0b87c8fb7b91eda6cabc12b5a11a
Diffstat (limited to 'src/com/android/gallery3d/app/CropImage.java')
-rw-r--r-- | src/com/android/gallery3d/app/CropImage.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/app/CropImage.java b/src/com/android/gallery3d/app/CropImage.java index 294e285ea..a587624ed 100644 --- a/src/com/android/gallery3d/app/CropImage.java +++ b/src/com/android/gallery3d/app/CropImage.java @@ -49,6 +49,7 @@ import android.widget.Toast; import com.android.gallery3d.R; import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.common.BitmapUtils; +import com.android.gallery3d.common.ExifTags; import com.android.gallery3d.common.Utils; import com.android.gallery3d.data.DataManager; import com.android.gallery3d.data.LocalImage; @@ -989,11 +990,11 @@ public class CropImage extends AbstractGalleryActivity { } // Handle some special values here - String value = oldExif.getAttribute(ExifInterface.TAG_APERTURE); + String value = oldExif.getAttribute(ExifTags.TAG_APERTURE); if (value != null) { try { float aperture = Float.parseFloat(value); - newExif.setAttribute(ExifInterface.TAG_APERTURE, + newExif.setAttribute(ExifTags.TAG_APERTURE, String.valueOf((int) (aperture * 10 + 0.5f)) + "/10"); } catch (NumberFormatException e) { Log.w(TAG, "cannot parse aperture: " + value); @@ -1002,22 +1003,22 @@ public class CropImage extends AbstractGalleryActivity { // TODO: The code is broken, need to fix the JHEAD lib /* - value = oldExif.getAttribute(ExifInterface.TAG_EXPOSURE_TIME); + value = oldExif.getAttribute(ExifTags.TAG_EXPOSURE_TIME); if (value != null) { try { double exposure = Double.parseDouble(value); testToRational("test exposure", exposure); - newExif.setAttribute(ExifInterface.TAG_EXPOSURE_TIME, value); + newExif.setAttribute(ExifTags.TAG_EXPOSURE_TIME, value); } catch (NumberFormatException e) { Log.w(TAG, "cannot parse exposure time: " + value); } } - value = oldExif.getAttribute(ExifInterface.TAG_ISO); + value = oldExif.getAttribute(ExifTags.TAG_ISO); if (value != null) { try { int iso = Integer.parseInt(value); - newExif.setAttribute(ExifInterface.TAG_ISO, String.valueOf(iso) + "/1"); + newExif.setAttribute(ExifTags.TAG_ISO, String.valueOf(iso) + "/1"); } catch (NumberFormatException e) { Log.w(TAG, "cannot parse exposure time: " + value); } |