Changeset 35898 for platform/tdiary

Timestamp:

11/14/09 13:05:14 (4 years ago)

Author:

n-kashi

Message:

update table of Nikon lens names.

Files:

• platform/tdiary/lib/exifparser/lib/exifparser/makernote/nikonflensname.rb (modified) (8 diffs)

platform/tdiary/lib/exifparser/lib/exifparser/makernote/nikonflensname.rb

@@ -168 +168 @@
         [0x9F, 0x58, 0x44, 0x44, 0x14, 0x14, 0xA1] => "Nikon AF-S DX Nikkor 35mm F1.8G",
         [0xA0, 0x54, 0x50, 0x50, 0x0C, 0x0C, 0xA2] => "Nikon AF-S Nikkor 50mm F1.4G",
+        [0xA1, 0x40, 0x18, 0x37, 0x2C, 0x34, 0xA3] => "Nikon AF-S DX Nikkor 10-24mm F3.5-4.5G ED",
         [0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02] => "Nikon TC-16A",
         [0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08] => "Nikon TC-16A",
+        [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF1] => "Nikon TC-14E",
+        [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF2] => "Nikon TC-20E",
         [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF1] => "Nikon TC-14E II",
         [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF2] => "Nikon TC-20E II",
@@ -181 +184 @@
         [0x26, 0x48, 0x27, 0x27, 0x24, 0x24, 0x1C] => "Sigma 15mm F2.8 EX Diagonal Fisheye",
         [0x26, 0x58, 0x31, 0x31, 0x14, 0x14, 0x1C] => "Sigma 20mm F1.8 EX DG Aspherical RF",
-        [0xE1, 0x58, 0x37, 0x37, 0x14, 0x14, 0x1C] => "Sigma 24mm F1.8 EX DG Aspherical MACRO",
-        [0x26, 0x58, 0x37, 0x37, 0x14, 0x14, 0x1C] => "Sigma 24mm F1.8 EX DG Aspherical MACRO",
+        [0x26, 0x58, 0x37, 0x37, 0x14, 0x14, 0x1C] => "Sigma 24mm F1.8 EX DG Aspherical Macro",
+        [0xE1, 0x58, 0x37, 0x37, 0x14, 0x14, 0x1C] => "Sigma 24mm F1.8 EX DG Aspherical Macro",
         [0x02, 0x46, 0x37, 0x37, 0x25, 0x25, 0x02] => "Sigma 24mm F2.8 Super Wide II Macro",
-        [0x26, 0x58, 0x3C, 0x3C, 0x14, 0x14, 0x1C] => "Sigma 28mm F1.8 EX DG DF",
+        [0x26, 0x58, 0x3C, 0x3C, 0x14, 0x14, 0x1C] => "Sigma 28mm F1.8 EX DG Aspherical Macro",
         [0x48, 0x54, 0x3E, 0x3E, 0x0C, 0x0C, 0x4B] => "Sigma 30mm F1.4 EX DC HSM",
         [0xF8, 0x54, 0x3E, 0x3E, 0x0C, 0x0C, 0x4B] => "Sigma 30mm F1.4 EX DC HSM",
@@ -206 +209 @@
         [0x48, 0x3C, 0x19, 0x31, 0x30, 0x3C, 0x4B] => "Sigma 10-20mm F4-5.6 EX DC HSM",
         [0xF9, 0x3C, 0x19, 0x31, 0x30, 0x3C, 0x4B] => "Sigma 10-20mm F4-5.6 EX DC HSM",
+        [0x48, 0x38, 0x1F, 0x37, 0x34, 0x3C, 0x4B] => "Sigma 12-24mm F4.5-5.6 EX DG Aspherical HSM",
         [0xF0, 0x38, 0x1F, 0x37, 0x34, 0x3C, 0x4B] => "Sigma 12-24mm F4.5-5.6 EX DG Aspherical HSM",
-        [0x48, 0x38, 0x1F, 0x37, 0x34, 0x3C, 0x4B] => "Sigma 12-24mm F4.5-5.6 EX DG Aspherical HSM",
         [0x26, 0x40, 0x27, 0x3F, 0x2C, 0x34, 0x1C] => "Sigma 15-30mm F3.5-4.5 EX DG Aspherical DF",
         [0x48, 0x48, 0x2B, 0x44, 0x24, 0x30, 0x4B] => "Sigma 17-35mm F2.8-4 EX DG  Aspherical HSM",
@@ -216 +219 @@
         [0x26, 0x40, 0x2D, 0x44, 0x2B, 0x34, 0x1C] => "Sigma 18-35 F3.5-4.5 Aspherical",
         [0x26, 0x48, 0x2D, 0x50, 0x24, 0x24, 0x1C] => "Sigma 18-50mm F2.8 EX DC",
-        [0x7F, 0x48, 0x2D, 0x50, 0x24, 0x24, 0x1C] => "Sigma 18-50mm F2.8 EX DC MACRO",
-        [0x7A, 0x48, 0x2D, 0x50, 0x24, 0x24, 0x4B] => "Sigma 18-50mm F2.8 EX DC HSM",
+        [0x7F, 0x48, 0x2D, 0x50, 0x24, 0x24, 0x1C] => "Sigma 18-50mm F2.8 EX DC Macro",
+        [0x7A, 0x48, 0x2D, 0x50, 0x24, 0x24, 0x4B] => "Sigma 18-50mm F2.8 EX DC Macro",
         [0x26, 0x40, 0x2D, 0x50, 0x2C, 0x3C, 0x1C] => "Sigma 18-50mm F3.5-5.6 DC",
         [0x7A, 0x40, 0x2D, 0x50, 0x2C, 0x3C, 0x4B] => "Sigma 18-50mm F3.5-5.6 DC HSM",
