Changeset 38725 for platform/tdiary/lib/exifparser/lib/exifparser/makernote/nikonflensname.rb

Timestamp:

12/18/10 16:21:33 (2 years ago)

Author:

n-kashi

Message:

update nikonflensname.rb in /lib/exifparse

Files:

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

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

@@ -41 +41 @@
         [0x25, 0x48, 0x44, 0x5c, 0x24, 0x24, 0x1B] => "Nikon AF Zoom-Nikkor 35-70mm F2.8D",
         [0x25, 0x48, 0x44, 0x5c, 0x24, 0x24, 0x52] => "Nikon AF Zoom-Nikkor 35-70mm F2.8D",
+        [0x26, 0x40, 0x3C, 0x5C, 0x2C, 0x34, 0x1C] => "Nikon AF Zoom-Nikkor 28-70mm F3.5-4.5D",
         [0x27, 0x48, 0x8E, 0x8E, 0x24, 0x24, 0x1D] => "Nikon AF-I Nikkor 300mm F2.8D IF-ED",
         [0x27, 0x48, 0x8E, 0x8E, 0x24, 0x24, 0xF1] => "Nikon AF-I Nikkor 300mm F2.8D IF-ED + TC-14E",
@@ -53 +54 @@
         [0x2C, 0x48, 0x6A, 0x6A, 0x18, 0x18, 0x27] => "Nikon AF DC-Nikkor 105mm F2D",
         [0x2D, 0x48, 0x80, 0x80, 0x30, 0x30, 0x21] => "Nikon AF Micro-Nikkor 200mm F4D IF-ED",
+        [0x2E, 0x48, 0x5C, 0x82, 0x30, 0x3C, 0x22] => "Nikon AF Nikkor 70-210mm F4-5.6D",
         [0x2E, 0x48, 0x5C, 0x82, 0x30, 0x3C, 0x28] => "Nikon AF Nikkor 70-210mm F4-5.6D",
         [0x2F, 0x48, 0x30, 0x44, 0x24, 0x24, 0x29] => "Nikon AF Zoom-Nikkor 20-35mm F2.8D IF",
@@ -143 +145 @@
         [0x81, 0x54, 0x80, 0x80, 0x18, 0x18, 0x86] => "Nikon AF-S VR Nikkor 200mm F2G IF-ED",
         [0x82, 0x48, 0x8E, 0x8E, 0x24, 0x24, 0x87] => "Nikon AF-S VR Nikkor 300mm F2.8G IF-ED",
+        [0x83, 0x00, 0xB0, 0xB0, 0x5A, 0x5A, 0x88] => "Nikon FSA-L2, EDG 65, 800mm F13 G",
         [0x89, 0x3C, 0x53, 0x80, 0x30, 0x3C, 0x8B] => "Nikon AF-S DX Zoom-Nikkor 55-200mm F4-5.6G ED",
         [0x8A, 0x54, 0x6A, 0x6A, 0x24, 0x24, 0x8C] => "Nikon AF-S VR Micro-Nikkor 105mm F2.8G IF-ED",
@@ -172 +175 @@
         [0xA1, 0x40, 0x18, 0x37, 0x2C, 0x34, 0xA3] => "Nikon AF-S DX Nikkor 10-24mm F3.5-4.5G ED",
         [0xA2, 0x48, 0x5C, 0x80, 0x24, 0x24, 0xA4] => "Nikon AF-S Nikkor 70-200mm F2.8G ED VR II",
