summaryrefslogtreecommitdiffstats
path: root/gallerycommon/src/com/android
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-03-14 08:58:24 -0700
committernicolasroard <nicolasroard@google.com>2013-03-14 08:58:24 -0700
commit2e47253cfb049943199faa43c04f77d0bab0b5ee (patch)
tree75d59fd027067788f3572c8ee2a3d02ea9ff7ec0 /gallerycommon/src/com/android
parentc274ded801f745d6318186958107622e7a4fef33 (diff)
downloadandroid_packages_apps_Snap-2e47253cfb049943199faa43c04f77d0bab0b5ee.tar.gz
android_packages_apps_Snap-2e47253cfb049943199faa43c04f77d0bab0b5ee.tar.bz2
android_packages_apps_Snap-2e47253cfb049943199faa43c04f77d0bab0b5ee.zip
Fix for crash upon saving image
Change-Id: I305626a61a07d2290e7d5600da4c26f2a82ab1c9
Diffstat (limited to 'gallerycommon/src/com/android')
-rw-r--r--gallerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java2
-rw-r--r--gallerycommon/src/com/android/gallery3d/exif/ExifTag.java4
2 files changed, 4 insertions, 2 deletions
diff --git a/gallerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java b/gallerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
index 6ea655431..e5a5bf009 100644
--- a/gallerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
+++ b/gallerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
@@ -404,7 +404,7 @@ class ExifOutputStream extends FilterOutputStream {
ifd1.removeTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT));
ifd1.removeTag(ExifInterface
.getTrueTagKey(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH));
- } else {
+ } else if (ifd1 != null) {
// Get rid of offset and length tags if there is no thumbnail.
ifd1.removeTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_STRIP_OFFSETS));
ifd1.removeTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_STRIP_BYTE_COUNTS));
diff --git a/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java b/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java
index 0b31c4df5..24e7f5313 100644
--- a/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java
+++ b/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java
@@ -248,7 +248,9 @@ public class ExifTag {
}
long[] data = new long[value.length];
- System.arraycopy(value, 0, data, 0, value.length);
+ for (int i = 0; i < value.length; i++) {
+ data[i] = value[i];
+ }
mValue = data;
mComponentCountActual = value.length;
return true;