@@ -234 +237 @@
         [0x26, 0x54, 0x3C, 0x5C, 0x24, 0x24, 0x1C] => "Sigma 28-70mm F2.8 EX",
         [0x26, 0x48, 0x3C, 0x5C, 0x24, 0x24, 0x1C] => "Sigma 28-70mm F2.8 EX DG",
-        [0x26, 0x48, 0x3C, 0x5C, 0x24, 0x30, 0x1C] => "Sigma 28-70mm F2.8-4",
+        [0x26, 0x48, 0x3C, 0x5C, 0x24, 0x30, 0x1C] => "Sigma 28-70mm F2.8-4 DG",
         [0x02, 0x3F, 0x3C, 0x5C, 0x2D, 0x35, 0x02] => "Sigma 28-70mm F3.5-4.5 UC",
         [0x26, 0x40, 0x3C, 0x60, 0x2C, 0x3C, 0x1C] => "Sigma 28-80mm F3.5-5.6 Mini Zoom Macro II Aspherical",
@@ -319 +322 @@
         [0x7A, 0x3C, 0x1F, 0x37, 0x30, 0x30, 0x7E] => "Tokina AT-X 124 AF PRO DX II (AF 12-24mm f/4)",
         [0x00, 0x48, 0x29, 0x50, 0x24, 0x24, 0x00] => "Tokina AT-X 165 PRO DX (AF 16-50mm f/2.8)",
+        [0x00, 0x40, 0x2A, 0x72, 0x2C, 0x3C, 0x00] => "Tokina AT-X 16.5-135 DX (AF 16.5-135mm F3.5-5.6)",
+        [0x2F, 0x48, 0x30, 0x44, 0x24, 0x24, 0x29] => "Tokina AT-X 235 AF PRO (AF 20-35mm f/2.8)",
         [0x2F, 0x40, 0x30, 0x44, 0x2C, 0x34, 0x29] => "Tokina AF 235 II (AF 20-35mm f/3.5-4.5)",
         [0x25, 0x48, 0x3C, 0x5C, 0x24, 0x24, 0x1B] => "Tokina AT-X 287 AF PRO SV (AF 28-70mm f/2.8)",
@@ -329 +334 @@
         [0x00, 0x44, 0x60, 0x98, 0x34, 0x3C, 0x00] => "Tokina AT-X 840 AF D (AF 80-400mm f/4.5-5.6)",
         [0x14, 0x48, 0x68, 0x8E, 0x30, 0x30, 0x0B] => "Tokina AT-X 340 AF (AF 100-300mm f/4)",
-        [0x00, 0x54, 0x56, 0x56, 0x30, 0x30, 0x00] => "Coastal Optical Systems 60mm 1:4 UV-VIS-IR Macro Apo",
         [0x06, 0x3F, 0x68, 0x68, 0x2C, 0x2C, 0x06] => "Cosina AF 100mm F3.5 Macro",
         [0x07, 0x36, 0x3D, 0x5F, 0x2C, 0x3C, 0x03] => "Cosina AF Zoom 28-80mm F3.5-5.6 MC Macro",
@@ -336 +340 @@
         [0x12, 0x39, 0x5C, 0x8E, 0x34, 0x3D, 0x08] => "Cosina AF Zoom 70-300mm F4.5-5.6 MC Macro",
         [0x12, 0x3B, 0x68, 0x8D, 0x3D, 0x43, 0x09] => "Cosina AF Zoom 100-300mm F5.6-6.7 MC Macro",
+        [0x00, 0x40, 0x31, 0x31, 0x2C, 0x2C, 0x00] => "Voigtlander Color Skopar 20mm F3.5 SLII Aspherical",
+        [0x00, 0x54, 0x48, 0x48, 0x18, 0x18, 0x00] => "Voigtlander Ultron 40mm F2 SLII Aspherical",
+        [0x00, 0x54, 0x55, 0x55, 0x0C, 0x0C, 0x00] => "Voigtlander Nokton 58mm F1.4 SLII",
+        [0x00, 0x54, 0x56, 0x56, 0x30, 0x30, 0x00] => "Coastal Optical Systems 60mm 1:4 UV-VIS-IR Macro Apo",
         [0x02, 0x40, 0x44, 0x5C, 0x2C, 0x34, 0x02] => "Exakta AF 35-70mm 1:3.5-4.5 MC",
         [0x07, 0x3E, 0x30, 0x43, 0x2D, 0x35, 0x03] => "Soligor AF Zoom 19-35mm 1:3.5-4.5 MC",
         [0x03, 0x43, 0x5C, 0x81, 0x35, 0x35, 0x02] => "Soligor AF C/D Zoom UMCS 70-210mm 1:4.5",
         [0x12, 0x4A, 0x5C, 0x81, 0x31, 0x3D, 0x09] => "Soligor AF C/D Auto Zoom+Macro 70-210mm 1:4-5.6 UMCS",
-        [0x00, 0x40, 0x31, 0x31, 0x2C, 0x2C, 0x00] => "Voigtlander Color Skopar 20mm F3.5 SLII Aspherical",
-        [0x00, 0x54, 0x48, 0x48, 0x18, 0x18, 0x00] => "Voigtlander Ultron 40mm F2 SLII Aspherical",
-        [0x00, 0x54, 0x55, 0x55, 0x0C, 0x0C, 0x00] => "Voigtlander Nokton 58mm F1.4 SLII",
         [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF1] => "Kenko Teleplus PRO 300 DG 1.4x",
         [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF2] => "Kenko Teleplus PRO 300 DG 2.0x",