summaryrefslogtreecommitdiffstats
path: root/gallerycommon/src/com
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2013-01-15 17:23:40 -0800
committerRuben Brunk <rubenbrunk@google.com>2013-01-15 17:27:03 -0800
commit29aeb6bc6ca5e750fad9ff1da351b25969513030 (patch)
tree92b568377b07b8981c651182e46a2f2a33604839 /gallerycommon/src/com
parentde5d6c6a14c1250dc43c40f5b22cf6ff69362f17 (diff)
downloadandroid_packages_apps_Snap-29aeb6bc6ca5e750fad9ff1da351b25969513030.zip
android_packages_apps_Snap-29aeb6bc6ca5e750fad9ff1da351b25969513030.tar.gz
android_packages_apps_Snap-29aeb6bc6ca5e750fad9ff1da351b25969513030.tar.bz2
Fix exif data saving for picasa images.
Bug: 7910836 Change-Id: I8ec1a1ab379c35b0602689a8f7850f5c861e0189
Diffstat (limited to 'gallerycommon/src/com')
-rw-r--r--gallerycommon/src/com/android/gallery3d/common/Utils.java5
-rw-r--r--gallerycommon/src/com/android/gallery3d/exif/ExifParser.java4
2 files changed, 6 insertions, 3 deletions
diff --git a/gallerycommon/src/com/android/gallery3d/common/Utils.java b/gallerycommon/src/com/android/gallery3d/common/Utils.java
index 3a68745..614a081 100644
--- a/gallerycommon/src/com/android/gallery3d/common/Utils.java
+++ b/gallerycommon/src/com/android/gallery3d/common/Utils.java
@@ -26,6 +26,7 @@ import android.text.TextUtils;
import android.util.Log;
import java.io.Closeable;
+import java.io.IOException;
import java.io.InterruptedIOException;
public class Utils {
@@ -173,8 +174,8 @@ public class Utils {
if (c == null) return;
try {
c.close();
- } catch (Throwable t) {
- Log.w(TAG, "close fail", t);
+ } catch (IOException t) {
+ Log.w(TAG, "close fail ", t);
}
}
diff --git a/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java b/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java
index a1ce13e..1e4803f 100644
--- a/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java
+++ b/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java
@@ -179,6 +179,9 @@ public class ExifParser {
private ExifParser(InputStream inputStream, int options)
throws IOException, ExifInvalidFormatException {
+ if (inputStream == null) {
+ throw new IOException("Null argument inputStream to ExifParser");
+ }
mContainExifData = seekTiffData(inputStream);
mTiffStream = new CountedDataInputStream(inputStream);
mOptions = options;
@@ -682,7 +685,6 @@ public class ExifParser {
private boolean seekTiffData(InputStream inputStream) throws IOException,
ExifInvalidFormatException {
CountedDataInputStream dataStream = new CountedDataInputStream(inputStream);
-
if (dataStream.readShort() != JpegHeader.SOI) {
throw new ExifInvalidFormatException("Invalid JPEG format");
}