+        [0xA3, 0x3C, 0x29, 0x44, 0x30, 0x30, 0xA5] => "Nikon AF-S Nikkor 16-35mm F4G ED VR",
+        [0xA4, 0x54, 0x37, 0x37, 0x0C, 0x0C, 0xA6] => "Nikon AF-S Nikkor 24mm F1.4G ED",
+        [0xA5, 0x40, 0x3C, 0x8E, 0x2C, 0x3C, 0xA7] => "Nikon AF-S Nikkor 28-300mm F3.5-5.6G ED VR",
+        [0xA6, 0x48, 0x8E, 0x8E, 0x24, 0x24, 0xA8] => "Nikon AF-S VR Nikkor 300mm F2.8G IF-ED II",
         [0xA7, 0x4B, 0x62, 0x62, 0x2C, 0x2C, 0xA9] => "Nikon AF-S DX Micro Nikkor 85mm F3.5G ED VR",
+        [0xA9, 0x54, 0x80, 0x80, 0x18, 0x18, 0xAB] => "Nikon AF-S Nikkor 200mm F2G ED VR II",
+        [0xAA, 0x3C, 0x37, 0x6E, 0x30, 0x30, 0xAC] => "Nikon AF-S Nikkor 24-120mm F4G ED VR",
+        [0xAC, 0x38, 0x53, 0x8E, 0x34, 0x3C, 0xAE] => "Nikon AF-S DX VR Nikkor 55-300mm 4.5-5.6G ED",
+        [0xAE, 0x54, 0x62, 0x62, 0x0C, 0x0C, 0xB0] => "Nikon AF-S Nikkor 85mm F1.4G",
+        [0xAF, 0x54, 0x44, 0x44, 0x0C, 0x0C, 0xB1] => "Nikon AF-S Nikkor 35mm F1.4G",
         [0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02] => "Nikon TC-16A",
         [0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08] => "Nikon TC-16A",
