Changeset 15217 in josm for trunk/src/com/drew/metadata/exif/makernotes

Timestamp:

2019-07-07T01:56:46+02:00 (7 years ago)

Author:

Don-vip

Message:

see #17848 - update to metadata-extractor 2.12.0

Location:

trunk/src/com/drew/metadata/exif/makernotes

Files:

• AppleMakernoteDescriptor.java (modified) (1 diff)
• AppleMakernoteDirectory.java (modified) (1 diff)
• CanonMakernoteDescriptor.java (modified) (1 diff)
• CanonMakernoteDirectory.java (modified) (1 diff)
• CasioType1MakernoteDescriptor.java (modified) (1 diff)
• CasioType1MakernoteDirectory.java (modified) (1 diff)
• CasioType2MakernoteDescriptor.java (modified) (1 diff)
• CasioType2MakernoteDirectory.java (modified) (1 diff)
• FujifilmMakernoteDescriptor.java (modified) (1 diff)
• FujifilmMakernoteDirectory.java (modified) (1 diff)
• KodakMakernoteDescriptor.java (modified) (1 diff)
• KodakMakernoteDirectory.java (modified) (1 diff)
• KyoceraMakernoteDescriptor.java (modified) (1 diff)
• KyoceraMakernoteDirectory.java (modified) (1 diff)
• LeicaMakernoteDescriptor.java (modified) (1 diff)
• LeicaMakernoteDirectory.java (modified) (1 diff)
• LeicaType5MakernoteDescriptor.java (modified) (1 diff)
• LeicaType5MakernoteDirectory.java (modified) (1 diff)
• NikonType1MakernoteDescriptor.java (modified) (1 diff)
• NikonType1MakernoteDirectory.java (modified) (1 diff)
• NikonType2MakernoteDescriptor.java (modified) (5 diffs)
• NikonType2MakernoteDirectory.java (modified) (3 diffs)
• OlympusMakernoteDescriptor.java (modified) (1 diff)
• OlympusMakernoteDirectory.java (modified) (1 diff)
• OlympusRawDevelopment2MakernoteDescriptor.java (modified) (1 diff)
• PanasonicMakernoteDescriptor.java (modified) (1 diff)
• PanasonicMakernoteDirectory.java (modified) (1 diff)
• PentaxMakernoteDescriptor.java (modified) (1 diff)
• PentaxMakernoteDirectory.java (modified) (1 diff)
• ReconyxHyperFireMakernoteDescriptor.java (modified) (1 diff)
• ReconyxHyperFireMakernoteDirectory.java (modified) (1 diff)
• ReconyxUltraFireMakernoteDescriptor.java (modified) (1 diff)
• ReconyxUltraFireMakernoteDirectory.java (modified) (1 diff)
• RicohMakernoteDescriptor.java (modified) (1 diff)
• RicohMakernoteDirectory.java (modified) (1 diff)
• SamsungType2MakernoteDescriptor.java (modified) (1 diff)
• SamsungType2MakernoteDirectory.java (modified) (1 diff)
• SanyoMakernoteDescriptor.java (modified) (1 diff)
• SanyoMakernoteDirectory.java (modified) (1 diff)
• SigmaMakernoteDescriptor.java (modified) (1 diff)
• SigmaMakernoteDirectory.java (modified) (1 diff)
• SonyType1MakernoteDescriptor.java (modified) (1 diff)
• SonyType1MakernoteDirectory.java (modified) (1 diff)
• SonyType6MakernoteDescriptor.java (modified) (1 diff)
• SonyType6MakernoteDirectory.java (modified) (1 diff)

trunk/src/com/drew/metadata/exif/makernotes/AppleMakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/AppleMakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/CanonMakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/CanonMakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/CasioType1MakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/CasioType1MakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/CasioType2MakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/CasioType2MakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/FujifilmMakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/FujifilmMakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/KodakMakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/KodakMakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/KyoceraMakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/KyoceraMakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/LeicaMakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/LeicaMakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/LeicaType5MakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/LeicaType5MakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/NikonType1MakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/NikonType1MakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/NikonType2MakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -26 +26 @@
 import com.drew.metadata.TagDescriptor;
 
+import java.nio.ByteBuffer;
 import java.text.DecimalFormat;
 
@@ -105 +106 @@
     public String getPowerUpTimeDescription()
     {
-        return getEpochTimeDescription(TAG_POWER_UP_TIME);
+        // this is generally a byte[] of length 8 directly representing a date and time.
+        // the format is : first 2 bytes together are the year, and then each byte after
+        //                 is month, day, hour, minute, second with the eighth byte unused
+        // e.g., 2011:04:25 01:54:58
+
+        byte[] values = _directory.getByteArray(TAG_POWER_UP_TIME);
+        short year = ByteBuffer.wrap(new byte[]{values[0], values[1]}).getShort();
+        return String.format("%04d:%02d:%02d %02d:%02d:%02d", year, values[2], values[3], 
+                                                        values[4], values[5], values[6]);
     }
 
