Changeset 8132 in josm for trunk/src/com/drew/metadata/exif/ExifThumbnailDirectory.java

Timestamp:

2015-03-10T01:17:39+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #11162 - update to metadata-extractor 2.7.2

File:

• trunk/src/com/drew/metadata/exif/ExifThumbnailDirectory.java (modified) (11 diffs)

trunk/src/com/drew/metadata/exif/ExifThumbnailDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2012 Drew Noakes
+ * Copyright 2002-2015 Drew Noakes
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -16 +16 @@
  * More information about this project is available at:
  *
- *    http://drewnoakes.com/code/exif/
- *    http://code.google.com/p/metadata-extractor/
+ *    https://drewnoakes.com/code/exif/
+ *    https://github.com/drewnoakes/metadata-extractor
  */
 
@@ -34 +34 @@
  * One of several Exif directories.  Otherwise known as IFD1, this directory holds information about an embedded thumbnail image.
  *
- * @author Drew Noakes http://drewnoakes.com
+ * @author Drew Noakes https://drewnoakes.com
  */
 public class ExifThumbnailDirectory extends Directory
@@ -57 +57 @@
      * 7 = JPEG
      * 8 = Adobe Deflate
-     * 9 = JBIG B&W
+     * 9 = JBIG B&W
      * 10 = JBIG Color
      * 32766 = Next
@@ -98 +98 @@
     public static final int TAG_PHOTOMETRIC_INTERPRETATION = 0x0106;
 
-    /** The position in the file of raster data. */
+    /**
+     * The position in the file of raster data.
+     */
     public static final int TAG_STRIP_OFFSETS = 0x0111;
     public static final int TAG_ORIENTATION = 0x0112;
-    /** Each pixel is composed of this many samples. */
+    /**
+     * Each pixel is composed of this many samples.
+     */
     public static final int TAG_SAMPLES_PER_PIXEL = 0x0115;
-    /** The raster is codified by a single block of data holding this many rows. */
+    /**
+     * The raster is codified by a single block of data holding this many rows.
+     */
     public static final int TAG_ROWS_PER_STRIP = 0x116;
-    /** The size of the raster data in bytes. */
+    /**
+     * The size of the raster data in bytes.
+     */
     public static final int TAG_STRIP_BYTE_COUNTS = 0x0117;
     /**
@@ -117 +125 @@
     public static final int TAG_PLANAR_CONFIGURATION = 0x011C;
     public static final int TAG_RESOLUTION_UNIT = 0x0128;
-    /** The offset to thumbnail image bytes. */
+    /**
+     * The offset to thumbnail image bytes.
+     */
     public static final int TAG_THUMBNAIL_OFFSET = 0x0201;
-    /** The size of the thumbnail image data in bytes. */
+    /**
+     * The size of the thumbnail image data in bytes.
+     */
     public static final int TAG_THUMBNAIL_LENGTH = 0x0202;
     public static final int TAG_YCBCR_COEFFICIENTS = 0x0211;
@@ -129 +141 @@
     protected static final HashMap<Integer, String> _tagNameMap = new HashMap<Integer, String>();
 
-    static
-    {
+    static {
         _tagNameMap.put(TAG_THUMBNAIL_IMAGE_WIDTH, "Thumbnail Image Width");
         _tagNameMap.put(TAG_THUMBNAIL_IMAGE_HEIGHT, "Thumbnail Image Height");
@@ -161 +172 @@
     }
 
+    @Override
     @NotNull
     public String getName()
@@ -167 +179 @@
     }
 
+    @Override
     @NotNull
     protected HashMap<Integer, String> getTagNameMap()
@@ -193 +206 @@
         byte[] data = _thumbnailData;
 
-        if (data==null)
+        if (data == null)
             throw new MetadataException("No thumbnail data exists.");
 
@@ -201 +214 @@
             stream.write(data);
         } finally {
-            if (stream!=null)
+            if (stream != null)
                 stream.close();
         }