@@ -225 +237 @@
         [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",
+        [0xF6, 0x48, 0x2D, 0x50, 0x24, 0x24, 0x4B] => "Sigma 18-50mm F2.8 EX DC Macro",
+        [0xA4, 0x47, 0x2D, 0x50, 0x24, 0x34, 0x4B] => "Sigma 18-50mm F2.8-4.5 DC OS HSM",
         [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",
@@ -261 +275 @@
         [0xFD, 0x47, 0x50, 0x76, 0x24, 0x24, 0x4B] => "Sigma 50-150mm F2.8 EX APO DC HSM II",
         [0x48, 0x3C, 0x50, 0xA0, 0x30, 0x40, 0x4B] => "Sigma APO 50-500mm F4-6.3 EX HSM",
+        [0x9F, 0x37, 0x50, 0xA0, 0x34, 0x40, 0x4B] => "Sigma 50-500mm F4.5-6.3 APO DG OS HSM",
         [0x26, 0x3C, 0x54, 0x80, 0x30, 0x3C, 0x1C] => "Sigma 55-200mm F4-5.6 DC",
         [0x7A, 0x3B, 0x53, 0x80, 0x30, 0x3C, 0x4B] => "Sigma 55-200mm F4-5.6 DC HSM",
@@ -270 +285 @@
         [0x26, 0x3C, 0x5C, 0x8E, 0x30, 0x3C, 0x1C] => "Sigma 70-300mm F4-5.6 DG Macro",
         [0x56, 0x3C, 0x5C, 0x8E, 0x30, 0x3C, 0x1C] => "Sigma 70-300mm F4-5.6 APO Macro Super II",
-        [0xE0, 0x3C, 0x5C, 0x8E, 0x30, 0x3C, 0x4B] => "Sigma APO 70–300mm F4–5.6 DG Macro",
-        [0xA3, 0x3C, 0x5C, 0x8E, 0x30, 0x3C, 0x4B] => "Sigma 70–300mm F4–5.6 DG OS",
+        [0xE0, 0x3C, 0x5C, 0x8E, 0x30, 0x3C, 0x4B] => "Sigma APO 70-300mm F4-5.6 DG Macro",
+        [0xA3, 0x3C, 0x5C, 0x8E, 0x30, 0x3C, 0x4B] => "Sigma 70-300mm F4-5.6 DG OS",
         [0x02, 0x37, 0x5E, 0x8E, 0x35, 0x3D, 0x02] => "Sigma 75-300mm F4.5-5.6 APO",
         [0x02, 0x3A, 0x5E, 0x8E, 0x32, 0x3D, 0x02] => "Sigma 75-300mm F4.0-5.6",
@@ -279 +294 @@
         [0x48, 0x54, 0x6F, 0x8E, 0x24, 0x24, 0x4B] => "Sigma APO 120-300mm F2.8 EX DG HSM",
         [0x7A, 0x54, 0x6E, 0x8E, 0x24, 0x24, 0x4B] => "Sigma APO 120-300mm F2.8 EX DG HSM",
+        [0xFA, 0x54, 0x6E, 0x8E, 0x24, 0x24, 0x4B] => "Sigma APO 120-300mm F2.8 EX DG HSM",
         [0xCF, 0x38, 0x6E, 0x98, 0x34, 0x3C, 0x4B] => "Sigma APO 120-400mm F4.5-5.6 DG OS HSM",
         [0x26, 0x44, 0x73, 0x98, 0x34, 0x3C, 0x1C] => "Sigma 135-400mm F4.5-5.6 APO Aspherical",
         [0xCE, 0x34, 0x76, 0xA0, 0x38, 0x40, 0x4B] => "Sigma APO 150-500mm F5-6.3 DG OS HSM",
         [0x26, 0x40, 0x7B, 0xA0, 0x34, 0x40, 0x1C] => "Sigma APO 170-500mm F5-6.3 Aspherical RF",
+        [0xA7, 0x49, 0x80, 0xA0, 0x24, 0x24, 0x4B] => "Sigma APO 200-500mm F2.8 EX DG",
         [0x48, 0x3C, 0x8E, 0xB0, 0x3C, 0x3C, 0x4B] => "Sigma APO 300-800mm F5.6 EX DG HSM",
         [0x00, 0x47, 0x25, 0x25, 0x24, 0x24, 0x00] => "Tamron SP AF 14mm F/2.8 Aspherical (IF)",
@@ -326 +343 @@
         [0x00, 0x47, 0x53, 0x80, 0x30, 0x3C, 0x00] => "Tamron AF 55-200mm F/4-5.6 Di II LD",
         [0xF7, 0x53, 0x5C, 0x80, 0x24, 0x24, 0x84] => "Tamron SP AF 70-200mm F/2.8 Di LD (IF) Macro",
+        [0xFE, 0x53, 0x5C, 0x80, 0x24, 0x24, 0x84] => "Tamron SP AF 70-200mm F/2.8 Di LD (IF) Macro",
         [0x69, 0x48, 0x5C, 0x8E, 0x30, 0x3C, 0x6F] => "Tamron AF 70-300mm F/4-5.6 LD Macro 1:2",
         [0x69, 0x47, 0x5C, 0x8E, 0x30, 0x3C, 0x00] => "Tamron AF 70-300mm F/4-5.6 Di LD Macro 1:2",
         [0x00, 0x48, 0x5C, 0x8E, 0x30, 0x3C, 0x00] => "Tamron AF 70-300mm F/4-5.6 Di LD Macro 1:2",
+        [0xF1, 0x47, 0x5C, 0x8E, 0x30, 0x3C, 0xDF] => "Tamron SP 70-300mm F4-5.6 Di VC USD",
         [0x20, 0x3C, 0x80, 0x98, 0x3D, 0x3D, 0x1E] => "Tamron AF 200-400mm F/5.6 LD IF",
         [0x00, 0x3E, 0x80, 0xA0, 0x38, 0x3F, 0x00] => "Tamron SP AF 200-500mm F/5-6.3 Di LD (IF)",
@@ -342 +361 @@
         [0x00, 0x3C, 0x1F, 0x37, 0x30, 0x30, 0x00] => "Tokina AT-X 124 AF PRO DX (AF 12-24mm f/4)",
         [0x7A, 0x3C, 0x1F, 0x37, 0x30, 0x30, 0x7E] => "Tokina AT-X 124 AF PRO DX II (AF 12-24mm f/4)",
+        [0x00, 0x48, 0x29, 0x3C, 0x24, 0x24, 0x00] => "Tokina AT-X 16-28 AF PRO FX (AF 16-28mm f/2.8)",
         [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)",
@@ -352 +372 @@
         [0x07, 0x48, 0x3C, 0x5C, 0x24, 0x24, 0x03] => "Tokina AT-X 287 AF (AF 28-70mm f/2.8)",
         [0x07, 0x47, 0x3C, 0x5C, 0x25, 0x35, 0x03] => "Tokina AF 287 SD (AF 28-70mm f/2.8-4.5)",
+        [0x07, 0x40, 0x3C, 0x5C, 0x2C, 0x35, 0x03] => "Tokina AF 270 II (AF 28-70mm f/3.5-4.5)",
         [0x00, 0x48, 0x3C, 0x60, 0x24, 0x24, 0x00] => "Tokina AT-X 280 AF PRO (AF 28-80mm f/2.8)",
+        [0x25, 0x44, 0x44, 0x8E, 0x34, 0x42, 0x1B] => "Tokina AF 353 (AF 35-300mm f/4.5-6.7)",
         [0x00, 0x48, 0x50, 0x72, 0x24, 0x24, 0x00] => "Tokina AT-X 535 PRO DX (AF 50-135mm f/2.8)",
         [0x12, 0x44, 0x5E, 0x8E, 0x34, 0x3C, 0x09] => "Tokina AF 730 (AF 75-300mm F4.5-5.6)",
@@ -369 +391 @@
         [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, 0x40, 0x64, 0x64, 0x2C, 0x2C, 0x00] => "Voigtlander APO-Lanthar 90mm F3.5 SLII Close Focus",
+        [0x00, 0x40, 0x2D, 0x2D, 0x2C, 0x2C, 0x00] => "Carl Zeiss Distagon T* 3,5/18 ZF.2",
+        [0x00, 0x48, 0x32, 0x32, 0x24, 0x24, 0x00] => "Carl Zeiss Distagon T* 2,8/21 ZF.2",
+        [0x00, 0x54, 0x3C, 0x3C, 0x18, 0x18, 0x00] => "Carl Zeiss Distagon T* 2/28 ZF.2",
+        [0x00, 0x54, 0x44, 0x44, 0x18, 0x18, 0x00] => "Carl Zeiss Distagon T* 2/35 ZF.2",
+        [0x00, 0x54, 0x50, 0x50, 0x0C, 0x0C, 0x00] => "Carl Zeiss Planar T* 1,4/50 ZF.2",
+        [0x00, 0x54, 0x50, 0x50, 0x18, 0x18, 0x00] => "Carl Zeiss Makro-Planar T* 2/50 ZF.2",
+        [0x00, 0x54, 0x62, 0x62, 0x0C, 0x0C, 0x00] => "Carl Zeiss Planar T* 1,4/85 ZF.2",
+        [0x00, 0x54, 0x68, 0x68, 0x18, 0x18, 0x00] => "Carl Zeiss Makro-Planar T* 2/100 ZF.2",
         [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",
@@ -381 +412 @@
         [0x00, 0x4C, 0x6A, 0x6A, 0x20, 0x20, 0x00] => "Nikon Nikkor 105mm F2.5 AiS",
         [0x00, 0x48, 0x80, 0x80, 0x30, 0x30, 0x00] => "Nikon Nikkor 200mm F4 AiS",
+        [0x00, 0x40, 0x11, 0x11, 0x2C, 0x2C, 0x00] => "Samyang 8mm f/3.5 Fish-Eye",
+        [0x00, 0x58, 0x64, 0x64, 0x20, 0x20, 0x00] => "Soligor C/D Macro MC 90mm f/2.5",
         [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00] => ""
       }