@@ -334 +343 @@
 
     @Nullable
+    public String getLensFocusDistance()
+    {
+        int[] values = _directory.getDecryptedIntArray(TAG_LENS_DATA);
+
+        if (values == null || values.length < 11)
+            return null;
+
+        return String.format("%.2fm", getDistanceInMeters(values[10]));
+    }
+
+    @Nullable
     public String getHueAdjustmentDescription()
     {
@@ -351 +371 @@
         return getVersionBytesDescription(TAG_FIRMWARE_VERSION, 2);
     }
+
+    private double getDistanceInMeters(int val)
+    {
+        if (val < 0)
+            val += 256;
+        return 0.01 * Math.pow(10, val / 40.0f);
+    }
 }

trunk/src/com/drew/metadata/exif/makernotes/NikonType2MakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -21 +21 @@
 package com.drew.metadata.exif.makernotes;
 
+import com.drew.lang.annotations.Nullable;
 import com.drew.lang.annotations.NotNull;
 import com.drew.metadata.Directory;
@@ -923 +924 @@
         return _tagNameMap;
     }
+
+        /** Nikon decryption tables used in exiftool */
+    private static final int[] _decTable1 =   {0xc1,0xbf,0x6d,0x0d,0x59,0xc5,0x13,0x9d,0x83,0x61,0x6b,0x4f,0xc7,0x7f,0x3d,0x3d,
+                                               0x53,0x59,0xe3,0xc7,0xe9,0x2f,0x95,0xa7,0x95,0x1f,0xdf,0x7f,0x2b,0x29,0xc7,0x0d,
+                                               0xdf,0x07,0xef,0x71,0x89,0x3d,0x13,0x3d,0x3b,0x13,0xfb,0x0d,0x89,0xc1,0x65,0x1f,
+                                               0xb3,0x0d,0x6b,0x29,0xe3,0xfb,0xef,0xa3,0x6b,0x47,0x7f,0x95,0x35,0xa7,0x47,0x4f,
+                                               0xc7,0xf1,0x59,0x95,0x35,0x11,0x29,0x61,0xf1,0x3d,0xb3,0x2b,0x0d,0x43,0x89,0xc1,
+                                               0x9d,0x9d,0x89,0x65,0xf1,0xe9,0xdf,0xbf,0x3d,0x7f,0x53,0x97,0xe5,0xe9,0x95,0x17,
+                                               0x1d,0x3d,0x8b,0xfb,0xc7,0xe3,0x67,0xa7,0x07,0xf1,0x71,0xa7,0x53,0xb5,0x29,0x89,
+                                               0xe5,0x2b,0xa7,0x17,0x29,0xe9,0x4f,0xc5,0x65,0x6d,0x6b,0xef,0x0d,0x89,0x49,0x2f,
+                                               0xb3,0x43,0x53,0x65,0x1d,0x49,0xa3,0x13,0x89,0x59,0xef,0x6b,0xef,0x65,0x1d,0x0b,
+                                               0x59,0x13,0xe3,0x4f,0x9d,0xb3,0x29,0x43,0x2b,0x07,0x1d,0x95,0x59,0x59,0x47,0xfb,
+                                               0xe5,0xe9,0x61,0x47,0x2f,0x35,0x7f,0x17,0x7f,0xef,0x7f,0x95,0x95,0x71,0xd3,0xa3,
+                                               0x0b,0x71,0xa3,0xad,0x0b,0x3b,0xb5,0xfb,0xa3,0xbf,0x4f,0x83,0x1d,0xad,0xe9,0x2f,
+                                               0x71,0x65,0xa3,0xe5,0x07,0x35,0x3d,0x0d,0xb5,0xe9,0xe5,0x47,0x3b,0x9d,0xef,0x35,
+                                               0xa3,0xbf,0xb3,0xdf,0x53,0xd3,0x97,0x53,0x49,0x71,0x07,0x35,0x61,0x71,0x2f,0x43,
+                                               0x2f,0x11,0xdf,0x17,0x97,0xfb,0x95,0x3b,0x7f,0x6b,0xd3,0x25,0xbf,0xad,0xc7,0xc5,
+                                               0xc5,0xb5,0x8b,0xef,0x2f,0xd3,0x07,0x6b,0x25,0x49,0x95,0x25,0x49,0x6d,0x71,0xc7 };
+    private static final int[] _decTable2 = { 0xa7,0xbc,0xc9,0xad,0x91,0xdf,0x85,0xe5,0xd4,0x78,0xd5,0x17,0x46,0x7c,0x29,0x4c,
+                                               0x4d,0x03,0xe9,0x25,0x68,0x11,0x86,0xb3,0xbd,0xf7,0x6f,0x61,0x22,0xa2,0x26,0x34,
+                                               0x2a,0xbe,0x1e,0x46,0x14,0x68,0x9d,0x44,0x18,0xc2,0x40,0xf4,0x7e,0x5f,0x1b,0xad,
+                                               0x0b,0x94,0xb6,0x67,0xb4,0x0b,0xe1,0xea,0x95,0x9c,0x66,0xdc,0xe7,0x5d,0x6c,0x05,
+                                               0xda,0xd5,0xdf,0x7a,0xef,0xf6,0xdb,0x1f,0x82,0x4c,0xc0,0x68,0x47,0xa1,0xbd,0xee,
+                                               0x39,0x50,0x56,0x4a,0xdd,0xdf,0xa5,0xf8,0xc6,0xda,0xca,0x90,0xca,0x01,0x42,0x9d,
+                                               0x8b,0x0c,0x73,0x43,0x75,0x05,0x94,0xde,0x24,0xb3,0x80,0x34,0xe5,0x2c,0xdc,0x9b,
+                                               0x3f,0xca,0x33,0x45,0xd0,0xdb,0x5f,0xf5,0x52,0xc3,0x21,0xda,0xe2,0x22,0x72,0x6b,
+                                               0x3e,0xd0,0x5b,0xa8,0x87,0x8c,0x06,0x5d,0x0f,0xdd,0x09,0x19,0x93,0xd0,0xb9,0xfc,
+                                               0x8b,0x0f,0x84,0x60,0x33,0x1c,0x9b,0x45,0xf1,0xf0,0xa3,0x94,0x3a,0x12,0x77,0x33,
+                                               0x4d,0x44,0x78,0x28,0x3c,0x9e,0xfd,0x65,0x57,0x16,0x94,0x6b,0xfb,0x59,0xd0,0xc8,
+                                               0x22,0x36,0xdb,0xd2,0x63,0x98,0x43,0xa1,0x04,0x87,0x86,0xf7,0xa6,0x26,0xbb,0xd6,
+                                               0x59,0x4d,0xbf,0x6a,0x2e,0xaa,0x2b,0xef,0xe6,0x78,0xb6,0x4e,0xe0,0x2f,0xdc,0x7c,
+                                               0xbe,0x57,0x19,0x32,0x7e,0x2a,0xd0,0xb8,0xba,0x29,0x00,0x3c,0x52,0x7d,0xa8,0x49,
+                                               0x3b,0x2d,0xeb,0x25,0x49,0xfa,0xa3,0xaa,0x39,0xa7,0xc5,0xa7,0x50,0x11,0x36,0xfb,
+                                               0xc6,0x67,0x4a,0xf5,0xa5,0x12,0x65,0x7e,0xb0,0xdf,0xaf,0x4e,0xb3,0x61,0x7f,0x2f };
+
+
+    /** decryption algorithm adapted from exiftool */
+    @Nullable
+    public int[] getDecryptedIntArray(int tagType)
+    {
+        int[] data = getIntArray(tagType);
+        Integer serial = getInteger(TAG_CAMERA_SERIAL_NUMBER);
+        Integer count = getInteger(TAG_EXPOSURE_SEQUENCE_NUMBER);
+
+        if (data == null || serial == null || count == null)
+            return null;
+
+        int key = 0;
+        for (int i = 0; i < 4; i++)
+            key ^= (count >> (i * 8)) & 0xff;
+
+        int ci = _decTable1[serial & 0xff];
+        int cj = _decTable2[key];
+        int ck = 0x60;
+
+        for (int i = 4; i < data.length; i++)
+        {
+            cj = (cj + ci * ck) & 0xff;
+            ck = (ck + 1) & 0xff;
+            data[i] ^= cj;
+        }
+
+        return data;
+    }
 }

