diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2012-09-02 20:12:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-02 20:12:28 -0700 |
| commit | 4a3b0de9f672b7840db4436986c46dea3cb03d0d (patch) | |
| tree | af0cda858e48faaac2264625fb0c0d3b153fff4a | |
| parent | 3a1a370a96a2a09e640e67e370aec8f6a9d93bb4 (diff) | |
| parent | 397d48c17b398c72ea40f8d0b47a90488d9f8abf (diff) | |
| download | android_packages_apps_Snap-4a3b0de9f672b7840db4436986c46dea3cb03d0d.tar.gz android_packages_apps_Snap-4a3b0de9f672b7840db4436986c46dea3cb03d0d.tar.bz2 android_packages_apps_Snap-4a3b0de9f672b7840db4436986c46dea3cb03d0d.zip | |
Merge "Remove the parameter of getAllExifTags() in IfdData" into gb-ub-photos-arches
| -rw-r--r-- | src/com/android/gallery3d/exif/ExifOutputStream.java | 4 | ||||
| -rw-r--r-- | src/com/android/gallery3d/exif/IfdData.java | 6 | ||||
| -rw-r--r-- | tests/src/com/android/gallery3d/exif/ExifReaderTest.java | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/exif/ExifOutputStream.java b/src/com/android/gallery3d/exif/ExifOutputStream.java index 6c3335d3d..e162123c6 100644 --- a/src/com/android/gallery3d/exif/ExifOutputStream.java +++ b/src/com/android/gallery3d/exif/ExifOutputStream.java @@ -182,7 +182,7 @@ public class ExifOutputStream extends FilterOutputStream { private void writeIfd(IfdData ifd, OrderedDataOutputStream dataOutputStream) throws IOException { - ExifTag[] tags = ifd.getAllTags(new ExifTag[] {}); + ExifTag[] tags = ifd.getAllTags(); dataOutputStream.writeShort((short) tags.length); for (ExifTag tag: tags) { dataOutputStream.writeShort(tag.getTagId()); @@ -247,7 +247,7 @@ public class ExifOutputStream extends FilterOutputStream { private int calculateOffsetOfIfd(IfdData ifd, int offset) { offset += 2 + ifd.getTagCount() * TAG_SIZE + 4; - ExifTag[] tags = ifd.getAllTags(new ExifTag[] {}); + ExifTag[] tags = ifd.getAllTags(); for(ExifTag tag: tags) { if (tag.getDataSize() > 4) { tag.setOffset(offset); diff --git a/src/com/android/gallery3d/exif/IfdData.java b/src/com/android/gallery3d/exif/IfdData.java index 079613b2c..a2b367fc5 100644 --- a/src/com/android/gallery3d/exif/IfdData.java +++ b/src/com/android/gallery3d/exif/IfdData.java @@ -47,8 +47,8 @@ public class IfdData { /** * Get a array the contains all {@link ExifTag} in this IFD. */ - public ExifTag[] getAllTags(ExifTag[] outTag) { - return mExifTags.values().toArray(outTag); + public ExifTag[] getAllTags() { + return mExifTags.values().toArray(new ExifTag[mExifTags.size()]); } /** @@ -108,7 +108,7 @@ public class IfdData { if (obj instanceof IfdData) { IfdData data = (IfdData) obj; if (data.getId() == mIfdId && data.getTagCount() == getTagCount()) { - ExifTag[] tags = data.getAllTags(new ExifTag[0]); + ExifTag[] tags = data.getAllTags(); for (ExifTag tag: tags) { if (ExifTag.isOffsetTag(tag.getTagId())) continue; ExifTag tag2 = mExifTags.get(tag.getTagId()); diff --git a/tests/src/com/android/gallery3d/exif/ExifReaderTest.java b/tests/src/com/android/gallery3d/exif/ExifReaderTest.java index e5b51f162..e4ed8ebf9 100644 --- a/tests/src/com/android/gallery3d/exif/ExifReaderTest.java +++ b/tests/src/com/android/gallery3d/exif/ExifReaderTest.java @@ -125,7 +125,7 @@ public class ExifReaderTest extends InstrumentationTestCase { assertEquals(0 ,ifdValue.size()); return; } - ExifTag[] tags = ifd.getAllTags(new ExifTag[0]); + ExifTag[] tags = ifd.getAllTags(); for (ExifTag tag : tags) { assertEquals(ifdValue.get(tag.getTagId()), tag.valueToString()); } |