diff options
| author | Earl Ou <shunhsingou@google.com> | 2012-08-31 09:55:58 +0800 |
|---|---|---|
| committer | Earl Ou <shunhsingou@google.com> | 2012-08-31 11:12:27 +0800 |
| commit | 397d48c17b398c72ea40f8d0b47a90488d9f8abf (patch) | |
| tree | 8f80aa8fc20d71cf6512b96d046e8815abb3b553 /src | |
| parent | d4295b44baead5276704016a37ade53075fc209e (diff) | |
| download | android_packages_apps_Snap-397d48c17b398c72ea40f8d0b47a90488d9f8abf.tar.gz android_packages_apps_Snap-397d48c17b398c72ea40f8d0b47a90488d9f8abf.tar.bz2 android_packages_apps_Snap-397d48c17b398c72ea40f8d0b47a90488d9f8abf.zip | |
Remove the parameter of getAllExifTags() in IfdData
Change-Id: Iec7f04a9866c53caa2d66d5ea6f679460980b378
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/exif/ExifOutputStream.java | 4 | ||||
| -rw-r--r-- | src/com/android/gallery3d/exif/IfdData.java | 6 |
2 files changed, 5 insertions, 5 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()); |