trunk/src/com/drew/metadata/exif/makernotes/OlympusMakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/OlympusMakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/OlympusRawDevelopment2MakernoteDescriptor.java

@@ -111 +111 @@
         if (((v >> 1) & 1) != 0) sb.append("Noise Filter, ");
         if (((v >> 2) & 1) != 0) sb.append("Noise Filter (ISO Boost), ");
-
-        return sb.substring(0, sb.length() - 2);
+        if (((v >> 3) & 1) != 0) sb.append("Noise Filter (Auto), ");
+        
+        if (sb.length() > 2) {
+            sb.delete(sb.length() - 2, sb.length());
+        }
+        return sb.toString();
     }
 

trunk/src/com/drew/metadata/exif/makernotes/PanasonicMakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/PanasonicMakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/PentaxMakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/PentaxMakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/ReconyxHyperFireMakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/ReconyxHyperFireMakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/ReconyxUltraFireMakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/ReconyxUltraFireMakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/RicohMakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/RicohMakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/SamsungType2MakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/SamsungType2MakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/SanyoMakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/SanyoMakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/SigmaMakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/SigmaMakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/SonyType1MakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/SonyType1MakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/SonyType6MakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

trunk/src/com/drew/metadata/exif/makernotes/SonyType6MakernoteDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");