Merge "Remove the parameter of getAllExifTags() in IfdData" into gb-ub-photos-arches

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());
         }