Changeset 8132 in josm for trunk/src/com/drew/metadata/jpeg/JpegDirectory.java

Timestamp:

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

Author:

Don-vip

Message:

fix #11162 - update to metadata-extractor 2.7.2

File:

• trunk/src/com/drew/metadata/jpeg/JpegDirectory.java (modified) (8 diffs)

trunk/src/com/drew/metadata/jpeg/JpegDirectory.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
  */
 package com.drew.metadata.jpeg;
@@ -29 +29 @@
 
 /**
- * Directory of tags and values for the SOF0 Jpeg segment.  This segment holds basic metadata about the image.
+ * Directory of tags and values for the SOF0 JPEG segment.  This segment holds basic metadata about the image.
  *
- * @author Darrell Silver http://www.darrellsilver.com and Drew Noakes http://drewnoakes.com
+ * @author Darrell Silver http://www.darrellsilver.com and Drew Noakes https://drewnoakes.com
  */
 public class JpegDirectory extends Directory
 {
-    public static final int TAG_JPEG_COMPRESSION_TYPE = -3;
+    public static final int TAG_COMPRESSION_TYPE = -3;
     /** This is in bits/sample, usually 8 (12 and 16 not supported by most software). */
-    public static final int TAG_JPEG_DATA_PRECISION = 0;
+    public static final int TAG_DATA_PRECISION = 0;
     /** The image's height.  Necessary for decoding the image, so it should always be there. */
-    public static final int TAG_JPEG_IMAGE_HEIGHT = 1;
+    public static final int TAG_IMAGE_HEIGHT = 1;
     /** The image's width.  Necessary for decoding the image, so it should always be there. */
-    public static final int TAG_JPEG_IMAGE_WIDTH = 3;
+    public static final int TAG_IMAGE_WIDTH = 3;
     /**
      * Usually 1 = grey scaled, 3 = color YcbCr or YIQ, 4 = color CMYK
@@ -48 +48 @@
      * sampling factors (1byte) (bit 0-3 vertical., 4-7 horizontal.),
      * quantization table number (1 byte).
-     * <p/>
+     * <p>
      * This info is from http://www.funducode.com/freec/Fileformats/format3/format3b.htm
      */
-    public static final int TAG_JPEG_NUMBER_OF_COMPONENTS = 5;
+    public static final int TAG_NUMBER_OF_COMPONENTS = 5;
 
     // NOTE!  Component tag type int values must increment in steps of 1
 
-    /** the first of a possible 4 color components.  Number of components specified in TAG_JPEG_NUMBER_OF_COMPONENTS. */
-    public static final int TAG_JPEG_COMPONENT_DATA_1 = 6;
-    /** the second of a possible 4 color components.  Number of components specified in TAG_JPEG_NUMBER_OF_COMPONENTS. */
-    public static final int TAG_JPEG_COMPONENT_DATA_2 = 7;
-    /** the third of a possible 4 color components.  Number of components specified in TAG_JPEG_NUMBER_OF_COMPONENTS. */
-    public static final int TAG_JPEG_COMPONENT_DATA_3 = 8;
-    /** the fourth of a possible 4 color components.  Number of components specified in TAG_JPEG_NUMBER_OF_COMPONENTS. */
-    public static final int TAG_JPEG_COMPONENT_DATA_4 = 9;
+    /** the first of a possible 4 color components.  Number of components specified in TAG_NUMBER_OF_COMPONENTS. */
+    public static final int TAG_COMPONENT_DATA_1 = 6;
+    /** the second of a possible 4 color components.  Number of components specified in TAG_NUMBER_OF_COMPONENTS. */
+    public static final int TAG_COMPONENT_DATA_2 = 7;
+    /** the third of a possible 4 color components.  Number of components specified in TAG_NUMBER_OF_COMPONENTS. */
+    public static final int TAG_COMPONENT_DATA_3 = 8;
+    /** the fourth of a possible 4 color components.  Number of components specified in TAG_NUMBER_OF_COMPONENTS. */
+    public static final int TAG_COMPONENT_DATA_4 = 9;
 
     @NotNull
@@ -68 +68 @@
 
     static {
-        _tagNameMap.put(TAG_JPEG_COMPRESSION_TYPE, "Compression Type");
-        _tagNameMap.put(TAG_JPEG_DATA_PRECISION, "Data Precision");
-        _tagNameMap.put(TAG_JPEG_IMAGE_WIDTH, "Image Width");
-        _tagNameMap.put(TAG_JPEG_IMAGE_HEIGHT, "Image Height");
-        _tagNameMap.put(TAG_JPEG_NUMBER_OF_COMPONENTS, "Number of Components");
-        _tagNameMap.put(TAG_JPEG_COMPONENT_DATA_1, "Component 1");
-        _tagNameMap.put(TAG_JPEG_COMPONENT_DATA_2, "Component 2");
-        _tagNameMap.put(TAG_JPEG_COMPONENT_DATA_3, "Component 3");
-        _tagNameMap.put(TAG_JPEG_COMPONENT_DATA_4, "Component 4");
+        _tagNameMap.put(TAG_COMPRESSION_TYPE, "Compression Type");
+        _tagNameMap.put(TAG_DATA_PRECISION, "Data Precision");
+        _tagNameMap.put(TAG_IMAGE_WIDTH, "Image Width");
+        _tagNameMap.put(TAG_IMAGE_HEIGHT, "Image Height");
+        _tagNameMap.put(TAG_NUMBER_OF_COMPONENTS, "Number of Components");
+        _tagNameMap.put(TAG_COMPONENT_DATA_1, "Component 1");
+        _tagNameMap.put(TAG_COMPONENT_DATA_2, "Component 2");
+        _tagNameMap.put(TAG_COMPONENT_DATA_3, "Component 3");
+        _tagNameMap.put(TAG_COMPONENT_DATA_4, "Component 4");
     }
 
@@ -84 +84 @@
     }
 
+    @Override
     @NotNull
     public String getName()
     {
-        return "Jpeg";
+        return "JPEG";
     }
 
+    @Override
     @NotNull
     protected HashMap<Integer, String> getTagNameMap()
@@ -104 +106 @@
     public JpegComponent getComponent(int componentNumber)
     {
-        int tagType = JpegDirectory.TAG_JPEG_COMPONENT_DATA_1 + componentNumber;
+        int tagType = JpegDirectory.TAG_COMPONENT_DATA_1 + componentNumber;
         return (JpegComponent)getObject(tagType);
     }
@@ -110 +112 @@
     public int getImageWidth() throws MetadataException
     {
-        return getInt(JpegDirectory.TAG_JPEG_IMAGE_WIDTH);
+        return getInt(JpegDirectory.TAG_IMAGE_WIDTH);
     }
 
     public int getImageHeight() throws MetadataException
     {
-        return getInt(JpegDirectory.TAG_JPEG_IMAGE_HEIGHT);
+        return getInt(JpegDirectory.TAG_IMAGE_HEIGHT);
     }
 
     public int getNumberOfComponents() throws MetadataException
     {
-        return getInt(JpegDirectory.TAG_JPEG_NUMBER_OF_COMPONENTS);
+        return getInt(JpegDirectory.TAG_NUMBER_OF_COMPONENTS);
     }
 }