Changeset 13061 in josm for trunk/src/com/drew/metadata/exif/ExifDirectoryBase.java

Timestamp:

2017-10-30T22:46:09+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #15505 - update to metadata-extractor 2.10.1

File:

• trunk/src/com/drew/metadata/exif/ExifDirectoryBase.java (modified) (9 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright 2002-2016 Drew Noakes
+ * Copyright 2002-2017 Drew Noakes
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -31 +31 @@
  * @author Drew Noakes https://drewnoakes.com
  */
+@SuppressWarnings("WeakerAccess")
 public abstract class ExifDirectoryBase extends Directory
 {
@@ -126 +127 @@
 
     public static final int TAG_RESOLUTION_UNIT                   = 0x0128;
+    public static final int TAG_PAGE_NUMBER                       = 0x0129;
+
     public static final int TAG_TRANSFER_FUNCTION                 = 0x012D;
     public static final int TAG_SOFTWARE                          = 0x0131;
@@ -149 +152 @@
     public static final int TAG_JPEG_TABLES                       = 0x015B;
     public static final int TAG_JPEG_PROC                         = 0x0200;
+
+    // 0x0201 can have all kinds of descriptions for thumbnail starting index
+    // 0x0202 can have all kinds of descriptions for thumbnail length
+    public static final int TAG_JPEG_RESTART_INTERVAL = 0x0203;
+    public static final int TAG_JPEG_LOSSLESS_PREDICTORS = 0x0205;
+    public static final int TAG_JPEG_POINT_TRANSFORMS = 0x0206;
+    public static final int TAG_JPEG_Q_TABLES = 0x0207;
+    public static final int TAG_JPEG_DC_TABLES = 0x0208;
+    public static final int TAG_JPEG_AC_TABLES = 0x0209;
 
     public static final int TAG_YCBCR_COEFFICIENTS                = 0x0211;
@@ -266 +278 @@
     public static final int TAG_METERING_MODE                     = 0x9207;
 
+    /**
+     * @deprecated use {@link com.drew.metadata.exif.ExifDirectoryBase#TAG_WHITE_BALANCE} instead.
+     */
+    @Deprecated
+    public static final int TAG_LIGHT_SOURCE                      = 0x9208;
     /**
      * White balance (aka light source). '0' means unknown, '1' daylight,
@@ -574 +591 @@
     public static final int TAG_GAMMA                             = 0xA500;
 
-    public static final int TAG_PRINT_IM                          = 0xC4A5;
+    public static final int TAG_PRINT_IMAGE_MATCHING_INFO         = 0xC4A5;
 
     public static final int TAG_PANASONIC_TITLE                   = 0xC6D2;
@@ -612 +629 @@
         map.put(TAG_PAGE_NAME, "Page Name");
         map.put(TAG_RESOLUTION_UNIT, "Resolution Unit");
+        map.put(TAG_PAGE_NUMBER, "Page Number");
         map.put(TAG_TRANSFER_FUNCTION, "Transfer Function");
         map.put(TAG_SOFTWARE, "Software");
@@ -628 +646 @@
         map.put(TAG_JPEG_TABLES, "JPEG Tables");
         map.put(TAG_JPEG_PROC, "JPEG Proc");
+
+        map.put(TAG_JPEG_RESTART_INTERVAL, "JPEG Restart Interval");
+        map.put(TAG_JPEG_LOSSLESS_PREDICTORS, "JPEG Lossless Predictors");
+        map.put(TAG_JPEG_POINT_TRANSFORMS, "JPEG Point Transforms");
+        map.put(TAG_JPEG_Q_TABLES, "JPEGQ Tables");
+        map.put(TAG_JPEG_DC_TABLES, "JPEGDC Tables");
+        map.put(TAG_JPEG_AC_TABLES, "JPEGAC Tables");
+
         map.put(TAG_YCBCR_COEFFICIENTS, "YCbCr Coefficients");
         map.put(TAG_YCBCR_SUBSAMPLING, "YCbCr Sub-Sampling");
@@ -730 +756 @@
         map.put(TAG_LENS_SERIAL_NUMBER, "Lens Serial Number");
         map.put(TAG_GAMMA, "Gamma");
-        map.put(TAG_PRINT_IM, "Print IM");
+        map.put(TAG_PRINT_IMAGE_MATCHING_INFO, "Print Image Matching (PIM) Info");
         map.put(TAG_PANASONIC_TITLE, "Panasonic Title");
         map.put(TAG_PANASONIC_TITLE_2, "Panasonic Title (2)");