Changeset 3260

Timestamp:

10/11/07 09:26:32 (12 years ago)

Author:

curtis

Message:

TiffComment now has a trivial implementation thanks to TiffTools.getComment.

File:

• trunk/utils/TiffComment.java (modified) (2 diffs)

trunk/utils/TiffComment.java

@@ -3 +3 @@
 //
 
-import loci.formats.RandomAccessStream;
 import loci.formats.TiffTools;
-import java.util.Hashtable;
 
 /** Extracts the comment from the first IFD of the given TIFF file(s). */
@@ -16 +14 @@
     }
     for (int i=0; i<args.length; i++) {
-      // read IFDs
-      RandomAccessStream in = new RandomAccessStream(args[i]);
-      Hashtable ifd = TiffTools.getFirstIFD(in);
-      in.close();
-
-      // extract comment
-      Object o = TiffTools.getIFDValue(ifd, TiffTools.IMAGE_DESCRIPTION);
-      String comment = null;
-      if (o instanceof String) comment = (String) o;
-      else if (o instanceof String[]) {
-        String[] s = (String[]) o;
-        if (s.length > 0) comment = s[0];
-      }
-      else if (o != null) comment = o.toString();
-
-      if (comment != null) {
-        // sanitize line feeds
-        comment = comment.replaceAll("\r\n", "\n");
-        comment = comment.replaceAll("\r", "\n");
-
-        System.out.println(comment);
-      }
+      String comment = TiffTools.getComment(args[i]);
+      if (comment != null) System.out.println(comment);
     }
   }