diff options
| author | gregor herrmann <gregoa@debian.org> | 2019-08-17 16:53:50 +0200 |
|---|---|---|
| committer | gregor herrmann <gregoa@debian.org> | 2019-08-17 16:53:50 +0200 |
| commit | eeb667d2cfb30f4425be29d52a352798d647e2e0 (patch) | |
| tree | 7d3f91b84e3c69e722bfc18fbd3b9caed6c3a0e1 | |
| parent | e7e9a8bb3410b15fe0c9171aadbd320e078157e3 (diff) | |
| parent | 6cf9040946d68a58000156db114dcefdf34908df (diff) | |
Update upstream source from tag 'upstream/11.62'
Update to upstream version '11.62'
with Debian dir 90cae8380a5fa68525a96d8656ac4d2c436f58ec
42 files changed, 417 insertions, 277 deletions
@@ -7,20 +7,31 @@ RSS feed: http://owl.phy.queensu.ca/~phil/exiftool/rss.xml Note: The most recent production release is Version 11.50. (Other versions are considered development releases, and are not uploaded to CPAN.) +Aug. 15, 2019 - Version 11.62 + + - Added a number of new Canon, Pentax, Sony and Sigma lenses (thanks LibRaw) + - Removed some extraneous verbose warnings when geotagging + - Removed Minolta LensType value for a non-existent lens (thanks LibRaw) + - Patched problem writing some simple qualified XMP values + - Patched to avoid writing files in Windows with Unicode surrogate characters + in their name unless the -overwrite_original_in_place option is used + - Fixed an incorrect Pentax LensType (thanks LibRaw) + - Fixed family 2 group names of some XMP-exifEX and XMP Composite tags + Aug. 7, 2019 - Version 11.61 - Added a new FujiFilm CropMode (thanks LibRaw) - - Added a couple of proprietary CustomRendered values (thanks Jeffrey Friedl) + - Added a few new proprietary CustomRendered values (thanks Jeffrey Friedl) - Added a new Nikon LensID and fixed a Canon LensType (thanks LibRaw) - Added a new CanonModelID - Decode more Sony DSC-RX100M7 tags (thanks Jos Roost) - Write standard EXIF to PNG even if non-standard EXIF already exists - - Patched to avoid problems overriding new values when writing thumbnail and - preview images - Changed a Minolta/Sony LensType (thanks LibRaw) - Changed Composite GPS reference direction tags to be derived from only the XMP-exif GPS coordinate tags (and not other XMP GPS coordinates) - Reverted a PNG Validation check that was removed from 11.60 + - Patched to avoid problems overriding new values when writing thumbnail and + preview images July 30, 2019 - Version 11.60 @@ -47,6 +47,6 @@ } }, "release_status" : "stable", - "version" : "11.61", + "version" : "11.62", "x_serialization_backend" : "JSON::PP version 4.02" } @@ -28,5 +28,5 @@ recommends: Time::HiRes: '0' requires: perl: '5.004' -version: '11.61' +version: '11.62' x_serialization_backend: 'CPAN::Meta::YAML version 0.018' @@ -76,7 +76,7 @@ See html/index.html for more details about ExifTool features. ExifTool can be downloaded from - http://owl.phy.queensu.ca/~phil/exiftool/ + https://owl.phy.queensu.ca/~phil/exiftool/ RUNNING @@ -104,8 +104,8 @@ your home directory, then you would type the following commands in a terminal window to extract and run ExifTool: cd ~/Desktop - gzip -dc Image-ExifTool-11.61.tar.gz | tar -xf - - cd Image-ExifTool-11.61 + gzip -dc Image-ExifTool-11.62.tar.gz | tar -xf - + cd Image-ExifTool-11.62 ./exiftool t/images/ExifTool.jpg Note: These commands extract meta information from one of the test images. @@ -10,7 +10,7 @@ use strict; require 5.004; -my $version = '11.61'; +my $version = '11.62'; # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool' my $exeDir; @@ -3500,7 +3500,7 @@ sub ScanDir($$;$) { local $_; my ($et, $dir, $list) = @_; - my (@fileList, $done, $file, $utf8Name); + my (@fileList, $done, $file, $utf8Name, $winSurrogate); my $enc = $et->Options('CharsetFileName'); # recode as UTF-8 if necessary if ($enc) { @@ -3529,6 +3529,7 @@ sub ScanDir($$;$) chomp $evalWarning; $evalWarning =~ s/ at .*//s; Warn "Warning: [Win32::FindFile] $evalWarning - $dir\n"; + $winSurrogate = 1 if $evalWarning =~ /surrogate/; } else { $et->Options(CharsetFileName => 'UTF8'); # now using UTF8 $utf8Name = 1; # ReadDir returns UTF-8 file names @@ -3568,6 +3569,16 @@ sub ScanDir($$;$) ScanDir($et, $path, $list); next; } + # Windows patch to avoid replacing filename containing Unicode surrogate with 8.3 name + if ($winSurrogate and $isWriting and + (not $overwriteOrig or $overwriteOrig != 2) and + not $doSetFileName and $file =~ /~/) # (8.3 name will contain a tilde) + { + Warn("Not writing $path\n"); + WarnOnce("Use -overwrite_original_in_place to write files with Unicode surrogate characters\n"); + ++$countBad; + next; + } # apply rules from -ext options my $accepted; if ($filterFlag) { @@ -5157,7 +5168,7 @@ with this command: produces output like this: - -- Generated by ExifTool 11.61 -- + -- Generated by ExifTool 11.62 -- File: a.jpg - 2003:10:31 15:44:19 (f/5.6, 1/60s, ISO 100) File: b.jpg - 2006:05:23 11:57:38 diff --git a/html/ExifTool.html b/html/ExifTool.html index 40f850fb..081210af 100644 --- a/html/ExifTool.html +++ b/html/ExifTool.html @@ -493,7 +493,10 @@ distribution for examples.</p> <td align=center><i>(see <a href="#Charset">Charset</a> option)</i><br>or 0 or undef</td><td align=center>0</td></tr> <tr id="Compact"><td>Compact</td><td>Comma-delimited list of settings for writing compact XMP. Note that 'NoPadding' effects only embedded XMP since padding is never written for - stand-alone XMP files. Case is not significant.</td><td align=center><table class=clear> + stand-alone XMP files. Also note that 'OneDesc' is not recommended when writing + XMP larger than 64 kB to a JPG file because it interferes with ExifTool's technique + of splitting off the large description elements into the extended XMP. Case is not + significant for any of these options.</td><td align=center><table class=clear> <tr><td valign=top align=right><b>NoPadding</b> =</td><td>Avoid 2 kB of recommended padding at end of XMP</td></tr> <tr><td valign=top align=right><b>NoIndent</b> =</td><td>Avoid spaces to indent lines for readability</td></tr> <tr><td valign=top align=right><b>NoNewline</b> =</td><td>Avoid unnecessary newlines</td></tr> @@ -1309,9 +1312,9 @@ errors are printed to STDERR. set in previous calls to <a href="#SetNewValue">SetNewValue</a>). This option is most commonly used to replace previously-set new values for list-type tags.</td> <td><table class=clear> - <tr><td valign=top align=center><b>0</b> =</td><td>Set new value normally</td></tr> - <tr><td valign=top align=center><b>1</b> =</td><td>Reset previous new values and replace with the specifed new value</td></tr> - <tr><td valign=top align=center><b>2</b> =</td><td>Reset previous new values only</td></tr> + <tr><td valign=top align=center><b>0</b> =</td><td>Set new value normally (adds to new values for list-type tags)</td></tr> + <tr><td valign=top align=center><b>1</b> =</td><td>Reset any previous new values before setting new value</td></tr> + <tr><td valign=top align=center><b>2</b> =</td><td>Reset previous new values only (new value argument is ignored)</td></tr> </table></td><td align=center>0</td></tr> <tr><td>Shift</td><td>Shift the tag by the specified value. Currently only date/time tags and tags with numerical values may be shifted. Value is added if Shift is 1, or subtracted diff --git a/html/TagNames/Canon.html b/html/TagNames/Canon.html index c325caa5..54ac49a5 100644 --- a/html/TagNames/Canon.html +++ b/html/TagNames/Canon.html @@ -1386,6 +1386,7 @@ attempting to identify the specific lens model.</p> </tr><tr><td>26.3</td><td>= Tamron SP AF 180mm f/3.5 Di Macro</td> </tr><tr><td>26.4</td><td>= Carl Zeiss Planar T* 50mm f/1.4</td> </tr><tr><td>26.5</td><td>= Voigtlander APO Lanthar 125mm F2.5 SL Macro</td> +</tr><tr><td>26.6</td><td>= Carl Zeiss Planar T 85mm f/1.4 ZE</td> </tr><tr><td>27</td><td>= Canon EF 35-80mm f/4-5.6</td> </tr><tr><td>28</td><td>= Canon EF 80-200mm f/4.5-5.6 or Tamron Lens</td> </tr><tr><td>28.1</td><td>= Tamron SP AF 28-105mm f/2.8 LD Aspherical IF</td> @@ -1432,6 +1433,7 @@ attempting to identify the specific lens model.</p> </tr><tr><td>46</td><td>= Canon EF 28-90mm f/4-5.6</td> </tr><tr><td>47</td><td>= Zeiss Milvus 35mm f/2 or 50mm f/2</td> </tr><tr><td>47.1</td><td>= Zeiss Milvus 50mm f/2 Makro</td> +</tr><tr><td>47.2</td><td>= Zeiss Milvus 135mm f/2 ZE</td> </tr><tr><td>48</td><td>= Canon EF-S 18-55mm f/3.5-5.6 IS</td> </tr><tr><td>49</td><td>= Canon EF-S 55-250mm f/4-5.6 IS</td> </tr><tr><td>50</td><td>= Canon EF-S 18-200mm f/3.5-5.6 IS</td> @@ -1449,6 +1451,10 @@ attempting to identify the specific lens model.</p> </tr><tr><td>103.1</td><td>= Rokinon SP 14mm f/2.4</td> </tr><tr><td>103.2</td><td>= Rokinon AF 14mm f/2.8 EF</td> </tr><tr><td>106</td><td>= Rokinon SP / Samyang XP 35mm f/1.2</td> +</tr><tr><td>112</td><td>= Sigma 28mm f/1.5 FF High-speed Prime or other Sigma Lens</td> +</tr><tr><td>112.1</td><td>= Sigma 40mm f/1.5 FF High-speed Prime</td> +</tr><tr><td>112.2</td><td>= Sigma 105mm f/1.5 FF High-speed Prime</td> +</tr><tr><td>117</td><td>= Tamron 35-150mm f/2.8-4.0 Di VC OSD</td> </tr><tr><td>124</td><td>= Canon MP-E 65mm f/2.8 1-5x Macro Photo</td> </tr><tr><td>125</td><td>= Canon TS-E 24mm f/3.5L</td> </tr><tr><td>126</td><td>= Canon TS-E 45mm f/2.8</td> @@ -1463,6 +1469,7 @@ attempting to identify the specific lens model.</p> </tr><tr><td>131.5</td><td>= Sigma APO 120-300mm f/2.8 EX DG HSM</td> </tr><tr><td>131.6</td><td>= Sigma 4.5mm f/2.8 EX DC HSM Circular Fisheye</td> </tr><tr><td>131.7</td><td>= Sigma 70-200mm f/2.8 APO EX HSM</td> +</tr><tr><td>131.8</td><td>= Sigma 28-70mm f/2.8-4 DG</td> </tr><tr><td>132</td><td>= Canon EF 1200mm f/5.6L USM</td> </tr><tr><td>134</td><td>= Canon EF 600mm f/4L IS USM</td> </tr><tr><td>135</td><td>= Canon EF 200mm f/1.8L USM</td> @@ -1484,6 +1491,7 @@ attempting to identify the specific lens model.</p> </tr><tr><td>137.14</td><td>= Tamron SP 24-70mm f/2.8 Di VC USD</td> </tr><tr><td>137.15</td><td>= Sigma 18-35mm f/1.8 DC HSM</td> </tr><tr><td>137.16</td><td>= Sigma 12-24mm f/4.5-5.6 DG HSM II</td> +</tr><tr><td>137.17</td><td>= Sigma 70-300mm f/4-5.6 DG OS</td> </tr><tr><td>138</td><td>= Canon EF 28-80mm f/2.8-4L</td> </tr><tr><td>139</td><td>= Canon EF 400mm f/2.8L USM</td> </tr><tr><td>140</td><td>= Canon EF 500mm f/4.5L USM</td> @@ -1509,6 +1517,7 @@ attempting to identify the specific lens model.</p> </tr><tr><td>152.2</td><td>= Sigma 14mm f/2.8 EX Aspherical HSM</td> </tr><tr><td>152.3</td><td>= Sigma 10-20mm f/4-5.6</td> </tr><tr><td>152.4</td><td>= Sigma 100-300mm f/4</td> +</tr><tr><td>152.5</td><td>= Sigma 300-800mm f/5.6 APO EX DG HSM</td> </tr><tr><td>153</td><td>= Canon EF 35-350mm f/3.5-5.6L USM or Sigma or Tamron Lens</td> </tr><tr><td>153.1</td><td>= Sigma 50-500mm f/4-6.3 APO HSM EX</td> </tr><tr><td>153.2</td><td>= Tamron AF 28-300mm f/3.5-6.3 XR LD Aspherical [IF] Macro</td> @@ -1516,6 +1525,8 @@ attempting to identify the specific lens model.</p> </tr><tr><td>153.4</td><td>= Tamron 18-250mm f/3.5-6.3 Di II LD Aspherical [IF] Macro</td> </tr><tr><td>154</td><td>= Canon EF 20mm f/2.8 USM or Zeiss Lens</td> </tr><tr><td>154.1</td><td>= Zeiss Milvus 21mm f/2.8</td> +</tr><tr><td>154.2</td><td>= Zeiss Milvus 15mm f/2.8 ZE</td> +</tr><tr><td>154.3</td><td>= Zeiss Milvus 18mm f/2.8 ZE</td> </tr><tr><td>155</td><td>= Canon EF 85mm f/1.8 USM or Sigma Lens</td> </tr><tr><td>155.1</td><td>= Sigma 14mm f/1.8 DG HSM | A</td> </tr><tr><td>156</td><td>= Canon EF 28-105mm f/3.5-4.5 USM or Tamron Lens</td> @@ -1553,18 +1564,29 @@ attempting to identify the specific lens model.</p> </tr><tr><td>169.6</td><td>= Sigma 30mm f/1.4 EX DC HSM</td> </tr><tr><td>169.7</td><td>= Sigma 35mm f/1.4 DG HSM</td> </tr><tr><td>169.8</td><td>= Sigma 35mm f/1.5 FF High-Speed Prime | 017</td> -</tr><tr><td>170</td><td>= Canon EF 200mm f/2.8L II USM</td> +</tr><tr><td>169.9</td><td>= Sigma 70mm f/2.8 Macro EX DG</td> +</tr><tr><td>170</td><td>= Canon EF 200mm f/2.8L II USM or Sigma Lens</td> +</tr><tr><td>170.1</td><td>= Sigma 300mm f/2.8 APO EX DG HSM</td> +</tr><tr><td>170.2</td><td>= Sigma 800mm f/5.6 APO EX DG HSM</td> </tr><tr><td>171</td><td>= Canon EF 300mm f/4L USM</td> </tr><tr><td>172</td><td>= Canon EF 400mm f/5.6L USM or Sigma Lens</td> </tr><tr><td>172.1</td><td>= Sigma 150-600mm f/5-6.3 DG OS HSM | S</td> +</tr><tr><td>172.2</td><td>= Sigma 500mm f/4.5 APO EX DG HSM</td> </tr><tr><td>173</td><td>= Canon EF 180mm Macro f/3.5L USM or Sigma Lens</td> </tr><tr><td>173.1</td><td>= Sigma 180mm EX HSM Macro f/3.5</td> </tr><tr><td>173.2</td><td>= Sigma APO Macro 150mm f/2.8 EX DG HSM</td> +</tr><tr><td>173.3</td><td>= Sigma 10mm f/2.8 EX DC Fisheye</td> +</tr><tr><td>173.4</td><td>= Sigma 15mm f/2.8 EX DG Diagonal Fisheye</td> </tr><tr><td>174</td><td>= Canon EF 135mm f/2L USM or Other Lens</td> </tr><tr><td>174.1</td><td>= Sigma 70-200mm f/2.8 EX DG APO OS HSM</td> </tr><tr><td>174.2</td><td>= Sigma 50-500mm f/4.5-6.3 APO DG OS HSM</td> </tr><tr><td>174.3</td><td>= Sigma 150-500mm f/5-6.3 APO DG OS HSM</td> </tr><tr><td>174.4</td><td>= Zeiss Milvus 100mm f/2 Makro</td> +</tr><tr><td>174.5</td><td>= Sigma APO 50-150mm f/2.8 EX DC OS HSM</td> +</tr><tr><td>174.6</td><td>= Sigma APO 120-300mm f/2.8 EX DG OS HSM</td> +</tr><tr><td>174.7</td><td>= Sigma 120-300mm f/2.8 DG OS HSM S013</td> +</tr><tr><td>174.8</td><td>= Sigma 120-400mm f/4.5-5.6 APO DG OS HSM</td> +</tr><tr><td>174.9</td><td>= Sigma 200-500mm f/2.8 APO EX DG</td> </tr><tr><td>175</td><td>= Canon EF 400mm f/2.8L USM</td> </tr><tr><td>176</td><td>= Canon EF 24-85mm f/3.5-4.5 USM</td> </tr><tr><td>177</td><td>= Canon EF 300mm f/4L IS USM</td> @@ -1608,11 +1630,13 @@ attempting to identify the specific lens model.</p> </tr><tr><td>196</td><td>= Canon EF 75-300mm f/4-5.6 USM</td> </tr><tr><td>197</td><td>= Canon EF 75-300mm f/4-5.6 IS USM or Sigma Lens</td> </tr><tr><td>197.1</td><td>= Sigma 18-300mm f/3.5-6.3 DC Macro OS HS</td> -</tr><tr><td>198</td><td>= Canon EF 50mm f/1.4 USM or Zeiss Lens</td> +</tr><tr><td>198</td><td>= Canon EF 50mm f/1.4 USM or Other Lens</td> </tr><tr><td>198.1</td><td>= Zeiss Otus 55mm f/1.4 ZE</td> </tr><tr><td>198.2</td><td>= Zeiss Otus 85mm f/1.4 ZE</td> </tr><tr><td>198.3</td><td>= Zeiss Milvus 25mm f/1.4</td> </tr><tr><td>198.4</td><td>= Zeiss Otus 100mm f/1.4</td> +</tr><tr><td>198.5</td><td>= Zeiss Milvus 35mm f/1.4 ZE</td> +</tr><tr><td>198.6</td><td>= Yongnuo YN 35mm f/2</td> </tr><tr><td>199</td><td>= Canon EF 28-80mm f/3.5-5.6 USM</td> </tr><tr><td>200</td><td>= Canon EF 75-300mm f/4-5.6 USM</td> </tr><tr><td>201</td><td>= Canon EF 28-80mm f/3.5-5.6 USM</td> @@ -1630,6 +1654,7 @@ attempting to identify the specific lens model.</p> </tr><tr><td>214</td><td>= Canon EF-S 18-55mm f/3.5-5.6 USM</td> </tr><tr><td>215</td><td>= Canon EF 55-200mm f/4.5-5.6 II USM</td> </tr><tr><td>217</td><td>= Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD</td> +</tr><tr><td>220</td><td>= Yongnuo YN 50mm f/1.8</td> </tr><tr><td>224</td><td>= Canon EF 70-200mm f/2.8L IS USM</td> </tr><tr><td>225</td><td>= Canon EF 70-200mm f/2.8L IS USM + 1.4x</td> </tr><tr><td>226</td><td>= Canon EF 70-200mm f/2.8L IS USM + 2x</td> @@ -1637,7 +1662,8 @@ attempting to identify the specific lens model.</p> </tr><tr><td>228</td><td>= Canon EF 28-105mm f/3.5-4.5 USM</td> </tr><tr><td>229</td><td>= Canon EF 16-35mm f/2.8L USM</td> </tr><tr><td>230</td><td>= Canon EF 24-70mm f/2.8L USM</td> -</tr><tr><td>231</td><td>= Canon EF 17-40mm f/4L USM</td> +</tr><tr><td>231</td><td>= Canon EF 17-40mm f/4L USM or Sigma Lens</td> +</tr><tr><td>231.1</td><td>= Sigma 12-24mm f/4 DG HSM A016</td> </tr><tr><td>232</td><td>= Canon EF 70-300mm f/4.5-5.6 DO IS USM</td> </tr><tr><td>233</td><td>= Canon EF 28-300mm f/3.5-5.6L IS USM</td> </tr><tr><td>234</td><td>= Canon EF-S 17-85mm f/4-5.6 IS USM or Tokina Lens</td> @@ -1661,11 +1687,13 @@ attempting to identify the specific lens model.</p> </tr><tr><td>248.1</td><td>= Sigma 24-35mm f/2 DG HSM | A</td> </tr><tr><td>248.2</td><td>= Sigma 135mm f/2 FF High-Speed Prime | 017</td> </tr><tr><td>248.3</td><td>= Sigma 24-35mm f/2.2 FF Zoom | 017</td> +</tr><tr><td>248.4</td><td>= Sigma 135mm f/1.8 DG HSM A017</td> </tr><tr><td>249</td><td>= Canon EF 800mm f/5.6L IS USM</td> </tr><tr><td>250</td><td>= Canon EF 24mm f/1.4L II USM or Sigma Lens</td> </tr><tr><td>250.1</td><td>= Sigma 20mm f/1.4 DG HSM | A</td> </tr><tr><td>250.2</td><td>= Sigma 20mm f/1.5 FF High-Speed Prime | 017</td> </tr><tr><td>250.3</td><td>= Tokina Opera 16-28mm f/2.8 FF</td> +</tr><tr><td>250.4</td><td>= Sigma 85mm f/1.4 DG HSM A016</td> </tr><tr><td>251</td><td>= Canon EF 70-200mm f/2.8L IS II USM</td> </tr><tr><td>251.1</td><td>= Canon EF 70-200mm f/2.8L IS III USM</td> </tr><tr><td>252</td><td>= Canon EF 70-200mm f/2.8L IS II USM + 1.4x</td> @@ -1683,6 +1711,9 @@ attempting to identify the specific lens model.</p> </tr><tr><td>368.5</td><td>= Sigma 28mm f/1.4 DG HSM | A</td> </tr><tr><td>368.6</td><td>= Sigma 150-600mm f/5-6.3 DG OS HSM | S</td> </tr><tr><td>368.7</td><td>= Sigma 85mm f/1.4 DG HSM | A</td> +</tr><tr><td>368.8</td><td>= Sigma 105mm f/1.4 DG HSM</td> +</tr><tr><td>368.9</td><td>= Sigma 14-24mm f/2.8 DG HSM</td> +</tr><tr><td>368.10</td><td>= Sigma 70mm f/2.8 DG Macro</td> </tr><tr><td>488</td><td>= Canon EF-S 15-85mm f/3.5-5.6 IS USM</td> </tr><tr><td>489</td><td>= Canon EF 70-300mm f/4-5.6L IS USM</td> </tr><tr><td>490</td><td>= Canon EF 8-15mm f/4L Fisheye USM</td> @@ -10466,7 +10497,7 @@ SX280, and CR3 images from cameras such as the EOS M50.</p> <hr> (This document generated automatically by Image::ExifTool::BuildTagLookup) -<br><i>Last revised Aug 7, 2019</i> +<br><i>Last revised Aug 15, 2019</i> <p class=lf><a href='index.html'><-- ExifTool Tag Names</a></p> </body> </html> diff --git a/html/TagNames/Minolta.html b/html/TagNames/Minolta.html index f1987230..f24097c7 100644 --- a/html/TagNames/Minolta.html +++ b/html/TagNames/Minolta.html @@ -362,8 +362,9 @@ adapter is used.</p> </tr><tr><td>45</td><td>= Carl Zeiss Planar T* 85mm F1.4 ZA (SAL85F14Z)</td> </tr><tr><td>46</td><td>= Carl Zeiss Vario-Sonnar T* DT 16-80mm F3.5-4.5 ZA (SAL1680Z)</td> </tr><tr><td>47</td><td>= Carl Zeiss Sonnar T* 135mm F1.8 ZA (SAL135F18Z)</td> -</tr><tr><td>48</td><td>= Carl Zeiss Vario-Sonnar T* 24-70mm F2.8 ZA SSM (SAL2470Z) or ZA SSM II</td> +</tr><tr><td>48</td><td>= Carl Zeiss Vario-Sonnar T* 24-70mm F2.8 ZA SSM (SAL2470Z) or Other Lens</td> </tr><tr><td>48.1</td><td>= Carl Zeiss Vario-Sonnar T* 24-70mm F2.8 ZA SSM II (SAL2470Z2)</td> +</tr><tr><td>48.2</td><td>= Tamron SP 24-70mm F2.8 Di USD</td> </tr><tr><td>49</td><td>= Sony DT 55-200mm F4-5.6 (SAL55200)</td> </tr><tr><td>50</td><td>= Sony DT 18-250mm F3.5-6.3 (SAL18250)</td> </tr><tr><td>51</td><td>= Sony DT 16-105mm F3.5-5.6 (SAL16105)</td> @@ -395,13 +396,12 @@ adapter is used.</p> </tr><tr><td>128</td><td>= Tamron or Sigma Lens (128)</td> </tr><tr><td>128.1</td><td>= Tamron AF 18-200mm F3.5-6.3 XR Di II LD Aspherical [IF] Macro</td> </tr><tr><td>128.2</td><td>= Tamron AF 28-300mm F3.5-6.3 XR Di LD Aspherical [IF] Macro</td> -</tr><tr><td>128.3</td><td>= Tamron 80-300mm F3.5-6.3</td> -</tr><tr><td>128.4</td><td>= Tamron AF 28-200mm F3.8-5.6 XR Di Aspherical [IF] Macro</td> -</tr><tr><td>128.5</td><td>= Tamron SP AF 17-35mm F2.8-4 Di LD Aspherical IF</td> -</tr><tr><td>128.6</td><td>= Sigma AF 50-150mm F2.8 EX DC APO HSM II</td> -</tr><tr><td>128.7</td><td>= Sigma 10-20mm F3.5 EX DC HSM</td> -</tr><tr><td>128.8</td><td>= Sigma 70-200mm F2.8 II EX DG APO MACRO HSM</td> -</tr><tr><td>128.9</td><td>= Sigma 10mm F2.8 EX DC HSM Fisheye</td> +</tr><tr><td>128.3</td><td>= Tamron AF 28-200mm F3.8-5.6 XR Di Aspherical [IF] Macro</td> +</tr><tr><td>128.4</td><td>= Tamron SP AF 17-35mm F2.8-4 Di LD Aspherical IF</td> +</tr><tr><td>128.5</td><td>= Sigma AF 50-150mm F2.8 EX DC APO HSM II</td> +</tr><tr><td>128.6</td><td>= Sigma 10-20mm F3.5 EX DC HSM</td> +</tr><tr><td>128.7</td><td>= Sigma 70-200mm F2.8 II EX DG APO MACRO HSM</td> +</tr><tr><td>128.8</td><td>= Sigma 10mm F2.8 EX DC HSM Fisheye</td> </tr><tr><td>128.10</td><td>= Sigma 50mm F1.4 EX DG HSM</td> </tr><tr><td>128.11</td><td>= Sigma 85mm F1.4 EX DG HSM</td> </tr><tr><td>128.12</td><td>= Sigma 24-70mm F2.8 IF EX DG HSM</td> @@ -473,10 +473,11 @@ adapter is used.</p> </tr><tr><td>25521.7</td><td>= Angenieux AF 28-70mm F2.6</td> </tr><tr><td>25521.8</td><td>= Tokina AT-X 17 AF 17mm F3.5</td> </tr><tr><td>25521.9</td><td>= Tokina 20-35mm F3.5-4.5 II AF</td> -</tr><tr><td>25531</td><td>= Minolta AF 28-135mm F4-4.5 or Sigma Lens</td> +</tr><tr><td>25531</td><td>= Minolta AF 28-135mm F4-4.5 or Other Lens</td> </tr><tr><td>25531.1</td><td>= Sigma ZOOM-alpha 35-135mm F3.5-4.5</td> </tr><tr><td>25531.2</td><td>= Sigma 28-105mm F2.8-4 Aspherical</td> </tr><tr><td>25531.3</td><td>= Sigma 28-105mm F4-5.6 UC</td> +</tr><tr><td>25531.4</td><td>= Tokina AT-X 242 AF 24-200mm F3.5-5.6</td> </tr><tr><td>25541</td><td>= Minolta AF 35-105mm F3.5-4.5</td> </tr><tr><td>25551</td><td>= Minolta AF 70-210mm F4 Macro or Sigma Lens</td> </tr><tr><td>25551.1</td><td>= Sigma 70-210mm F4-5.6 APO</td> @@ -568,6 +569,7 @@ adapter is used.</p> </tr><tr><td>26721</td><td>= Minolta AF 24-105mm F3.5-4.5 (D)</td> </tr><tr><td>30464</td><td>= Metabones Canon EF Speed Booster</td> </tr><tr><td>45671</td><td>= Tokina 70-210mm F4-5.6</td> +</tr><tr><td>45681</td><td>= Tokina AF 35-200mm F4-5.6 Zoom SD</td> </tr><tr><td>45701</td><td>= Tamron AF 35-135mm F3.5-4.5</td> </tr><tr><td>45711</td><td>= Vivitar 70-210mm F4.5-5.6</td> </tr><tr><td>45741</td><td>= 2x Teleconverter or Tamron or Tokina Lens</td> @@ -2588,7 +2590,7 @@ DiMAGE X and Xt.</p> <hr> (This document generated automatically by Image::ExifTool::BuildTagLookup) -<br><i>Last revised Aug 6, 2019</i> +<br><i>Last revised Aug 15, 2019</i> <p class=lf><a href='index.html'><-- ExifTool Tag Names</a></p> </body> </html> diff --git a/html/TagNames/Panasonic.html b/html/TagNames/Panasonic.html index ab9ea199..b816eddb 100644 --- a/html/TagNames/Panasonic.html +++ b/html/TagNames/Panasonic.html @@ -1290,40 +1290,42 @@ on the M9, or the focal length of some multi-focal lenses.</p> </tr><tr><td>16</td><td>= Tri-Elmar-M 16-18-21mm f/4 ASPH.</td> <td class=b>51</td><td class=b>= Super-Elmar-M 21mm f/3.4 Asph</td> </tr><tr><td>23</td><td>= Summicron-M 50mm f/2 (III)</td> -<td class=b>52</td><td class=b>= Super-Elmar-M 18mm f/3.8 ASPH.</td> +<td class=b>52</td><td class=b>= Apo-Telyt-M 18mm f/3.8 ASPH.</td> </tr><tr><td>24</td><td>= Elmarit-M 21mm f/2.8 ASPH.</td> -<td class=b>58</td><td class=b>= Noctilux-M 75mm f/1.25 ASPH.</td> +<td class=b>53</td><td class=b>= Apo-Telyt-M 135mm f/3.4</td> </tr><tr><td>25</td><td>= Elmarit-M 24mm f/2.8 ASPH.</td> -<td class=b>'0 0'</td><td class=b>= Uncoded lens</td> +<td class=b>58</td><td class=b>= Noctilux-M 75mm f/1.25 ASPH.</td> </tr><tr><td>26</td><td>= Summicron-M 28mm f/2 ASPH.</td> -<td class=b>'6 0'</td><td class=b>= Summilux-M 35mm f/1.4</td> +<td class=b>'0 0'</td><td class=b>= Uncoded lens</td> </tr><tr><td>27</td><td>= Elmarit-M 28mm f/2.8 (IV)</td> -<td class=b>'9 0'</td><td class=b>= Apo-Telyt-M 135mm f/3.4</td> +<td class=b>'6 0'</td><td class=b>= Summilux-M 35mm f/1.4</td> </tr><tr><td>28</td><td>= Elmarit-M 28mm f/2.8 ASPH.</td> -<td class=b>'16 1'</td><td class=b>= Tri-Elmar-M 16-18-21mm f/4 ASPH. (at 16mm)</td> +<td class=b>'9 0'</td><td class=b>= Apo-Telyt-M 135mm f/3.4</td> </tr><tr><td>29</td><td>= Summilux-M 35mm f/1.4 ASPH.</td> -<td class=b>'16 2'</td><td class=b>= Tri-Elmar-M 16-18-21mm f/4 ASPH. (at 18mm)</td> +<td class=b>'16 1'</td><td class=b>= Tri-Elmar-M 16-18-21mm f/4 ASPH. (at 16mm)</td> </tr><tr><td>30</td><td>= Summicron-M 35mm f/2 ASPH.</td> -<td class=b>'16 3'</td><td class=b>= Tri-Elmar-M 16-18-21mm f/4 ASPH. (at 21mm)</td> +<td class=b>'16 2'</td><td class=b>= Tri-Elmar-M 16-18-21mm f/4 ASPH. (at 18mm)</td> </tr><tr><td>31</td><td>= Noctilux-M 50mm f/1</td> -<td class=b>'29 0'</td><td class=b>= Summilux-M 35mm f/1.4 ASPHERICAL</td> +<td class=b>'16 3'</td><td class=b>= Tri-Elmar-M 16-18-21mm f/4 ASPH. (at 21mm)</td> </tr><tr><td>32</td><td>= Summilux-M 50mm f/1.4 ASPH.</td> -<td class=b>'31 0'</td><td class=b>= Noctilux-M 50mm f/1.2</td> +<td class=b>'29 0'</td><td class=b>= Summilux-M 35mm f/1.4 ASPHERICAL</td> </tr><tr><td>33</td><td>= Summicron-M 50mm f/2 (IV, V)</td> -<td class=b>'39 0'</td><td class=b>= Tele-Elmar-M 135mm f/4 (II)</td> +<td class=b>'31 0'</td><td class=b>= Noctilux-M 50mm f/1.2</td> </tr><tr><td>34</td><td>= Elmar-M 50mm f/2.8</td> -<td class=b>'41 3'</td><td class=b>= Apo-Summicron-M 50mm f/2 Asph</td> +<td class=b>'39 0'</td><td class=b>= Tele-Elmar-M 135mm f/4 (II)</td> </tr><tr><td>35</td><td>= Summilux-M 75mm f/1.4</td> -<td class=b>'42 1'</td><td class=b>= Tri-Elmar-M 28-35-50mm f/4 ASPH. (at 28mm)</td> +<td class=b>'41 3'</td><td class=b>= Apo-Summicron-M 50mm f/2 ASPH.</td> </tr><tr><td>36</td><td>= Apo-Summicron-M 75mm f/2 ASPH.</td> -<td class=b>'42 2'</td><td class=b>= Tri-Elmar-M 28-35-50mm f/4 ASPH. (at 35mm)</td> +<td class=b>'42 1'</td><td class=b>= Tri-Elmar-M 28-35-50mm f/4 ASPH. (at 28mm)</td> </tr><tr><td>37</td><td>= Apo-Summicron-M 90mm f/2 ASPH.</td> -<td class=b>'42 3'</td><td class=b>= Tri-Elmar-M 28-35-50mm f/4 ASPH. (at 50mm)</td> +<td class=b>'42 2'</td><td class=b>= Tri-Elmar-M 28-35-50mm f/4 ASPH. (at 35mm)</td> </tr><tr><td>38</td><td>= Elmarit-M 90mm f/2.8</td> -<td class=b>'51 2'</td><td class=b>= Super-Elmar-M 14mm f/3.8 Asph</td> +<td class=b>'42 3'</td><td class=b>= Tri-Elmar-M 28-35-50mm f/4 ASPH. (at 50mm)</td> </tr><tr><td>39</td><td>= Macro-Elmar-M 90mm f/4</td> -<td class=b>'53 2'</td><td class=b>= Apo-Telyt-M 135mm f/3.4</td> +<td class=b>'51 2'</td><td class=b>= Super-Elmar-M 14mm f/3.8 Asph</td> </tr><tr><td>40</td><td>= Macro-Adapter M</td> +<td class=b>'53 2'</td><td class=b>= Apo-Telyt-M 135mm f/3.4</td> +</tr><tr><td>41</td><td>= Apo-Summicron-M 50mm f/2 ASPH.</td> <td class=b>'53 3'</td><td class=b>= Apo-Summicron-M 50mm f/2 (VI)</td> </tr></table></td></tr></table></blockquote> @@ -1927,7 +1929,7 @@ various Panasonic and Leica models.</p> <hr> (This document generated automatically by Image::ExifTool::BuildTagLookup) -<br><i>Last revised Jul 8, 2019</i> +<br><i>Last revised Aug 15, 2019</i> <p class=lf><a href='index.html'><-- ExifTool Tag Names</a></p> </body> </html> diff --git a/html/TagNames/Pentax.html b/html/TagNames/Pentax.html index 49d408fd..032ab39f 100644 --- a/html/TagNames/Pentax.html +++ b/html/TagNames/Pentax.html @@ -1922,7 +1922,7 @@ identify the specific lens model.</p> </tr><tr><td>'3 44.3'</td><td>= Sigma 17-70mm F2.8-4.5 DC Macro</td> </tr><tr><td>'3 44.4'</td><td>= Sigma 18-50mm F3.5-5.6 DC</td> </tr><tr><td>'3 44.5'</td><td>= Sigma 17-35mm F2.8-4 EX DG</td> -</tr><tr><td>'3 44.6'</td><td>= Tamron 35-90mm F4 AF</td> +</tr><tr><td>'3 44.6'</td><td>= Tamron 35-90mm F4-5.6 AF</td> </tr><tr><td>'3 44.7'</td><td>= Sigma AF 18-35mm F3.5-4.5 Aspherical</td> </tr><tr><td>'3 46'</td><td>= Sigma or Samsung Lens (3 46)</td> </tr><tr><td>'3 46.1'</td><td>= Sigma APO 70-200mm F2.8 EX</td> @@ -2080,6 +2080,7 @@ identify the specific lens model.</p> </tr><tr><td>'8 0'</td><td>= Sigma 50-150mm F2.8 II APO EX DC HSM</td> </tr><tr><td>'8 3'</td><td>= Sigma 18-125mm F3.8-5.6 DC HSM</td> </tr><tr><td>'8 4'</td><td>= Sigma 50mm F1.4 EX DG HSM</td> +</tr><tr><td>'8 6'</td><td>= Sigma 4.5mm F2.8 EX DC Fisheye</td> </tr><tr><td>'8 7'</td><td>= Sigma 24-70mm F2.8 IF EX DG HSM</td> </tr><tr><td>'8 8'</td><td>= Sigma 18-250mm F3.5-6.3 DC OS HSM</td> </tr><tr><td>'8 11'</td><td>= Sigma 10-20mm F3.5 EX DC HSM</td> @@ -2090,6 +2091,7 @@ identify the specific lens model.</p> </tr><tr><td>'8 16'</td><td>= Sigma 70-200mm F2.8 EX DG Macro HSM II</td> </tr><tr><td>'8 17'</td><td>= Sigma 50-500mm F4.5-6.3 DG OS HSM</td> </tr><tr><td>'8 18'</td><td>= Sigma 8-16mm F4.5-5.6 DC HSM</td> +</tr><tr><td>'8 20'</td><td>= Sigma 18-50mm F2.8-4.5 DC HSM</td> </tr><tr><td>'8 21'</td><td>= Sigma 17-50mm F2.8 EX DC OS HSM</td> </tr><tr><td>'8 22'</td><td>= Sigma 85mm F1.4 EX DG HSM</td> </tr><tr><td>'8 23'</td><td>= Sigma 70-200mm F2.8 APO EX DG OS HSM</td> @@ -4890,7 +4892,7 @@ stored as ASCII text in a format very similar to some HP models.</p> <hr> (This document generated automatically by Image::ExifTool::BuildTagLookup) -<br><i>Last revised Jul 2, 2019</i> +<br><i>Last revised Aug 15, 2019</i> <p class=lf><a href='index.html'><-- ExifTool Tag Names</a></p> </body> </html> diff --git a/html/TagNames/Sigma.html b/html/TagNames/Sigma.html index 523d8abf..8a7b4748 100644 --- a/html/TagNames/Sigma.html +++ b/html/TagNames/Sigma.html @@ -357,192 +357,194 @@ LensID tag when attempting to identify the specific lens model.</p> <table class='inner sep' cellspacing=1> <tr class=h><th>Value</th><th>LensType</th><th>Value</th><th>LensType</th></tr> <tr><td>0x10</td><td>= Sigma 50mm F2.8 EX DG MACRO</td> -<td class=b>0x548</td><td class=b>= Sigma 24-70mm F2.8 EX DG Macro</td> +<td class=b>0x547</td><td class=b>= Sigma 24-60mm F2.8 EX DG</td> </tr><tr><td>0x10.1</td><td>= Sigma 70mm F2.8 EX DG Macro</td> -<td class=b>0x549</td><td class=b>= Sigma 28-70mm F2.8 EX DG</td> +<td class=b>0x548</td><td class=b>= Sigma 24-70mm F2.8 EX DG Macro</td> </tr><tr><td>0x10.2</td><td>= Sigma 105mm F2.8 EX DG Macro</td> -<td class=b>0x566</td><td class=b>= Sigma 70-200mm F2.8 EX IF APO</td> +<td class=b>0x549</td><td class=b>= Sigma 28-70mm F2.8 EX DG</td> </tr><tr><td>0x16</td><td>= Sigma 18-50mm F3.5-5.6 DC</td> -<td class=b>0x567</td><td class=b>= Sigma 70-200mm F2.8 EX IF HSM APO</td> +<td class=b>0x566</td><td class=b>= Sigma 70-200mm F2.8 EX IF APO</td> </tr><tr><td>0x103</td><td>= Sigma 180mm F3.5 EX IF HSM APO Macro</td> -<td class=b>0x568</td><td class=b>= Sigma 70-200mm F2.8 EX DG IF HSM APO</td> +<td class=b>0x567</td><td class=b>= Sigma 70-200mm F2.8 EX IF HSM APO</td> </tr><tr><td>0x104</td><td>= Sigma 150mm F2.8 EX DG HSM APO Macro</td> -<td class=b>0x569</td><td class=b>= Sigma 70-200 F2.8 EX DG HSM APO Macro</td> +<td class=b>0x568</td><td class=b>= Sigma 70-200mm F2.8 EX DG IF HSM APO</td> </tr><tr><td>0x105</td><td>= Sigma 180mm F3.5 EX DG HSM APO Macro</td> -<td class=b>0x571</td><td class=b>= Sigma 24-70mm F2.8 IF EX DG HSM</td> +<td class=b>0x569</td><td class=b>= Sigma 70-200 F2.8 EX DG HSM APO Macro</td> </tr><tr><td>0x106</td><td>= Sigma 150mm F2.8 EX DG OS HSM APO Macro</td> -<td class=b>0x572</td><td class=b>= Sigma 70-300mm F4-5.6 DG OS</td> +<td class=b>0x571</td><td class=b>= Sigma 24-70mm F2.8 IF EX DG HSM</td> </tr><tr><td>0x107</td><td>= Sigma 180mm F2.8 EX DG OS HSM APO Macro</td> -<td class=b>0x576</td><td class=b>= Sigma 24-70mm F2.8 DG OS HSM | A</td> +<td class=b>0x572</td><td class=b>= Sigma 70-300mm F4-5.6 DG OS</td> </tr><tr><td>0x129</td><td>= Sigma Lens (0x129)</td> -<td class=b>0x579</td><td class=b>= Sigma 70-200mm F2.8 EX DG HSM APO Macro</td> +<td class=b>0x576</td><td class=b>= Sigma 24-70mm F2.8 DG OS HSM | A</td> </tr><tr><td>0x129.1</td><td>= Sigma 14mm F2.8 EX Aspherical</td> -<td class=b>0x580</td><td class=b>= Sigma 18-50mm F2.8 EX DC</td> +<td class=b>0x579</td><td class=b>= Sigma 70-200mm F2.8 EX DG HSM APO Macro</td> </tr><tr><td>0x129.2</td><td>= Sigma 30mm F1.4</td> -<td class=b>0x581</td><td class=b>= Sigma 18-50mm F2.8 EX DC Macro</td> +<td class=b>0x580</td><td class=b>= Sigma 18-50mm F2.8 EX DC</td> </tr><tr><td>0x131</td><td>= Sigma Lens (0x131)</td> -<td class=b>0x582</td><td class=b>= Sigma 18-50mm F2.8 EX DC HSM Macro</td> +<td class=b>0x581</td><td class=b>= Sigma 18-50mm F2.8 EX DC Macro</td> </tr><tr><td>0x131.1</td><td>= Sigma 17-70mm F2.8-4.5 DC Macro</td> -<td class=b>0x583</td><td class=b>= Sigma 17-50mm F2.8 EX DC OS HSM</td> +<td class=b>0x582</td><td class=b>= Sigma 18-50mm F2.8 EX DC HSM Macro</td> </tr><tr><td>0x131.2</td><td>= Sigma 70-200mm F2.8 APO EX HSM</td> -<td class=b>0x588</td><td class=b>= Sigma 24-35mm F2 DG HSM | A</td> +<td class=b>0x583</td><td class=b>= Sigma 17-50mm F2.8 EX DC OS HSM</td> </tr><tr><td>0x131.3</td><td>= Sigma 120-300mm F2.8 APO EX IF HSM</td> -<td class=b>0x589</td><td class=b>= Sigma APO 70-200mm F2.8 EX DG OS HSM</td> +<td class=b>0x588</td><td class=b>= Sigma 24-35mm F2 DG HSM | A</td> </tr><tr><td>0x134</td><td>= Sigma 100-300mm F4 EX DG HSM APO</td> -<td class=b>0x594</td><td class=b>= Sigma 300-800mm F5.6 EX HSM IF APO</td> +<td class=b>0x589</td><td class=b>= Sigma APO 70-200mm F2.8 EX DG OS HSM</td> </tr><tr><td>0x135</td><td>= Sigma 120-300mm F2.8 EX DG HSM APO</td> -<td class=b>0x595</td><td class=b>= Sigma 300-800mm F5.6 EX DG APO HSM</td> +<td class=b>0x594</td><td class=b>= Sigma 300-800mm F5.6 EX HSM IF APO</td> </tr><tr><td>0x136</td><td>= Sigma 120-300mm F2.8 EX DG OS HSM APO</td> -<td class=b>0x597</td><td class=b>= Sigma 200-500mm F2.8 APO EX DG</td> +<td class=b>0x595</td><td class=b>= Sigma 300-800mm F5.6 EX DG APO HSM</td> </tr><tr><td>0x137</td><td>= Sigma 120-300mm F2.8 DG OS HSM | S</td> -<td class=b>0x5a8</td><td class=b>= Sigma 70-300mm F4-5.6 APO DG Macro (Motorized)</td> +<td class=b>0x597</td><td class=b>= Sigma 200-500mm F2.8 APO EX DG</td> </tr><tr><td>0x143</td><td>= Sigma 600mm F8 Mirror</td> -<td class=b>0x5a9</td><td class=b>= Sigma 70-300mm F4-5.6 DG Macro (Motorized)</td> +<td class=b>0x5a8</td><td class=b>= Sigma 70-300mm F4-5.6 APO DG Macro (Motorized)</td> </tr><tr><td>0x145</td><td>= Sigma Lens (0x145)</td> -<td class=b>0x633</td><td class=b>= Sigma 28-70mm F2.8-4 HS</td> +<td class=b>0x5a9</td><td class=b>= Sigma 70-300mm F4-5.6 DG Macro (Motorized)</td> </tr><tr><td>0x145.1</td><td>= Sigma 15-30mm F3.5-4.5 EX DG Aspherical</td> -<td class=b>0x634</td><td class=b>= Sigma 28-70mm F2.8-4 DG</td> +<td class=b>0x633</td><td class=b>= Sigma 28-70mm F2.8-4 HS</td> </tr><tr><td>0x145.2</td><td>= Sigma 18-50mm F2.8 EX DG</td> -<td class=b>0x635</td><td class=b>= Sigma 24-105mm F4 DG OS HSM | A</td> +<td class=b>0x634</td><td class=b>= Sigma 28-70mm F2.8-4 DG</td> </tr><tr><td>0x145.3</td><td>= Sigma 20-40mm F2.8 EX DG</td> -<td class=b>0x644</td><td class=b>= Sigma 28-80mm F3.5-5.6 ASP HF Macro</td> +<td class=b>0x635</td><td class=b>= Sigma 24-105mm F4 DG OS HSM | A</td> </tr><tr><td>0x150</td><td>= Sigma 30mm F1.4 DC HSM</td> -<td class=b>0x659</td><td class=b>= Sigma 28-80mm F3.5-5.6 Mini Zoom Macro II ASP</td> +<td class=b>0x644</td><td class=b>= Sigma 28-80mm F3.5-5.6 ASP HF Macro</td> </tr><tr><td>0x152</td><td>= Sigma Lens (0x152)</td> -<td class=b>0x661</td><td class=b>= Sigma 28-105mm F2.8-4 IF ASP</td> +<td class=b>0x659</td><td class=b>= Sigma 28-80mm F3.5-5.6 Mini Zoom Macro II ASP</td> </tr><tr><td>0x152.1</td><td>= Sigma APO 800mm F5.6 EX DG HSM</td> -<td class=b>0x663</td><td class=b>= Sigma 28-105mm F3.8-5.6 IF UC-III ASP</td> +<td class=b>0x661</td><td class=b>= Sigma 28-105mm F2.8-4 IF ASP</td> </tr><tr><td>0x152.2</td><td>= Sigma 12-24mm F4.5-5.6 EX DG ASP HSM</td> -<td class=b>0x664</td><td class=b>= Sigma 28-105mm F2.8-4 IF DG ASP</td> +<td class=b>0x663</td><td class=b>= Sigma 28-105mm F3.8-5.6 IF UC-III ASP</td> </tr><tr><td>0x152.3</td><td>= Sigma 10-20mm F4-5.6 EX DC HSM</td> -<td class=b>0x667</td><td class=b>= Sigma 24-135mm F2.8-4.5 IF ASP</td> +<td class=b>0x664</td><td class=b>= Sigma 28-105mm F2.8-4 IF DG ASP</td> </tr><tr><td>0x165</td><td>= Sigma 70-200mm F2.8 EX</td> -<td class=b>0x668</td><td class=b>= Sigma 17-70mm F2.8-4 DC Macro OS HSM</td> +<td class=b>0x667</td><td class=b>= Sigma 24-135mm F2.8-4.5 IF ASP</td> </tr><tr><td>0x169</td><td>= Sigma 18-50mm F2.8 EX DC</td> -<td class=b>0x669</td><td class=b>= Sigma 17-70mm F2.8-4.5 DC HSM Macro</td> +<td class=b>0x668</td><td class=b>= Sigma 17-70mm F2.8-4 DC Macro OS HSM</td> </tr><tr><td>0x183</td><td>= Sigma 500mm F4.5 EX HSM APO</td> -<td class=b>0x684</td><td class=b>= Sigma 55-200mm F4-5.6 DC</td> +<td class=b>0x669</td><td class=b>= Sigma 17-70mm F2.8-4.5 DC HSM Macro</td> </tr><tr><td>0x184</td><td>= Sigma 500mm F4.5 EX DG HSM APO</td> -<td class=b>0x686</td><td class=b>= Sigma 50-200mm F4-5.6 DC OS HSM</td> +<td class=b>0x684</td><td class=b>= Sigma 55-200mm F4-5.6 DC</td> </tr><tr><td>0x185</td><td>= Sigma 500mm F4 DG OS HSM | S</td> -<td class=b>0x689</td><td class=b>= Sigma 17-70mm F2.8-4.5 DC Macro</td> +<td class=b>0x686</td><td class=b>= Sigma 50-200mm F4-5.6 DC OS HSM</td> </tr><tr><td>0x194</td><td>= Sigma 300mm F2.8 EX HSM APO</td> -<td class=b>0x690</td><td class=b>= Sigma 50-150mm F2.8 EX DC HSM APO</td> +<td class=b>0x689</td><td class=b>= Sigma 17-70mm F2.8-4.5 DC Macro</td> </tr><tr><td>0x195</td><td>= Sigma 300mm F2.8 EX DG HSM APO</td> -<td class=b>0x691</td><td class=b>= Sigma 50-150mm F2.8 EX DC APO HSM II</td> +<td class=b>0x690</td><td class=b>= Sigma 50-150mm F2.8 EX DC HSM APO</td> </tr><tr><td>0x200</td><td>= Sigma 12-24mm F4.5-5.6 EX DG ASP HSM</td> -<td class=b>0x692</td><td class=b>= Sigma APO 50-150mm F2.8 EX DC OS HSM</td> +<td class=b>0x691</td><td class=b>= Sigma 50-150mm F2.8 EX DC APO HSM II</td> </tr><tr><td>0x201</td><td>= Sigma 10-20mm F4-5.6 EX DC HSM</td> -<td class=b>0x693</td><td class=b>= Sigma 50-100mm F1.8 DC HSM | A</td> +<td class=b>0x692</td><td class=b>= Sigma APO 50-150mm F2.8 EX DC OS HSM</td> </tr><tr><td>0x202</td><td>= Sigma 10-20mm F3.5 EX DC HSM</td> -<td class=b>0x709</td><td class=b>= Sigma 28-135mm F3.8-5.6 IF ASP Macro</td> +<td class=b>0x693</td><td class=b>= Sigma 50-100mm F1.8 DC HSM | A</td> </tr><tr><td>0x203</td><td>= Sigma 8-16mm F4.5-5.6 DC HSM</td> -<td class=b>0x723</td><td class=b>= Sigma 135-400mm F4.5-5.6 ASP APO</td> +<td class=b>0x709</td><td class=b>= Sigma 28-135mm F3.8-5.6 IF ASP Macro</td> </tr><tr><td>0x204</td><td>= Sigma 12-24mm F4.5-5.6 DG HSM II</td> -<td class=b>0x725</td><td class=b>= Sigma 80-400mm F4.5-5.6 EX OS</td> +<td class=b>0x723</td><td class=b>= Sigma 135-400mm F4.5-5.6 ASP APO</td> </tr><tr><td>0x205</td><td>= Sigma 12-24mm F4 DG HSM | A</td> -<td class=b>0x726</td><td class=b>= Sigma 80-400mm F4.5-5.6 EX DG OS APO</td> +<td class=b>0x725</td><td class=b>= Sigma 80-400mm F4.5-5.6 EX OS</td> </tr><tr><td>0x210</td><td>= Sigma 18-35mm F1.8 DC HSM | A</td> -<td class=b>0x727</td><td class=b>= Sigma 135-400mm F4.5-5.6 DG ASP APO</td> +<td class=b>0x726</td><td class=b>= Sigma 80-400mm F4.5-5.6 EX DG OS APO</td> </tr><tr><td>0x240</td><td>= Sigma 135mm F1.8 DG HSM | A</td> -<td class=b>0x728</td><td class=b>= Sigma 120-400mm F4.5-5.6 DG APO OS HSM</td> +<td class=b>0x727</td><td class=b>= Sigma 135-400mm F4.5-5.6 DG ASP APO</td> </tr><tr><td>0x256</td><td>= Sigma 105mm F2.8 EX Macro</td> -<td class=b>0x729</td><td class=b>= Sigma 100-400mm F5-6.3 DG OS HSM | C</td> +<td class=b>0x728</td><td class=b>= Sigma 120-400mm F4.5-5.6 DG APO OS HSM</td> </tr><tr><td>0x257</td><td>= Sigma 105mm F2.8 EX DG Macro</td> -<td class=b>0x730</td><td class=b>= Sigma 60-600mm F4.5-6.3 DG OS HSM | S</td> +<td class=b>0x729</td><td class=b>= Sigma 100-400mm F5-6.3 DG OS HSM | C</td> </tr><tr><td>0x258</td><td>= Sigma 105mm F2.8 EX DG OS HSM Macro</td> -<td class=b>0x733</td><td class=b>= Sigma 170-500mm F5-6.3 ASP APO</td> +<td class=b>0x730</td><td class=b>= Sigma 60-600mm F4.5-6.3 DG OS HSM | S</td> </tr><tr><td>0x259</td><td>= Sigma 105mm F1.4 DG HSM | A</td> -<td class=b>0x734</td><td class=b>= Sigma 170-500mm F5-6.3 DG ASP APO</td> +<td class=b>0x733</td><td class=b>= Sigma 170-500mm F5-6.3 ASP APO</td> </tr><tr><td>0x270</td><td>= Sigma 70mm F2.8 EX DG Macro</td> -<td class=b>0x735</td><td class=b>= Sigma 50-500mm F4-6.3 EX RF HSM APO</td> +<td class=b>0x734</td><td class=b>= Sigma 170-500mm F5-6.3 DG ASP APO</td> </tr><tr><td>0x271</td><td>= Sigma 70mm F2.8 DG Macro | A</td> -<td class=b>0x736</td><td class=b>= Sigma 50-500mm F4-6.3 EX DG HSM APO</td> +<td class=b>0x735</td><td class=b>= Sigma 50-500mm F4-6.3 EX RF HSM APO</td> </tr><tr><td>0x300</td><td>= Sigma 30mm F1.4 EX DC HSM</td> -<td class=b>0x737</td><td class=b>= Sigma 150-500mm F5-6.3 APO DG OS HSM</td> +<td class=b>0x736</td><td class=b>= Sigma 50-500mm F4-6.3 EX DG HSM APO</td> </tr><tr><td>0x301</td><td>= Sigma 30mm F1.4 DC HSM | A</td> -<td class=b>0x738</td><td class=b>= Sigma 50-500mm F4.5-6.3 APO DG OS HSM</td> +<td class=b>0x737</td><td class=b>= Sigma 150-500mm F5-6.3 APO DG OS HSM</td> </tr><tr><td>0x302</td><td>= Sigma 30mm F1.4 DC DN | C</td> -<td class=b>0x740</td><td class=b>= Sigma 150-600mm F5-6.3 DG OS HSM | S</td> +<td class=b>0x738</td><td class=b>= Sigma 50-500mm F4.5-6.3 APO DG OS HSM</td> </tr><tr><td>0x310</td><td>= Sigma 50mm F1.4 EX DG HSM</td> -<td class=b>0x745</td><td class=b>= Sigma 150-600mm F5-6.3 DG OS HSM | C</td> +<td class=b>0x740</td><td class=b>= Sigma 150-600mm F5-6.3 DG OS HSM | S</td> </tr><tr><td>0x311</td><td>= Sigma 50mm F1.4 DG HSM | A</td> -<td class=b>0x777</td><td class=b>= Sigma 18-200mm F3.5-6.3 DC</td> +<td class=b>0x745</td><td class=b>= Sigma 150-600mm F5-6.3 DG OS HSM | C</td> </tr><tr><td>0x320</td><td>= Sigma 85mm F1.4 EX DG HSM</td> -<td class=b>0x77d</td><td class=b>= Sigma 18-200mm F3.5-6.3 DC (Motorized)</td> +<td class=b>0x777</td><td class=b>= Sigma 18-200mm F3.5-6.3 DC</td> </tr><tr><td>0x321</td><td>= Sigma 85mm F1.4 DG HSM | A</td> -<td class=b>0x787</td><td class=b>= Sigma 28-200mm F3.5-5.6 Compact ASP HZ Macro</td> +<td class=b>0x77d</td><td class=b>= Sigma 18-200mm F3.5-6.3 DC (Motorized)</td> </tr><tr><td>0x330</td><td>= Sigma 30mm F2.8 EX DN</td> -<td class=b>0x789</td><td class=b>= Sigma 18-125mm F3.5-5.6 DC</td> +<td class=b>0x787</td><td class=b>= Sigma 28-200mm F3.5-5.6 Compact ASP HZ Macro</td> </tr><tr><td>0x340</td><td>= Sigma 35mm F1.4 DG HSM</td> -<td class=b>0x793</td><td class=b>= Sigma 28-300mm F3.5-6.3 Macro</td> +<td class=b>0x789</td><td class=b>= Sigma 18-125mm F3.5-5.6 DC</td> </tr><tr><td>0x345</td><td>= Sigma 50mm F2.8 EX Macro</td> -<td class=b>0x794</td><td class=b>= Sigma 28-200mm F3.5-5.6 DG Compact ASP HZ Macro</td> +<td class=b>0x793</td><td class=b>= Sigma 28-300mm F3.5-6.3 Macro</td> </tr><tr><td>0x346</td><td>= Sigma 50mm F2.8 EX DG Macro</td> -<td class=b>0x795</td><td class=b>= Sigma 28-300mm F3.5-6.3 DG Macro</td> +<td class=b>0x794</td><td class=b>= Sigma 28-200mm F3.5-5.6 DG Compact ASP HZ Macro</td> </tr><tr><td>0x350</td><td>= Sigma 60mm F2.8 DN | A</td> -<td class=b>0x823</td><td class=b>= Sigma 1.4X TC EX APO</td> +<td class=b>0x795</td><td class=b>= Sigma 28-300mm F3.5-6.3 DG Macro</td> </tr><tr><td>0x400</td><td>= Sigma 19mm F2.8 EX DN</td> -<td class=b>0x824</td><td class=b>= Sigma 1.4X Teleconverter EX APO DG</td> +<td class=b>0x823</td><td class=b>= Sigma 1.4X TC EX APO</td> </tr><tr><td>0x401</td><td>= Sigma 24mm F1.4 DG HSM | A</td> -<td class=b>0x853</td><td class=b>= Sigma 18-125mm F3.8-5.6 DC OS HSM</td> +<td class=b>0x824</td><td class=b>= Sigma 1.4X Teleconverter EX APO DG</td> </tr><tr><td>0x411</td><td>= Sigma 20mm F1.8 EX DG ASP RF</td> -<td class=b>0x861</td><td class=b>= Sigma 18-50mm F2.8-4.5 DC OS HSM</td> +<td class=b>0x853</td><td class=b>= Sigma 18-125mm F3.8-5.6 DC OS HSM</td> </tr><tr><td>0x412</td><td>= Sigma 20mm F1.4 DG HSM | A</td> -<td class=b>0x870</td><td class=b>= Sigma 2.0X Teleconverter TC-2001</td> +<td class=b>0x861</td><td class=b>= Sigma 18-50mm F2.8-4.5 DC OS HSM</td> </tr><tr><td>0x432</td><td>= Sigma 24mm F1.8 EX DG ASP Macro</td> -<td class=b>0x875</td><td class=b>= Sigma 2.0X TC EX APO</td> +<td class=b>0x870</td><td class=b>= Sigma 2.0X Teleconverter TC-2001</td> </tr><tr><td>0x440</td><td>= Sigma 28mm F1.8 EX DG ASP Macro</td> -<td class=b>0x876</td><td class=b>= Sigma 2.0X Teleconverter EX APO DG</td> +<td class=b>0x875</td><td class=b>= Sigma 2.0X TC EX APO</td> </tr><tr><td>0x450</td><td>= Sigma 14mm F1.8 DH HSM | A</td> -<td class=b>0x879</td><td class=b>= Sigma 1.4X Teleconverter TC-1401</td> +<td class=b>0x876</td><td class=b>= Sigma 2.0X Teleconverter EX APO DG</td> </tr><tr><td>0x461</td><td>= Sigma 14mm F2.8 EX ASP HSM</td> -<td class=b>0x880</td><td class=b>= Sigma 18-250mm F3.5-6.3 DC OS HSM</td> +<td class=b>0x879</td><td class=b>= Sigma 1.4X Teleconverter TC-1401</td> </tr><tr><td>0x475</td><td>= Sigma 15mm F2.8 EX Diagonal FishEye</td> -<td class=b>0x882</td><td class=b>= Sigma 18-200mm F3.5-6.3 II DC OS HSM</td> +<td class=b>0x880</td><td class=b>= Sigma 18-250mm F3.5-6.3 DC OS HSM</td> </tr><tr><td>0x476</td><td>= Sigma 15mm F2.8 EX DG Diagonal Fisheye</td> -<td class=b>0x883</td><td class=b>= Sigma 18-250mm F3.5-6.3 DC Macro OS HSM</td> +<td class=b>0x882</td><td class=b>= Sigma 18-200mm F3.5-6.3 II DC OS HSM</td> </tr><tr><td>0x477</td><td>= Sigma 10mm F2.8 EX DC HSM Fisheye</td> -<td class=b>0x884</td><td class=b>= Sigma 17-70mm F2.8-4 DC OS HSM Macro | C</td> +<td class=b>0x883</td><td class=b>= Sigma 18-250mm F3.5-6.3 DC Macro OS HSM</td> </tr><tr><td>0x483</td><td>= Sigma 8mm F4 EX Circular Fisheye</td> -<td class=b>0x885</td><td class=b>= Sigma 18-200mm F3.5-6.3 DC OS HSM Macro | C</td> +<td class=b>0x884</td><td class=b>= Sigma 17-70mm F2.8-4 DC OS HSM Macro | C</td> </tr><tr><td>0x484</td><td>= Sigma 8mm F4 EX DG Circular Fisheye</td> -<td class=b>0x886</td><td class=b>= Sigma 18-300mm F3.5-6.3 DC OS HSM Macro | C</td> +<td class=b>0x885</td><td class=b>= Sigma 18-200mm F3.5-6.3 DC OS HSM Macro | C</td> </tr><tr><td>0x485</td><td>= Sigma 8mm F3.5 EX DG Circular Fisheye</td> -<td class=b>0x888</td><td class=b>= Sigma 18-200mm F3.5-6.3 DC OS</td> +<td class=b>0x886</td><td class=b>= Sigma 18-300mm F3.5-6.3 DC OS HSM Macro | C</td> </tr><tr><td>0x486</td><td>= Sigma 4.5mm F2.8 EX DC HSM Circular Fisheye</td> +<td class=b>0x888</td><td class=b>= Sigma 18-200mm F3.5-6.3 DC OS</td> +</tr><tr><td>0x504</td><td>= Sigma 70-300mm F4-5.6 Macro Super</td> <td class=b>0x890</td><td class=b>= Sigma Mount Converter MC-11</td> -</tr><tr><td>0x506</td><td>= Sigma 70-300mm F4-5.6 APO Macro Super II</td> +</tr><tr><td>0x505</td><td>= Sigma APO 70-300mm F4-5.6 Macro Super</td> <td class=b>0x929</td><td class=b>= Sigma 60mm F2.8 DN | A</td> -</tr><tr><td>0x507</td><td>= Sigma 70-300mm F4-5.6 DL Macro Super II</td> +</tr><tr><td>0x506</td><td>= Sigma 70-300mm F4-5.6 APO Macro Super II</td> <td class=b>0x1003</td><td class=b>= Sigma 19mm F2.8</td> -</tr><tr><td>0x508</td><td>= Sigma 70-300mm F4-5.6 DG APO Macro</td> +</tr><tr><td>0x507</td><td>= Sigma 70-300mm F4-5.6 DL Macro Super II</td> <td class=b>0x1004</td><td class=b>= Sigma 30mm F2.8</td> -</tr><tr><td>0x509</td><td>= Sigma 70-300mm F4-5.6 DG Macro</td> +</tr><tr><td>0x508</td><td>= Sigma 70-300mm F4-5.6 DG APO Macro</td> <td class=b>0x1005</td><td class=b>= Sigma 50mm F2.8 Macro</td> -</tr><tr><td>0x510</td><td>= Sigma 17-35 F2.8-4 EX DG ASP</td> +</tr><tr><td>0x509</td><td>= Sigma 70-300mm F4-5.6 DG Macro</td> <td class=b>0x1006</td><td class=b>= Sigma 19mm F2.8</td> -</tr><tr><td>0x512</td><td>= Sigma 15-30mm F3.5-4.5 EX DG ASP DF</td> +</tr><tr><td>0x510</td><td>= Sigma 17-35 F2.8-4 EX DG ASP</td> <td class=b>0x1007</td><td class=b>= Sigma 30mm F2.8</td> -</tr><tr><td>0x513</td><td>= Sigma 20-40mm F2.8 EX DG</td> +</tr><tr><td>0x512</td><td>= Sigma 15-30mm F3.5-4.5 EX DG ASP DF</td> <td class=b>0x1008</td><td class=b>= Sigma 50mm F2.8 Macro</td> -</tr><tr><td>0x519</td><td>= Sigma 17-35 F2.8-4 EX ASP HSM</td> +</tr><tr><td>0x513</td><td>= Sigma 20-40mm F2.8 EX DG</td> <td class=b>0x1009</td><td class=b>= Sigma 14mm F4</td> -</tr><tr><td>0x520</td><td>= Sigma 100-300mm F4.5-6.7 DL</td> +</tr><tr><td>0x519</td><td>= Sigma 17-35 F2.8-4 EX ASP HSM</td> <td class=b>0x8005</td><td class=b>= Sigma 35mm F1.4 DG HSM | A</td> -</tr><tr><td>0x521</td><td>= Sigma 18-50mm F3.5-5.6 DC Macro</td> +</tr><tr><td>0x520</td><td>= Sigma 100-300mm F4.5-6.7 DL</td> <td class=b>0x8009</td><td class=b>= Sigma 18-35mm F1.8 DC HSM | A</td> -</tr><tr><td>0x527</td><td>= Sigma 100-300mm F4 EX IF HSM</td> +</tr><tr><td>0x521</td><td>= Sigma 18-50mm F3.5-5.6 DC Macro</td> <td class=b>0x8900</td><td class=b>= Sigma 70-300mm F4-5.6 DG OS</td> -</tr><tr><td>0x529</td><td>= Sigma 120-300mm F2.8 EX HSM IF APO</td> +</tr><tr><td>0x527</td><td>= Sigma 100-300mm F4 EX IF HSM</td> <td class=b>0xa100</td><td class=b>= Sigma 24-70mm F2.8 DG Macro</td> -</tr><tr><td>0x547</td><td>= Sigma 24-60mm F2.8 EX DG</td> +</tr><tr><td>0x529</td><td>= Sigma 120-300mm F2.8 EX HSM IF APO</td> <td class=b> </td><td class=b> </td> </tr></table></td></tr></table></blockquote> <hr> (This document generated automatically by Image::ExifTool::BuildTagLookup) -<br><i>Last revised Jul 30, 2019</i> +<br><i>Last revised Aug 15, 2019</i> <p class=lf><a href='index.html'><-- ExifTool Tag Names</a></p> </body> </html> diff --git a/html/TagNames/Sony.html b/html/TagNames/Sony.html index a56096c4..f82e6628 100644 --- a/html/TagNames/Sony.html +++ b/html/TagNames/Sony.html @@ -1409,8 +1409,9 @@ adapter is used.</p> </tr><tr><td>45</td><td>= Carl Zeiss Planar T* 85mm F1.4 ZA (SAL85F14Z)</td> </tr><tr><td>46</td><td>= Carl Zeiss Vario-Sonnar T* DT 16-80mm F3.5-4.5 ZA (SAL1680Z)</td> </tr><tr><td>47</td><td>= Carl Zeiss Sonnar T* 135mm F1.8 ZA (SAL135F18Z)</td> -</tr><tr><td>48</td><td>= Carl Zeiss Vario-Sonnar T* 24-70mm F2.8 ZA SSM (SAL2470Z) or ZA SSM II</td> +</tr><tr><td>48</td><td>= Carl Zeiss Vario-Sonnar T* 24-70mm F2.8 ZA SSM (SAL2470Z) or Other Lens</td> </tr><tr><td>48.1</td><td>= Carl Zeiss Vario-Sonnar T* 24-70mm F2.8 ZA SSM II (SAL2470Z2)</td> +</tr><tr><td>48.2</td><td>= Tamron SP 24-70mm F2.8 Di USD</td> </tr><tr><td>49</td><td>= Sony DT 55-200mm F4-5.6 (SAL55200)</td> </tr><tr><td>50</td><td>= Sony DT 18-250mm F3.5-6.3 (SAL18250)</td> </tr><tr><td>51</td><td>= Sony DT 16-105mm F3.5-5.6 (SAL16105)</td> @@ -1442,13 +1443,12 @@ adapter is used.</p> </tr><tr><td>128</td><td>= Tamron or Sigma Lens (128)</td> </tr><tr><td>128.1</td><td>= Tamron AF 18-200mm F3.5-6.3 XR Di II LD Aspherical [IF] Macro</td> </tr><tr><td>128.2</td><td>= Tamron AF 28-300mm F3.5-6.3 XR Di LD Aspherical [IF] Macro</td> -</tr><tr><td>128.3</td><td>= Tamron 80-300mm F3.5-6.3</td> -</tr><tr><td>128.4</td><td>= Tamron AF 28-200mm F3.8-5.6 XR Di Aspherical [IF] Macro</td> -</tr><tr><td>128.5</td><td>= Tamron SP AF 17-35mm F2.8-4 Di LD Aspherical IF</td> -</tr><tr><td>128.6</td><td>= Sigma AF 50-150mm F2.8 EX DC APO HSM II</td> -</tr><tr><td>128.7</td><td>= Sigma 10-20mm F3.5 EX DC HSM</td> -</tr><tr><td>128.8</td><td>= Sigma 70-200mm F2.8 II EX DG APO MACRO HSM</td> -</tr><tr><td>128.9</td><td>= Sigma 10mm F2.8 EX DC HSM Fisheye</td> +</tr><tr><td>128.3</td><td>= Tamron AF 28-200mm F3.8-5.6 XR Di Aspherical [IF] Macro</td> +</tr><tr><td>128.4</td><td>= Tamron SP AF 17-35mm F2.8-4 Di LD Aspherical IF</td> +</tr><tr><td>128.5</td><td>= Sigma AF 50-150mm F2.8 EX DC APO HSM II</td> +</tr><tr><td>128.6</td><td>= Sigma 10-20mm F3.5 EX DC HSM</td> +</tr><tr><td>128.7</td><td>= Sigma 70-200mm F2.8 II EX DG APO MACRO HSM</td> +</tr><tr><td>128.8</td><td>= Sigma 10mm F2.8 EX DC HSM Fisheye</td> </tr><tr><td>128.10</td><td>= Sigma 50mm F1.4 EX DG HSM</td> </tr><tr><td>128.11</td><td>= Sigma 85mm F1.4 EX DG HSM</td> </tr><tr><td>128.12</td><td>= Sigma 24-70mm F2.8 IF EX DG HSM</td> @@ -1520,10 +1520,11 @@ adapter is used.</p> </tr><tr><td>2552.7</td><td>= Angenieux AF 28-70mm F2.6</td> </tr><tr><td>2552.8</td><td>= Tokina AT-X 17 AF 17mm F3.5</td> </tr><tr><td>2552.9</td><td>= Tokina 20-35mm F3.5-4.5 II AF</td> -</tr><tr><td>2553</td><td>= Minolta AF 28-135mm F4-4.5 or Sigma Lens</td> +</tr><tr><td>2553</td><td>= Minolta AF 28-135mm F4-4.5 or Other Lens</td> </tr><tr><td>2553.1</td><td>= Sigma ZOOM-alpha 35-135mm F3.5-4.5</td> </tr><tr><td>2553.2</td><td>= Sigma 28-105mm F2.8-4 Aspherical</td> </tr><tr><td>2553.3</td><td>= Sigma 28-105mm F4-5.6 UC</td> +</tr><tr><td>2553.4</td><td>= Tokina AT-X 242 AF 24-200mm F3.5-5.6</td> </tr><tr><td>2554</td><td>= Minolta AF 35-105mm F3.5-4.5</td> </tr><tr><td>2555</td><td>= Minolta AF 70-210mm F4 Macro or Sigma Lens</td> </tr><tr><td>2555.1</td><td>= Sigma 70-210mm F4-5.6 APO</td> @@ -1615,6 +1616,7 @@ adapter is used.</p> </tr><tr><td>2672</td><td>= Minolta AF 24-105mm F3.5-4.5 (D)</td> </tr><tr><td>3046</td><td>= Metabones Canon EF Speed Booster</td> </tr><tr><td>4567</td><td>= Tokina 70-210mm F4-5.6</td> +</tr><tr><td>4568</td><td>= Tokina AF 35-200mm F4-5.6 Zoom SD</td> </tr><tr><td>4570</td><td>= Tamron AF 35-135mm F3.5-4.5</td> </tr><tr><td>4571</td><td>= Vivitar 70-210mm F4.5-5.6</td> </tr><tr><td>4574</td><td>= 2x Teleconverter or Tamron or Tokina Lens</td> @@ -1654,10 +1656,11 @@ adapter is used.</p> </tr><tr><td>25521.7</td><td>= Angenieux AF 28-70mm F2.6</td> </tr><tr><td>25521.8</td><td>= Tokina AT-X 17 AF 17mm F3.5</td> </tr><tr><td>25521.9</td><td>= Tokina 20-35mm F3.5-4.5 II AF</td> -</tr><tr><td>25531</td><td>= Minolta AF 28-135mm F4-4.5 or Sigma Lens</td> +</tr><tr><td>25531</td><td>= Minolta AF 28-135mm F4-4.5 or Other Lens</td> </tr><tr><td>25531.1</td><td>= Sigma ZOOM-alpha 35-135mm F3.5-4.5</td> </tr><tr><td>25531.2</td><td>= Sigma 28-105mm F2.8-4 Aspherical</td> </tr><tr><td>25531.3</td><td>= Sigma 28-105mm F4-5.6 UC</td> +</tr><tr><td>25531.4</td><td>= Tokina AT-X 242 AF 24-200mm F3.5-5.6</td> </tr><tr><td>25541</td><td>= Minolta AF 35-105mm F3.5-4.5</td> </tr><tr><td>25551</td><td>= Minolta AF 70-210mm F4 Macro or Sigma Lens</td> </tr><tr><td>25551.1</td><td>= Sigma 70-210mm F4-5.6 APO</td> @@ -1749,6 +1752,7 @@ adapter is used.</p> </tr><tr><td>26721</td><td>= Minolta AF 24-105mm F3.5-4.5 (D)</td> </tr><tr><td>30464</td><td>= Metabones Canon EF Speed Booster</td> </tr><tr><td>45671</td><td>= Tokina 70-210mm F4-5.6</td> +</tr><tr><td>45681</td><td>= Tokina AF 35-200mm F4-5.6 Zoom SD</td> </tr><tr><td>45701</td><td>= Tamron AF 35-135mm F3.5-4.5</td> </tr><tr><td>45711</td><td>= Vivitar 70-210mm F4.5-5.6</td> </tr><tr><td>45741</td><td>= 2x Teleconverter or Tamron or Tokina Lens</td> @@ -11215,7 +11219,7 @@ some models when the <a href="../ExifTool.html#ExtractEmbedded">ExtractEmbedded< <hr> (This document generated automatically by Image::ExifTool::BuildTagLookup) -<br><i>Last revised Aug 6, 2019</i> +<br><i>Last revised Aug 15, 2019</i> <p class=lf><a href='index.html'><-- ExifTool Tag Names</a></p> </body> </html> diff --git a/html/exiftool_pod.html b/html/exiftool_pod.html index 123c07d7..c1087e59 100644 --- a/html/exiftool_pod.html +++ b/html/exiftool_pod.html @@ -663,7 +663,7 @@ <p>produces output like this:</p> -<pre><code> -- Generated by ExifTool 11.61 -- +<pre><code> -- Generated by ExifTool 11.62 -- File: a.jpg - 2003:10:31 15:44:19 (f/5.6, 1/60s, ISO 100) File: b.jpg - 2006:05:23 11:57:38 diff --git a/html/history.html b/html/history.html index 846aad0f..8552da92 100644 --- a/html/history.html +++ b/html/history.html @@ -17,20 +17,32 @@ considered development releases, and are not uploaded to <a href="https://metacp <!-- Use line width of 80 --> <!-- *********************************************************************** --> +<a name='v11.62'><b>Aug. 15, 2019 - Version 11.62</b></a> +<ul> +<li>Added a number of new Canon, Pentax, Sony and Sigma lenses (thanks LibRaw) +<li>Removed some extraneous verbose warnings when geotagging +<li>Removed Minolta LensType value for a non-existent lens (thanks LibRaw) +<li>Patched problem writing some simple qualified XMP values +<li>Patched to avoid writing files in Windows with Unicode surrogate characters + in their name unless the -overwrite_original_in_place option is used +<li>Fixed an incorrect Pentax LensType (thanks LibRaw) +<li>Fixed family 2 group names of some XMP-exifEX and XMP Composite tags +</ul> + <a name='v11.61'><b>Aug. 7, 2019 - Version 11.61</b></a> <ul> <li>Added a new FujiFilm CropMode (thanks LibRaw) -<li>Added a couple of proprietary CustomRendered values (thanks Jeffrey Friedl) +<li>Added a few new proprietary CustomRendered values (thanks Jeffrey Friedl) <li>Added a new Nikon LensID and fixed a Canon LensType (thanks LibRaw) <li>Added a new CanonModelID <li>Decode more Sony DSC-RX100M7 tags (thanks Jos Roost) <li>Write standard EXIF to PNG even if non-standard EXIF already exists -<li>Patched to avoid problems overriding new values when writing thumbnail and - preview images <li>Changed a Minolta/Sony LensType (thanks LibRaw) <li>Changed Composite GPS reference direction tags to be derived from only the XMP-exif GPS coordinate tags (and not other XMP GPS coordinates) <li>Reverted a PNG Validation check that was removed from 11.60 +<li>Patched to avoid problems overriding new values when writing thumbnail and + preview images </ul> <a name='v11.60'><b>July 30, 2019 - Version 11.60</b></a> diff --git a/html/index.html b/html/index.html index 49b92dea..06c2ee60 100644 --- a/html/index.html +++ b/html/index.html @@ -74,9 +74,9 @@ span.sup { font-size: 0.8em; font-weight: normal; position: relative; top </div> <blockquote><table class='dl lg'><tr><td><b> -<a href="Image-ExifTool-11.61.tar.gz"> -Download Version 11.61</a> (4.4 MB) - -<a href="history.html">Aug. 7, 2019</a></b></td></tr></table></blockquote> +<a href="Image-ExifTool-11.62.tar.gz"> +Download Version 11.62</a> (4.4 MB) - +<a href="history.html">Aug. 15, 2019</a></b></td></tr></table></blockquote> <p><b>ExifTool is a platform-independent <a href="ExifTool.html">Perl library</a> plus a <a href="exiftool_pod.html">command-line application</a> for @@ -128,8 +128,8 @@ distribution above.)</i></p> <blockquote><table class='dl lg'><tr><td><b> <a name="alone">Windows Executable:</a> -<a href="exiftool-11.61.zip"> - exiftool-11.61.zip</a> (6.1 MB)</b></td></tr></table></blockquote> +<a href="exiftool-11.62.zip"> + exiftool-11.62.zip</a> (6.1 MB)</b></td></tr></table></blockquote> <p><b>The stand-alone Windows executable</b> does not require Perl. Just download and un-zip the archive then double-click on @@ -140,8 +140,8 @@ of Windows.</p> <blockquote><table class='dl lg'><tr><td><b> MacOS Package: -<a href="ExifTool-11.61.dmg"> - ExifTool-11.61.dmg</a> (2.8 MB)</b></td></tr></table></blockquote> +<a href="ExifTool-11.62.dmg"> + ExifTool-11.62.dmg</a> (2.8 MB)</b></td></tr></table></blockquote> <p><b>The MacOS package</b> installs the ExifTool command-line application and libraries in /usr/local/bin. After installing, type "<code>exiftool</code>" in @@ -151,7 +151,7 @@ a Terminal window to run exiftool and read the application documentation.</p> installing ExifTool on Windows, MacOS and Unix systems.</p> <ul> -<li><a href="http://owl.phy.queensu.ca/~phil/exiftool/checksums.txt">Click here +<li><a href="https://owl.phy.queensu.ca/~phil/exiftool/checksums.txt">Click here for the SHA1 and MD5 checksums to verify these distribution packages</a>.</li> <li>The version number of the latest ExifTool release may be found <a href="http://owl.phy.queensu.ca/~phil/exiftool/ver.txt">here</a>.</li> @@ -1405,9 +1405,8 @@ $<input name="amount" value="0.00" size="6"> </tr> </table> </blockquote> -<p><i class=lt>(Your generous donations have provided the funds used to purchase a backup -<a href="http://u88.n24.queensu.ca/exiftool/forum/">ExifTool Forum</a> server, -allowing support to be maintained while the other machine was down for repairs.)</i></p> +<p><i class=lt>(Your generous donations have provided the funds used to purchase the +<a href="http://u88.n24.queensu.ca/exiftool/forum/">ExifTool Forum</a> server.)</i></p> <h2><a name="contact">Contact Me</a></h2> diff --git a/html/install.html b/html/install.html index 6331dd85..50d4093d 100644 --- a/html/install.html +++ b/html/install.html @@ -52,10 +52,10 @@ documentation or some other files of the full distribution.</p> <h3>Stand-Alone Executable</h3> <ol> <li><b>Download</b> the <b>Windows Executable</b> from the <a href="index.html">ExifTool home page</a>. -<br><span class=lt>(The file you download should be named "<code>exiftool-11.61.zip</code>".)</span></li> +<br><span class=lt>(The file you download should be named "<code>exiftool-11.62.zip</code>".)</span></li> <li><b>Extract "<code>exiftool(-k).exe</code>"</b> from the "<code>.zip</code>" file, and place it <b>on your Desktop</b>. -<br><span class=lt>(Double-click on "<code>exiftool-11.61.zip</code>" to open +<br><span class=lt>(Double-click on "<code>exiftool-11.62.zip</code>" to open the archive, then drag "<code>exiftool(-k).exe</code>" to your Desktop.)</span></li> </ol> <p>You can now double-click on "<code>exiftool(-k).exe</code>" to read the @@ -107,7 +107,7 @@ can be downloaded from <a href="http://www.activestate.com/activeperl/">activeperl.com</a>.)</p> <ol> <li><b>Download</b> the <b>Image-ExifTool distribution</b> from the <a href="index.html">ExifTool home page</a> -<br><span class=lt>(The file you download should be named "<code>Image-ExifTool-11.61.tar.gz</code>".)</span></li> +<br><span class=lt>(The file you download should be named "<code>Image-ExifTool-11.62.tar.gz</code>".)</span></li> <li><b>Extract the ExifTool files</b> from the archive. <br><span class=lt>(The archive is a gzipped tar file, and can be opened with various Windows utilities, including WinZip.)</span></li> @@ -149,7 +149,7 @@ in the OS X package. Both versions run natively on PPC and Intel Macs.</p> <h3>OS X Package</h3> <ol> <li><b>Download</b> the <b>ExifTool OS X Package</b> from the <a href="index.html">ExifTool home page</a>. -<br><span class=lt>(The file you download should be named "<code>ExifTool-11.61.dmg</code>".)</span></li> +<br><span class=lt>(The file you download should be named "<code>ExifTool-11.62.dmg</code>".)</span></li> <li><b>Install</b> as a normal <b>OS X package</b>. <br><span class=lt>(Open the disk image, double-click on the install package, and follow the instructions.) </span></li> @@ -164,12 +164,12 @@ in the OS X package. Both versions run natively on PPC and Intel Macs.</p> <ol> <li><b>Download</b> the <b>Image-ExifTool distribution</b> from the <a href="index.html">ExifTool home page</a> to your Desktop. -<br><span class=lt>(The file you download should be named "<code>Image-ExifTool-11.61.tar.gz</code>".)</span></li> +<br><span class=lt>(The file you download should be named "<code>Image-ExifTool-11.62.tar.gz</code>".)</span></li> <li><b>Launch</b> the <b>Terminal</b> application from the Utilities folder in your Applications folder.</li> <li>In the Terminal window, <b>type the following</b>: <pre class='code'> cd ~/Desktop - tar -xzf Image-ExifTool-11.61.tar.gz - cd Image-ExifTool-11.61 + tar -xzf Image-ExifTool-11.62.tar.gz + cd Image-ExifTool-11.62 sudo cp -r exiftool lib /usr/local/bin </pre> <span class=lt>(Note: The last step above will require you to enter your @@ -185,7 +185,7 @@ your Perl version. If both sets of libraries exist, /usr/local/bin/lib takes precedence for exiftool, but /Library/Perl/#.#.# is the default for any other Perl scripts.</li> <li>In OS X 10.8 or later, you may see this message when you try to open the install package: -<blockquote class=red>"ExifTool-11.61.pkg" can't be opened because it is from an +<blockquote class=red>"ExifTool-11.62.pkg" can't be opened because it is from an unidentified developer.</blockquote> The solution is to control-click on the pkg then select "Open" from the pop-up menu instead of just double-clicking. An alternative is to lower the security settings by changing "Allow applications downloaded from" to @@ -211,11 +211,11 @@ have the wrong "<code>lib</code>" folder.</li> <ol> <li><b>Download</b> the <b>Image-ExifTool distribution</b> from the <a href="index.html">ExifTool home page</a> -<br><span class=lt>(The file you download should be named "<code>Image-ExifTool-11.61.tar.gz</code>".)</span></li> +<br><span class=lt>(The file you download should be named "<code>Image-ExifTool-11.62.tar.gz</code>".)</span></li> <li><b>Unpack the distribution</b> and <b>make it your current directory</b> by typing: <pre class='code'> cd <i><your download directory></i> - gzip -dc Image-ExifTool-11.61.tar.gz | tar -xf - - cd Image-ExifTool-11.61 + gzip -dc Image-ExifTool-11.62.tar.gz | tar -xf - + cd Image-ExifTool-11.62 </pre> <span class=lt>(At this point you may run exiftool by typing "<code>./exiftool <i><image file name></i></code>".)</span></li> diff --git a/lib/Image/ExifTool.pm b/lib/Image/ExifTool.pm index 13fc162a..a8fe7219 100644 --- a/lib/Image/ExifTool.pm +++ b/lib/Image/ExifTool.pm @@ -27,7 +27,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes %mimeType $swapBytes $swapWords $currentByteOrder %unpackStd %jpegMarker %specialTags %fileTypeLookup); -$VERSION = '11.61'; +$VERSION = '11.62'; $RELEASE = ''; @ISA = qw(Exporter); %EXPORT_TAGS = ( @@ -4638,6 +4638,7 @@ sub AddCompositeTags($;$) } } # make sure new TagID is unique by adding index if necessary + # (could only happen for UserDefined tags now that module name is added to tag ID) my $n = 0; while ($$compTable{$new}) { $new =~ s/-\d+$// if $n++; diff --git a/lib/Image/ExifTool.pod b/lib/Image/ExifTool.pod index 63620682..cda93064 100644 --- a/lib/Image/ExifTool.pod +++ b/lib/Image/ExifTool.pod @@ -531,8 +531,11 @@ without recoding. Default is 0. Comma-delimited list of settings for writing compact XMP. Below is a list of available settings. Note that 'NoPadding' effects only embedded XMP -since padding is never written for stand-alone XMP files. Case is not -significant. Default is undef. +since padding is never written for stand-alone XMP files. Also note that +'OneDesc' is not recommended when writing XMP larger than 64 kB to a JPG +file because it interferes with ExifTool's technique of splitting off the +large description elements into the extended XMP. Case is not significant +for any of these options. Default is undef. NoPadding - Avoid 2 kB of recommended padding at end of XMP NoIndent - Avoid spaces to indent lines for readability @@ -1512,8 +1515,8 @@ Flag to replace the previous new values for this tag (ie. replace the values set in previous calls to L</SetNewValue>). This option is most commonly used to replace previously-set new values for list-type tags. Valid values are 0 (set new value normally -- adds to new values for list-type tags), 1 -(reset previous new values for this tag and replace with the specified new -value) or 2 (reset previous new values only). +(reset any previous new values before setting new value) or 2 (reset +previous new values only; new value argument is ignored). =item Shift diff --git a/lib/Image/ExifTool/Canon.pm b/lib/Image/ExifTool/Canon.pm index 69984d44..3534ed93 100644 --- a/lib/Image/ExifTool/Canon.pm +++ b/lib/Image/ExifTool/Canon.pm @@ -88,7 +88,7 @@ sub ProcessCTMD($$$); sub ProcessExifInfo($$$); sub SwapWords($); -$VERSION = '4.20'; +$VERSION = '4.21'; # Note: Removed 'USM' from 'L' lenses since it is redundant - PH # (or is it? Ref 32 shows 5 non-USM L-type lenses) @@ -146,11 +146,13 @@ $VERSION = '4.20'; 26.3 => 'Tamron SP AF 180mm f/3.5 Di Macro', #15 26.4 => 'Carl Zeiss Planar T* 50mm f/1.4', #PH 26.5 => 'Voigtlander APO Lanthar 125mm F2.5 SL Macro', #JR + 26.6 => 'Carl Zeiss Planar T 85mm f/1.4 ZE', #IB 27 => 'Canon EF 35-80mm f/4-5.6', #32 # 27 => 'Carl Zeiss Distagon T* 28mm f/2 ZF', #PH (must be with an adapter, because the ZF version is a Nikon mount) # 27 => 'EMF adapter for Canon EOS digital cameras', #50 (reports MaxFocalLength of 65535) # 27 => optix adapter # 27 => Venus Optics Laowa 12mm f2.8 Zero-D or 105mm f2 (T3.2) Smooth Trans Focus (ref IB) + # 27 => Venus Optics Laowa 105mm f2 STF (ref IB) 28 => 'Canon EF 80-200mm f/4.5-5.6 or Tamron Lens', #32 28.1 => 'Tamron SP AF 28-105mm f/2.8 LD Aspherical IF', #15 28.2 => 'Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro', #4 @@ -197,6 +199,7 @@ $VERSION = '4.20'; 46 => 'Canon EF 28-90mm f/4-5.6', #32 47 => 'Zeiss Milvus 35mm f/2 or 50mm f/2', #IB 47.1 => 'Zeiss Milvus 50mm f/2 Makro', #IB + 47.2 => 'Zeiss Milvus 135mm f/2 ZE', #IB 48 => 'Canon EF-S 18-55mm f/3.5-5.6 IS', #20 49 => 'Canon EF-S 55-250mm f/4-5.6 IS', #23 50 => 'Canon EF-S 18-200mm f/3.5-5.6 IS', @@ -214,6 +217,10 @@ $VERSION = '4.20'; 103.1 => 'Rokinon SP 14mm f/2.4', #IB 103.2 => 'Rokinon AF 14mm f/2.8 EF', #IB 106 => 'Rokinon SP / Samyang XP 35mm f/1.2', #IB + 112 => 'Sigma 28mm f/1.5 FF High-speed Prime or other Sigma Lens', #IB + 112.1 => 'Sigma 40mm f/1.5 FF High-speed Prime', #IB + 112.2 => 'Sigma 105mm f/1.5 FF High-speed Prime', #IB + 117 => 'Tamron 35-150mm f/2.8-4.0 Di VC OSD', #IB (A043) 124 => 'Canon MP-E 65mm f/2.8 1-5x Macro Photo', #9 125 => 'Canon TS-E 24mm f/3.5L', 126 => 'Canon TS-E 45mm f/2.8', #15 @@ -230,6 +237,7 @@ $VERSION = '4.20'; # 'Sigma APO 120-300mm f/2.8 EX DG HSM + 2x', #15 131.6 => 'Sigma 4.5mm f/2.8 EX DC HSM Circular Fisheye', #PH 131.7 => 'Sigma 70-200mm f/2.8 APO EX HSM', #PH (http://www.lensrentals.com/blog/2012/08/canon-illumination-correction-and-third-party-lenses) + 131.8 => 'Sigma 28-70mm f/2.8-4 DG', #IB 132 => 'Canon EF 1200mm f/5.6L USM', #32 134 => 'Canon EF 600mm f/4L IS USM', #15 135 => 'Canon EF 200mm f/1.8L USM', @@ -251,6 +259,7 @@ $VERSION = '4.20'; '137.14' => 'Tamron SP 24-70mm f/2.8 Di VC USD', #PH '137.15' => 'Sigma 18-35mm f/1.8 DC HSM', #David Monro '137.16' => 'Sigma 12-24mm f/4.5-5.6 DG HSM II', #IB + '137.17' => 'Sigma 70-300mm f/4-5.6 DG OS', #IB 138 => 'Canon EF 28-80mm f/2.8-4L', #32 139 => 'Canon EF 400mm f/2.8L USM', 140 => 'Canon EF 500mm f/4.5L USM', #32 @@ -276,6 +285,7 @@ $VERSION = '4.20'; 152.2 => 'Sigma 14mm f/2.8 EX Aspherical HSM', #15 152.3 => 'Sigma 10-20mm f/4-5.6', #14 152.4 => 'Sigma 100-300mm f/4', # (ref Bozi) + 152.5 => 'Sigma 300-800mm f/5.6 APO EX DG HSM', #IB 153 => 'Canon EF 35-350mm f/3.5-5.6L USM or Sigma or Tamron Lens', #PH 153.1 => 'Sigma 50-500mm f/4-6.3 APO HSM EX', #15 153.2 => 'Tamron AF 28-300mm f/3.5-6.3 XR LD Aspherical [IF] Macro', @@ -283,6 +293,8 @@ $VERSION = '4.20'; 153.4 => 'Tamron 18-250mm f/3.5-6.3 Di II LD Aspherical [IF] Macro', #PH 154 => 'Canon EF 20mm f/2.8 USM or Zeiss Lens', #15 154.1 => 'Zeiss Milvus 21mm f/2.8', #IB + 154.2 => 'Zeiss Milvus 15mm f/2.8 ZE', #IB + 154.3 => 'Zeiss Milvus 18mm f/2.8 ZE', #IB 155 => 'Canon EF 85mm f/1.8 USM or Sigma Lens', 155.1 => 'Sigma 14mm f/1.8 DG HSM | A', #IB (A017) 156 => 'Canon EF 28-105mm f/3.5-4.5 USM or Tamron Lens', @@ -320,18 +332,29 @@ $VERSION = '4.20'; 169.6 => 'Sigma 30mm f/1.4 EX DC HSM', #Rodolfo Borges 169.7 => 'Sigma 35mm f/1.4 DG HSM', #PH (also "| A" version, ref 50) 169.8 => 'Sigma 35mm f/1.5 FF High-Speed Prime | 017', #IB - 170 => 'Canon EF 200mm f/2.8L II USM', #9 + 169.9 => 'Sigma 70mm f/2.8 Macro EX DG', #IB + 170 => 'Canon EF 200mm f/2.8L II USM or Sigma Lens', #9 + 170.1 => 'Sigma 300mm f/2.8 APO EX DG HSM', #IB + 170.2 => 'Sigma 800mm f/5.6 APO EX DG HSM', #IB 171 => 'Canon EF 300mm f/4L USM', #15 172 => 'Canon EF 400mm f/5.6L USM or Sigma Lens', #32 172.1 =>'Sigma 150-600mm f/5-6.3 DG OS HSM | S', #50 + 172.2 => 'Sigma 500mm f/4.5 APO EX DG HSM', #IB 173 => 'Canon EF 180mm Macro f/3.5L USM or Sigma Lens', #9 173.1 => 'Sigma 180mm EX HSM Macro f/3.5', #14 173.2 => 'Sigma APO Macro 150mm f/2.8 EX DG HSM', #14 + 173.3 => 'Sigma 10mm f/2.8 EX DC Fisheye', #IB + 173.4 => 'Sigma 15mm f/2.8 EX DG Diagonal Fisheye', #IB 174 => 'Canon EF 135mm f/2L USM or Other Lens', #9 174.1 => 'Sigma 70-200mm f/2.8 EX DG APO OS HSM', #PH (probably version II of this lens) 174.2 => 'Sigma 50-500mm f/4.5-6.3 APO DG OS HSM', #forum4031 174.3 => 'Sigma 150-500mm f/5-6.3 APO DG OS HSM', #47 174.4 => 'Zeiss Milvus 100mm f/2 Makro', #IB + 174.5 => 'Sigma APO 50-150mm f/2.8 EX DC OS HSM', #IB + 174.6 => 'Sigma APO 120-300mm f/2.8 EX DG OS HSM', #IB + 174.7 => 'Sigma 120-300mm f/2.8 DG OS HSM S013', #IB + 174.8 => 'Sigma 120-400mm f/4.5-5.6 APO DG OS HSM', #IB + 174.9 => 'Sigma 200-500mm f/2.8 APO EX DG', #IB 175 => 'Canon EF 400mm f/2.8L USM', #32 176 => 'Canon EF 24-85mm f/3.5-4.5 USM', 177 => 'Canon EF 300mm f/4L IS USM', #9 @@ -375,17 +398,19 @@ $VERSION = '4.20'; 196 => 'Canon EF 75-300mm f/4-5.6 USM', #15/32 197 => 'Canon EF 75-300mm f/4-5.6 IS USM or Sigma Lens', 197.1 => 'Sigma 18-300mm f/3.5-6.3 DC Macro OS HS', #50 - 198 => 'Canon EF 50mm f/1.4 USM or Zeiss Lens', + 198 => 'Canon EF 50mm f/1.4 USM or Other Lens', 198.1 => 'Zeiss Otus 55mm f/1.4 ZE', #JR (seen only on Sony camera) 198.2 => 'Zeiss Otus 85mm f/1.4 ZE', #JR (NC) 198.3 => 'Zeiss Milvus 25mm f/1.4', #IB 198.4 => 'Zeiss Otus 100mm f/1.4', #IB + 198.5 => 'Zeiss Milvus 35mm f/1.4 ZE', #IB + 198.6 => 'Yongnuo YN 35mm f/2', #IB 199 => 'Canon EF 28-80mm f/3.5-5.6 USM', #32 200 => 'Canon EF 75-300mm f/4-5.6 USM', #32 201 => 'Canon EF 28-80mm f/3.5-5.6 USM', #32 202 => 'Canon EF 28-80mm f/3.5-5.6 USM IV', 208 => 'Canon EF 22-55mm f/4-5.6 USM', #32 - 209 => 'Canon EF 55-200mm f/4.5-5.6', #32 + 209 => 'Canon EF 55-200mm f/4.5-5.6', #32 (USM mk I version? ref IB) 210 => 'Canon EF 28-90mm f/4-5.6 USM', #32 211 => 'Canon EF 28-200mm f/3.5-5.6 USM', #15 212 => 'Canon EF 28-105mm f/4-5.6 USM', #15 @@ -397,6 +422,7 @@ $VERSION = '4.20'; 214 => 'Canon EF-S 18-55mm f/3.5-5.6 USM', #PH/34 215 => 'Canon EF 55-200mm f/4.5-5.6 II USM', 217 => 'Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD', #47 + 220 => 'Yongnuo YN 50mm f/1.8', #IB 224 => 'Canon EF 70-200mm f/2.8L IS USM', #11 225 => 'Canon EF 70-200mm f/2.8L IS USM + 1.4x', #11 226 => 'Canon EF 70-200mm f/2.8L IS USM + 2x', #14 @@ -404,7 +430,8 @@ $VERSION = '4.20'; 228 => 'Canon EF 28-105mm f/3.5-4.5 USM', #32 229 => 'Canon EF 16-35mm f/2.8L USM', #PH 230 => 'Canon EF 24-70mm f/2.8L USM', #9 - 231 => 'Canon EF 17-40mm f/4L USM', + 231 => 'Canon EF 17-40mm f/4L USM or Sigma Lens', + 231.1 => 'Sigma 12-24mm f/4 DG HSM A016', #IB 232 => 'Canon EF 70-300mm f/4.5-5.6 DO IS USM', #15 233 => 'Canon EF 28-300mm f/3.5-5.6L IS USM', #PH 234 => 'Canon EF-S 17-85mm f/4-5.6 IS USM or Tokina Lens', #19 @@ -428,11 +455,13 @@ $VERSION = '4.20'; 248.1 => 'Sigma 24-35mm f/2 DG HSM | A', #JR 248.2 => 'Sigma 135mm f/2 FF High-Speed Prime | 017', #IB 248.3 => 'Sigma 24-35mm f/2.2 FF Zoom | 017', #IB + 248.4 => 'Sigma 135mm f/1.8 DG HSM A017', #IB 249 => 'Canon EF 800mm f/5.6L IS USM', #35 250 => 'Canon EF 24mm f/1.4L II USM or Sigma Lens', #41 250.1 => 'Sigma 20mm f/1.4 DG HSM | A', #IB 250.2 => 'Sigma 20mm f/1.5 FF High-Speed Prime | 017', #IB 250.3 => 'Tokina Opera 16-28mm f/2.8 FF', #IB + 250.4 => 'Sigma 85mm f/1.4 DG HSM A016', #IB 251 => 'Canon EF 70-200mm f/2.8L IS II USM', 251.1 => 'Canon EF 70-200mm f/2.8L IS III USM', #IB 252 => 'Canon EF 70-200mm f/2.8L IS II USM + 1.4x', #50 (1.4x Mk II) @@ -451,6 +480,9 @@ $VERSION = '4.20'; 368.5 => 'Sigma 28mm f/1.4 DG HSM | A', #IB (A019) 368.6 => 'Sigma 150-600mm f/5-6.3 DG OS HSM | S', #50 368.7 => 'Sigma 85mm f/1.4 DG HSM | A', #IB (016) + 368.8 => 'Sigma 105mm f/1.4 DG HSM', #IB (A018) + 368.9 => 'Sigma 14-24mm f/2.8 DG HSM', #IB (A018) + '368.10' => 'Sigma 70mm f/2.8 DG Macro', #IB (A018) # Note: LensType 488 (0x1e8) is reported as 232 (0xe8) in 7D CameraSettings 488 => 'Canon EF-S 15-85mm f/3.5-5.6 IS USM', #PH 489 => 'Canon EF 70-300mm f/4-5.6L IS USM', #Gerald Kapounek diff --git a/lib/Image/ExifTool/Geotag.pm b/lib/Image/ExifTool/Geotag.pm index 601be6f7..455ed79a 100644 --- a/lib/Image/ExifTool/Geotag.pm +++ b/lib/Image/ExifTool/Geotag.pm @@ -25,7 +25,7 @@ use strict; use vars qw($VERSION); use Image::ExifTool qw(:Public); -$VERSION = '1.59'; +$VERSION = '1.60'; sub JITTER() { return 2 } # maximum time jitter @@ -1135,7 +1135,7 @@ Category: foreach $category (qw{pos track alt orient atemp}) { @r = $et->SetNewValue(GPSDateTime => "$gpsDate $gpsTime", %opts); } } else { - my %opts; + my %opts = ( IgnorePermanent => 1 ); $opts{Replace} = 2 if defined $val; # remove existing new values $opts{Group} = $writeGroup if $writeGroup; diff --git a/lib/Image/ExifTool/Minolta.pm b/lib/Image/ExifTool/Minolta.pm index a789d6a8..50e945ac 100644 --- a/lib/Image/ExifTool/Minolta.pm +++ b/lib/Image/ExifTool/Minolta.pm @@ -49,7 +49,7 @@ use vars qw($VERSION %minoltaLensTypes %minoltaTeleconverters %minoltaColorMode use Image::ExifTool qw(:DataAccess :Utils); use Image::ExifTool::Exif; -$VERSION = '2.79'; +$VERSION = '2.81'; # Full list of product codes for Sony-compatible Minolta lenses # (ref http://www.kb.sony.com/selfservice/documentLink.do?externalId=C1000570) @@ -251,6 +251,7 @@ $VERSION = '2.79'; 25.5 => 'Sigma 24mm F1.8 EX DG ASP Macro', #Florian Knorn # 25 - also seen for an "old Sigma 50mm Macro" (forum2833) 27 => 'Minolta AF 85mm F1.4 G (D)', # added (D) (ref 13) + # 27 => 'Venus Optics Laowa 105mm F2 STF', #IB (NC) 28 => 'Minolta/Sony AF 100mm F2.8 Macro (D) or Tamron Lens', # 28 => 'Sony 100mm F2.8 Macro (SAL100M28)', (ref 18/JR) 28.1 => 'Tamron SP AF 90mm F2.8 Di Macro', #JD (Model 272E) @@ -288,8 +289,9 @@ $VERSION = '2.79'; 45 => 'Carl Zeiss Planar T* 85mm F1.4 ZA (SAL85F14Z)', #JR 46 => 'Carl Zeiss Vario-Sonnar T* DT 16-80mm F3.5-4.5 ZA (SAL1680Z)', #JR 47 => 'Carl Zeiss Sonnar T* 135mm F1.8 ZA (SAL135F18Z)', #JR - 48 => 'Carl Zeiss Vario-Sonnar T* 24-70mm F2.8 ZA SSM (SAL2470Z) or ZA SSM II', #11/JR + 48 => 'Carl Zeiss Vario-Sonnar T* 24-70mm F2.8 ZA SSM (SAL2470Z) or Other Lens', #11/JR 48.1 => 'Carl Zeiss Vario-Sonnar T* 24-70mm F2.8 ZA SSM II (SAL2470Z2)', #JR + 48.2 => 'Tamron SP 24-70mm F2.8 Di USD', #IB (A007) 49 => 'Sony DT 55-200mm F4-5.6 (SAL55200)', #JD/JR 50 => 'Sony DT 18-250mm F3.5-6.3 (SAL18250)', #11/JR 51 => 'Sony DT 16-105mm F3.5-5.6 (SAL16105)', #11/JR @@ -325,15 +327,15 @@ $VERSION = '2.79'; # was 128.1 => 'Tamron 18-200mm F3.5-6.3', 128.2 => 'Tamron AF 28-300mm F3.5-6.3 XR Di LD Aspherical [IF] Macro', #JR (Model A061) # was 128.2 => 'Tamron 28-300mm F3.5-6.3', - 128.3 => 'Tamron 80-300mm F3.5-6.3', - 128.4 => 'Tamron AF 28-200mm F3.8-5.6 XR Di Aspherical [IF] Macro', #JD (Model A031) + # (removed -- probably never existed, ref IB) 'Tamron 80-300mm F3.5-6.3', + 128.3 => 'Tamron AF 28-200mm F3.8-5.6 XR Di Aspherical [IF] Macro', #JD (Model A031) # also Tamron AF 28-200mm F3.8-5.6 Aspherical', #IB (Model 71D) # and 'Tamron AF 28-200mm F3.8-5.6 LD Aspherical [IF] Super', #IB (Model 171D) - 128.5 => 'Tamron SP AF 17-35mm F2.8-4 Di LD Aspherical IF', #JD (Model A05) - 128.6 => 'Sigma AF 50-150mm F2.8 EX DC APO HSM II', #JD - 128.7 => 'Sigma 10-20mm F3.5 EX DC HSM', #11 (Model 202-205) - 128.8 => 'Sigma 70-200mm F2.8 II EX DG APO MACRO HSM', #24 - 128.9 => 'Sigma 10mm F2.8 EX DC HSM Fisheye', #Florian Knorn + 128.4 => 'Tamron SP AF 17-35mm F2.8-4 Di LD Aspherical IF', #JD (Model A05) + 128.5 => 'Sigma AF 50-150mm F2.8 EX DC APO HSM II', #JD + 128.6 => 'Sigma 10-20mm F3.5 EX DC HSM', #11 (Model 202-205) + 128.7 => 'Sigma 70-200mm F2.8 II EX DG APO MACRO HSM', #24 + 128.8 => 'Sigma 10mm F2.8 EX DC HSM Fisheye', #Florian Knorn # (yes, '128.10'. My condolences to typed languages that use this database - PH) '128.10' => 'Sigma 50mm F1.4 EX DG HSM', #Florian Knorn (Model A014, ref IB) '128.11' => 'Sigma 85mm F1.4 EX DG HSM', #27 @@ -412,10 +414,11 @@ $VERSION = '2.79'; 25521.7 => 'Angenieux AF 28-70mm F2.6', #JD 25521.8 => 'Tokina AT-X 17 AF 17mm F3.5', #27 25521.9 => 'Tokina 20-35mm F3.5-4.5 II AF', #IB - 25531 => 'Minolta AF 28-135mm F4-4.5 or Sigma Lens', + 25531 => 'Minolta AF 28-135mm F4-4.5 or Other Lens', 25531.1 => 'Sigma ZOOM-alpha 35-135mm F3.5-4.5', #16 25531.2 => 'Sigma 28-105mm F2.8-4 Aspherical', #JD 25531.3 => 'Sigma 28-105mm F4-5.6 UC', #JR + 25531.4 => 'Tokina AT-X 242 AF 24-200mm F3.5-5.6', #IB 25541 => 'Minolta AF 35-105mm F3.5-4.5', #13 25551 => 'Minolta AF 70-210mm F4 Macro or Sigma Lens', 25551.1 => 'Sigma 70-210mm F4-5.6 APO', #7 @@ -502,7 +505,7 @@ $VERSION = '2.79'; 26241 => 'Minolta AF 35-80mm F4-5.6 Power Zoom', 26281 => 'Minolta AF 80-200mm F2.8 HS-APO G', #11 ("HS-APO" added, white, probably same as 1, non-HS is 25891 - ref JR) 26291 => 'Minolta AF 85mm F1.4 New', - 26311 => 'Minolta/Sony AF 100-300mm F4.5-5.6 APO', #11 + 26311 => 'Minolta/Sony AF 100-300mm F4.5-5.6 APO', #11 (does not exist? https://www.dyxum.com/dforum/lens-data-requested_topic23435_page2.html) 26321 => 'Minolta AF 24-50mm F4 New', 26381 => 'Minolta AF 50mm F2.8 Macro New', 26391 => 'Minolta AF 100mm F2.8 Macro', @@ -517,6 +520,7 @@ $VERSION = '2.79'; # - this is the base to which the Canon LensType is added 30464 => 'Metabones Canon EF Speed Booster', #Metabones (to this, add Canon LensType) 45671 => 'Tokina 70-210mm F4-5.6', #22 + 45681 => 'Tokina AF 35-200mm F4-5.6 Zoom SD', #IB (model 352) 45701 => 'Tamron AF 35-135mm F3.5-4.5', #IB (model 40d) 45711 => 'Vivitar 70-210mm F4.5-5.6', #IB 45741 => '2x Teleconverter or Tamron or Tokina Lens', #18 diff --git a/lib/Image/ExifTool/Olympus.pm b/lib/Image/ExifTool/Olympus.pm index eea617ca..187dc6de 100644 --- a/lib/Image/ExifTool/Olympus.pm +++ b/lib/Image/ExifTool/Olympus.pm @@ -39,7 +39,7 @@ use Image::ExifTool qw(:DataAccess :Utils); use Image::ExifTool::Exif; use Image::ExifTool::APP12; -$VERSION = '2.59'; +$VERSION = '2.60'; sub PrintLensInfo($$$); @@ -1066,6 +1066,7 @@ my %indexInfo = ( 0x1035 => { #6 Name => 'PreviewImageValid', Writable => 'int32u', + DelValue => 0, PrintConv => { 0 => 'No', 1 => 'Yes' }, }, 0x1036 => { #6 diff --git a/lib/Image/ExifTool/Panasonic.pm b/lib/Image/ExifTool/Panasonic.pm index cd43112a..7e3f873d 100644 --- a/lib/Image/ExifTool/Panasonic.pm +++ b/lib/Image/ExifTool/Panasonic.pm @@ -36,7 +36,7 @@ use vars qw($VERSION %leicaLensTypes); use Image::ExifTool qw(:DataAccess :Utils); use Image::ExifTool::Exif; -$VERSION = '2.05'; +$VERSION = '2.06'; sub ProcessLeicaLEIC($$$); sub WhiteBalanceConv($;$$); @@ -108,7 +108,8 @@ sub WhiteBalanceConv($;$$); 39 => 'Macro-Elmar-M 90mm f/4', # 11633/11634 '39 0' => 'Tele-Elmar-M 135mm f/4 (II)',# 11861 40 => 'Macro-Adapter M', # 14409 - '41 3' => 'Apo-Summicron-M 50mm f/2 Asph', #16 + 41 => 'Apo-Summicron-M 50mm f/2 ASPH.', #IB + '41 3' => 'Apo-Summicron-M 50mm f/2 ASPH.', #16 42 => 'Tri-Elmar-M 28-35-50mm f/4 ASPH.',# 11625 '42 1' => 'Tri-Elmar-M 28-35-50mm f/4 ASPH. (at 28mm)', '42 2' => 'Tri-Elmar-M 28-35-50mm f/4 ASPH. (at 35mm)', @@ -123,8 +124,9 @@ sub WhiteBalanceConv($;$$); 50 => 'Elmar-M 24mm f/3.8 ASPH.', # ? (ref 11) 51 => 'Super-Elmar-M 21mm f/3.4 Asph', # ? (ref 16, frameSelectorBits=1) '51 2' => 'Super-Elmar-M 14mm f/3.8 Asph', # ? (ref 16) - 52 => 'Super-Elmar-M 18mm f/3.8 ASPH.', # ? (ref PH/11) - '53 2' => 'Apo-Telyt-M 135mm f/3.4', #16 + 52 => 'Apo-Telyt-M 18mm f/3.8 ASPH.', # ? (ref PH/11) + 53 => 'Apo-Telyt-M 135mm f/3.4', #IB + '53 2' => 'Apo-Telyt-M 135mm f/3.4', #16 '53 3' => 'Apo-Summicron-M 50mm f/2 (VI)', #LR 58 => 'Noctilux-M 75mm f/1.25 ASPH.', # ? (ref IB) ); diff --git a/lib/Image/ExifTool/Pentax.pm b/lib/Image/ExifTool/Pentax.pm index 71af3afb..f8b358a9 100644 --- a/lib/Image/ExifTool/Pentax.pm +++ b/lib/Image/ExifTool/Pentax.pm @@ -58,7 +58,7 @@ use Image::ExifTool::Exif; use Image::ExifTool::GPS; use Image::ExifTool::HP; -$VERSION = '3.28'; +$VERSION = '3.29'; sub CryptShutterCount($$); sub PrintFilter($$$); @@ -146,7 +146,7 @@ sub DecodeAFPoints($$$$;$); '3 44.3' => 'Sigma 17-70mm F2.8-4.5 DC Macro', #(Bart Hickman) '3 44.4' => 'Sigma 18-50mm F3.5-5.6 DC', #4 '3 44.5' => 'Sigma 17-35mm F2.8-4 EX DG', #29 - '3 44.6' => 'Tamron 35-90mm F4 AF', #12 + '3 44.6' => 'Tamron 35-90mm F4-5.6 AF', #12 (added "-5.6", ref IB) '3 44.7' => 'Sigma AF 18-35mm F3.5-4.5 Aspherical', #29 '3 46' => 'Sigma or Samsung Lens (3 46)', '3 46.1' => 'Sigma APO 70-200mm F2.8 EX', @@ -306,6 +306,7 @@ sub DecodeAFPoints($$$$;$); '8 0' => 'Sigma 50-150mm F2.8 II APO EX DC HSM', #forum2997 '8 3' => 'Sigma 18-125mm F3.8-5.6 DC HSM', #forum10167 '8 4' => 'Sigma 50mm F1.4 EX DG HSM', #Artur private communication + '8 6' => 'Sigma 4.5mm F2.8 EX DC Fisheye', #IB '8 7' => 'Sigma 24-70mm F2.8 IF EX DG HSM', #Exiv2 '8 8' => 'Sigma 18-250mm F3.5-6.3 DC OS HSM', #27 '8 11' => 'Sigma 10-20mm F3.5 EX DC HSM', #27 @@ -316,6 +317,7 @@ sub DecodeAFPoints($$$$;$); '8 16' => 'Sigma 70-200mm F2.8 EX DG Macro HSM II', #26 '8 17' => 'Sigma 50-500mm F4.5-6.3 DG OS HSM', #(Heike Herrmann) (also APO, ref 26) '8 18' => 'Sigma 8-16mm F4.5-5.6 DC HSM', #forum2998 + '8 20' => 'Sigma 18-50mm F2.8-4.5 DC HSM', #IB '8 21' => 'Sigma 17-50mm F2.8 EX DC OS HSM', #26 '8 22' => 'Sigma 85mm F1.4 EX DG HSM', #26 '8 23' => 'Sigma 70-200mm F2.8 APO EX DG OS HSM', #27 diff --git a/lib/Image/ExifTool/Sigma.pm b/lib/Image/ExifTool/Sigma.pm index 6011ebdf..323ebf04 100644 --- a/lib/Image/ExifTool/Sigma.pm +++ b/lib/Image/ExifTool/Sigma.pm @@ -19,7 +19,7 @@ use strict; use vars qw($VERSION %sigmaLensTypes); use Image::ExifTool::Exif; -$VERSION = '1.26'; +$VERSION = '1.27'; # sigma LensType lookup (ref IB) %sigmaLensTypes = ( @@ -118,6 +118,8 @@ $VERSION = '1.26'; 0x484 => 'Sigma 8mm F4 EX DG Circular Fisheye', 0x485 => 'Sigma 8mm F3.5 EX DG Circular Fisheye', 0x486 => 'Sigma 4.5mm F2.8 EX DC HSM Circular Fisheye', + 0x504 => 'Sigma 70-300mm F4-5.6 Macro Super', #IB + 0x505 => 'Sigma APO 70-300mm F4-5.6 Macro Super', #IB 0x506 => 'Sigma 70-300mm F4-5.6 APO Macro Super II', 0x507 => 'Sigma 70-300mm F4-5.6 DL Macro Super II', 0x508 => 'Sigma 70-300mm F4-5.6 DG APO Macro', diff --git a/lib/Image/ExifTool/WriteXMP.pl b/lib/Image/ExifTool/WriteXMP.pl index 5be06572..38bdb967 100644 --- a/lib/Image/ExifTool/WriteXMP.pl +++ b/lib/Image/ExifTool/WriteXMP.pl @@ -1203,7 +1203,9 @@ sub WriteXMP($$;$) $et->Warn("$grp:$$tagInfo{Name} written as a literal because value is not a valid URI", 1); # fall through to write as a string literal } - delete $attrs{'rdf:resource'}; # (remove existing resource if necessary) + # remove existing value and/or resource attribute if they exist + delete $attrs{'rdf:value'}; + delete $attrs{'rdf:resource'}; $capture{$path} = [ $newValue, \%attrs ]; last; } diff --git a/lib/Image/ExifTool/Writer.pl b/lib/Image/ExifTool/Writer.pl index 7cd541ef..1c4f2d3c 100644 --- a/lib/Image/ExifTool/Writer.pl +++ b/lib/Image/ExifTool/Writer.pl @@ -270,6 +270,7 @@ my %ignorePrintConv = map { $_ => 1 } qw(OTHER BITMASK Notes); # NoFlat => treat flattened tags as 'unsafe' # NoShortcut => true to prevent looking up shortcut tags # ProtectSaved => protect existing new values with a save count greater than this +# IgnorePermanent => ignore attempts to delete a permanent tag # CreateGroups => [internal use] createGroups hash ref from related tags # ListOnly => [internal use] set only list or non-list tags # SetTags => [internal use] hash ref to return tagInfo refs of set tags @@ -891,6 +892,7 @@ TAG: foreach $tagInfo (@matchingTags) { next; } } elsif ($permanent) { + return 0 if $options{IgnorePermanent}; # can't delete permanent tags, so set them to DelValue or empty string instead if (defined $$tagInfo{DelValue}) { $val = $$tagInfo{DelValue}; @@ -1125,6 +1127,9 @@ WriteAlso: undef $evalWarning; #### eval WriteAlso ($val) my $v = eval $$writeAlso{$wtag}; + # we wanted to do the eval in case there are side effect, but we + # don't want to write a value for a tag that is being deleted: + undef $v unless defined $val; $@ and $evalWarning = $@; unless ($evalWarning) { ($n,$evalWarning) = $self->SetNewValue($wgrp . $wtag, $v, %opts); diff --git a/lib/Image/ExifTool/XMP.pm b/lib/Image/ExifTool/XMP.pm index ef01116d..6690441c 100644 --- a/lib/Image/ExifTool/XMP.pm +++ b/lib/Image/ExifTool/XMP.pm @@ -49,7 +49,7 @@ use Image::ExifTool::Exif; use Image::ExifTool::GPS; require Exporter; -$VERSION = '3.25'; +$VERSION = '3.26'; @ISA = qw(Exporter); @EXPORT_OK = qw(EscapeXML UnescapeXML); @@ -2056,10 +2056,11 @@ my %sPantryItem = ( Writable => 'integer', }, CameraOwnerName => { Name => 'OwnerName' }, - BodySerialNumber => { Name => 'SerialNumber' }, + BodySerialNumber => { Name => 'SerialNumber', Groups => { 2 => 'Camera' } }, LensSpecification => { Name => 'LensInfo', Writable => 'rational', + Groups => { 2 => 'Camera' }, List => 'Seq', RawJoin => 1, # join list into a string before ValueConv ValueConv => \&ConvertRationalList, @@ -2083,9 +2084,9 @@ my %sPantryItem = ( instead of using the existing XMP-aux:LensInfo }, }, - LensMake => { }, - LensModel => { }, - LensSerialNumber => { }, + LensMake => { Groups => { 2 => 'Camera' } }, + LensModel => { Groups => { 2 => 'Camera' } }, + LensSerialNumber => { Groups => { 2 => 'Camera' } }, InteroperabilityIndex => { Name => 'InteropIndex', Description => 'Interoperability Index', @@ -2237,6 +2238,7 @@ my %sPantryItem = ( # (used to set EXIF GPS position from XMP tags) GPSLatitudeRef => { Require => 'XMP-exif:GPSLatitude', + Groups => { 2 => 'Location' }, # Note: Do not Inihibit based on EXIF:GPSLatitudeRef (see forum10192) ValueConv => q{ IsFloat($val[0]) and return $val[0] < 0 ? "S" : "N"; @@ -2247,6 +2249,7 @@ my %sPantryItem = ( }, GPSLongitudeRef => { Require => 'XMP-exif:GPSLongitude', + Groups => { 2 => 'Location' }, ValueConv => q{ IsFloat($val[0]) and return $val[0] < 0 ? "W" : "E"; $val[0] =~ /^.*([EW])/; @@ -2256,6 +2259,7 @@ my %sPantryItem = ( }, GPSDestLatitudeRef => { Require => 'XMP-exif:GPSDestLatitude', + Groups => { 2 => 'Location' }, ValueConv => q{ IsFloat($val[0]) and return $val[0] < 0 ? "S" : "N"; $val[0] =~ /^.*([NS])/; @@ -2265,6 +2269,7 @@ my %sPantryItem = ( }, GPSDestLongitudeRef => { Require => 'XMP-exif:GPSDestLongitude', + Groups => { 2 => 'Location' }, ValueConv => q{ IsFloat($val[0]) and return $val[0] < 0 ? "W" : "E"; $val[0] =~ /^.*([EW])/; @@ -2287,6 +2292,7 @@ my %sPantryItem = ( Inhibit => { 6 => 'Composite:LensID', # don't override existing Composite:LensID }, + Groups => { 2 => 'Camera' }, ValueConv => '$val', PrintConv => 'Image::ExifTool::XMP::PrintLensID($self, @val)', }, @@ -2300,6 +2306,7 @@ my %sPantryItem = ( 4 => 'XMP:FlashRedEyeMode', 5 => 'XMP:Flash', # handle structured flash information too }, + Groups => { 2 => 'Camera' }, Writable => 1, PrintHex => 1, SeparateTable => 'EXIF Flash', diff --git a/perl-Image-ExifTool.spec b/perl-Image-ExifTool.spec index 579d7139..3d9b7c1b 100644 --- a/perl-Image-ExifTool.spec +++ b/perl-Image-ExifTool.spec @@ -1,6 +1,6 @@ Summary: perl module for image data extraction Name: perl-Image-ExifTool -Version: 11.61 +Version: 11.62 Release: 1 License: Artistic/GPL Group: Development/Libraries/Perl diff --git a/t/CanonRaw_4.out b/t/CanonRaw_4.out index e37ded15..7a084b20 100644 --- a/t/CanonRaw_4.out +++ b/t/CanonRaw_4.out @@ -1,10 +1,10 @@ -[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.55 +[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.62 [File, System, Image] FileName - File Name: CanonRaw_4_failed.crw [File, System, Image] Directory - Directory: t [File, System, Image] FileSize - File Size: 13 kB -[File, System, Time] FileModifyDate - File Modification Date/Time: 2019:07:03 12:16:39-04:00 -[File, System, Time] FileAccessDate - File Access Date/Time: 2019:07:03 12:16:39-04:00 -[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2019:07:03 12:16:39-04:00 +[File, System, Time] FileModifyDate - File Modification Date/Time: 2019:08:12 12:07:27-04:00 +[File, System, Time] FileAccessDate - File Access Date/Time: 2019:08:12 12:07:27-04:00 +[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2019:08:12 12:07:27-04:00 [File, System, Image] FilePermissions - File Permissions: rw-r--r-- [File, File, Image] FileType - File Type: CRW [File, File, Image] FileTypeExtension - File Type Extension: crw @@ -142,7 +142,7 @@ [MakerNotes, CanonRaw, Image] 3 - Raw Jpg Width: 2048 [MakerNotes, CanonRaw, Image] 4 - Raw Jpg Height: 1360 [MakerNotes, CanonRaw, Camera] 6203 - Serial Number Format: Format 1 -[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 11.55 +[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 11.62 [XMP, XMP-aux, Camera] Lens - Lens: 18.0 - 55.0 mm [XMP, XMP-crs, Image] Temperature - Color Temperature: 5200 [XMP, XMP-dc, Image] description - Description: CRW with embedded XMP @@ -181,7 +181,7 @@ [XMP, XMP-exif, Image] ShutterSpeedValue - Shutter Speed Value: 1 [XMP, XMP-exif, Image] UserComment - User Comment: [XMP, XMP-exif, Camera] WhiteBalance - White Balance: Auto -[XMP, XMP-exifEX, Image] BodySerialNumber - Serial Number: 1234 +[XMP, XMP-exifEX, Camera] BodySerialNumber - Serial Number: 1234 [XMP, XMP-exifEX, Image] CameraOwnerName - Owner Name: Phil Harvey [XMP, XMP-exifEX, Image] InteroperabilityIndex - Interoperability Index: THM - DCF thumbnail file [XMP, XMP-pmi, Image] sequenceNumber - Sequence Number: 0 @@ -205,7 +205,7 @@ [Composite, Composite, Camera] Canon::WB_RGGBLevels - WB RGGB Levels: 1719 832 831 990 [Composite, Composite, Image] Exif::Aperture - Aperture: 14.3 [Composite, Composite, Image] Exif::ShutterSpeed - Shutter Speed: 4 -[Composite, Composite, Other] XMP::Flash - Flash: No Flash +[Composite, Composite, Camera] XMP::Flash - Flash: No Flash [Composite, Composite, Camera] Exif::BlueBalance - Blue Balance: 1.190619 [Composite, Composite, Image] Exif::ImageSize - Image Size: 3072x2048 [Composite, Composite, Camera] Exif::LensID - Lens ID: Unknown 18-55mm diff --git a/t/CanonRaw_7.out b/t/CanonRaw_7.out index 397be4b7..ffb4ca9f 100644 --- a/t/CanonRaw_7.out +++ b/t/CanonRaw_7.out @@ -1,10 +1,10 @@ -[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.55 +[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.62 [File, System, Image] FileName - File Name: CanonRaw_7_failed.jpg [File, System, Image] Directory - Directory: t [File, System, Image] FileSize - File Size: 7.2 kB -[File, System, Time] FileModifyDate - File Modification Date/Time: 2019:07:03 12:16:40-04:00 -[File, System, Time] FileAccessDate - File Access Date/Time: 2019:07:03 12:16:40-04:00 -[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2019:07:03 12:16:40-04:00 +[File, System, Time] FileModifyDate - File Modification Date/Time: 2019:08:12 12:07:28-04:00 +[File, System, Time] FileAccessDate - File Access Date/Time: 2019:08:12 12:07:28-04:00 +[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2019:08:12 12:07:28-04:00 [File, System, Image] FilePermissions - File Permissions: rw-r--r-- [File, File, Image] FileType - File Type: JPEG [File, File, Image] FileTypeExtension - File Type Extension: jpg @@ -210,7 +210,7 @@ [MakerNotes, Canon, Camera] 52 - Camera Color Calibration 14: 770 382 248 (2871K) [MakerNotes, Canon, Camera] 56 - Camera Color Calibration 15: 949 307 397 (2413K) [MakerNotes, Canon, Camera] 2 - Color Tone: Normal -[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 11.55 +[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 11.62 [XMP, XMP-aux, Camera] Lens - Lens: 18.0 - 55.0 mm [XMP, XMP-exif, Image] ComponentsConfiguration - Components Configuration: -, -, -, - [XMP, XMP-exif, Camera] FlashFired - Flash Fired: False @@ -236,7 +236,7 @@ [Composite, Composite, Camera] Canon::WB_RGGBLevels - WB RGGB Levels: 2002 1185 1187 2364 [Composite, Composite, Image] Exif::Aperture - Aperture: 8.0 [Composite, Composite, Image] Exif::ShutterSpeed - Shutter Speed: 1/15 -[Composite, Composite, Other] XMP::Flash - Flash: Off, Did not fire +[Composite, Composite, Camera] XMP::Flash - Flash: Off, Did not fire [Composite, Composite, Camera] Exif::BlueBalance - Blue Balance: 1.993255 [Composite, Composite, Image] Exif::ImageSize - Image Size: 8x8 [Composite, Composite, Camera] Exif::LensID - Lens ID: Unknown 18-55mm diff --git a/t/DNG_2.out b/t/DNG_2.out index d7edc922..2edcfc2b 100644 --- a/t/DNG_2.out +++ b/t/DNG_2.out @@ -1,10 +1,10 @@ -[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.55 +[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.62 [File, System, Image] FileName - File Name: DNG.dng [File, System, Image] Directory - Directory: t/images [File, System, Image] FileSize - File Size: 13 kB [File, System, Time] FileModifyDate - File Modification Date/Time: 2006:02:26 09:30:53-05:00 -[File, System, Time] FileAccessDate - File Access Date/Time: 2019:07:03 12:16:37-04:00 -[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2019:07:02 12:56:21-04:00 +[File, System, Time] FileAccessDate - File Access Date/Time: 2019:08:09 08:51:07-04:00 +[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2019:08:07 07:18:09-04:00 [File, System, Image] FilePermissions - File Permissions: rw-r--r-- [File, File, Image] FileType - File Type: DNG [File, File, Image] FileTypeExtension - File Type Extension: dng @@ -320,7 +320,7 @@ [Composite, Composite, Camera] Exif::RedBalance - Red Balance: 1.688027 [Composite, Composite, Camera] Exif::ScaleFactor35efl - Scale Factor To 35 mm Equivalent: 1.6 [Composite, Composite, Image] Exif::ShutterSpeed - Shutter Speed: 1/15 -[Composite, Composite, Other] XMP::Flash - Flash: Off, Did not fire +[Composite, Composite, Camera] XMP::Flash - Flash: Off, Did not fire [Composite, Composite, Camera] Canon::Lens35efl - Lens: 18.0 - 55.0 mm (35 mm equivalent: 29.2 - 89.2 mm) [Composite, Composite, Camera] Exif::CircleOfConfusion - Circle Of Confusion: 0.019 mm [Composite, Composite, Image] Exif::FOV - Field Of View: 22.8 deg diff --git a/t/Nikon_4.out b/t/Nikon_4.out index db5cc6d8..167b5a72 100644 --- a/t/Nikon_4.out +++ b/t/Nikon_4.out @@ -1,10 +1,10 @@ -[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.55 +[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.62 [File, System, Image] FileName - File Name: Nikon_4_failed.jpg [File, System, Image] Directory - Directory: t [File, System, Image] FileSize - File Size: 6.8 kB -[File, System, Time] FileModifyDate - File Modification Date/Time: 2019:07:03 11:48:23-04:00 -[File, System, Time] FileAccessDate - File Access Date/Time: 2019:07:03 11:48:23-04:00 -[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2019:07:03 11:48:23-04:00 +[File, System, Time] FileModifyDate - File Modification Date/Time: 2019:08:12 12:07:43-04:00 +[File, System, Time] FileAccessDate - File Access Date/Time: 2019:08:12 12:07:43-04:00 +[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2019:08:12 12:07:43-04:00 [File, System, Image] FilePermissions - File Permissions: rw-r--r-- [File, File, Image] FileType - File Type: JPEG [File, File, Image] FileTypeExtension - File Type Extension: jpg @@ -137,7 +137,7 @@ [MakerNotes, Nikon, Camera] 169 - Image Optimization: Custom [MakerNotes, Nikon, Camera] 170 - Saturation: Enhanced [MakerNotes, Nikon, Camera] 171 - Vari Program: -[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 11.55 +[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 11.62 [XMP, XMP-aux, Camera] FlashCompensation - Flash Compensation: 0 [XMP, XMP-aux, Camera] Lens - Lens: 18-70mm f/3.5-4.5 [XMP, XMP-exif, Image] ComponentsConfiguration - Components Configuration: Y, Cb, Cr, - @@ -162,7 +162,7 @@ [Composite, Composite, Time] Exif::SubSecModifyDate - Modify Date: 2005:01:14 08:57:59.20 [Composite, Composite, Camera] Nikon::LensID - Lens ID: AF-S DX Zoom-Nikkor 18-70mm f/3.5-4.5G IF-ED [Composite, Composite, Camera] Nikon::LensSpec - Lens Spec: 18-70mm f/3.5-4.5 G -[Composite, Composite, Other] XMP::Flash - Flash: Auto, Fired, Return detected +[Composite, Composite, Camera] XMP::Flash - Flash: Auto, Fired, Return detected [Composite, Composite, Camera] Exif::BlueBalance - Blue Balance: 1.410156 [Composite, Composite, Image] Exif::ImageSize - Image Size: 8x8 [Composite, Composite, Image] Exif::LightValue - Light Value: 9.6 diff --git a/t/PNG_3.out b/t/PNG_3.out index c136d8d7..1ef71179 100644 --- a/t/PNG_3.out +++ b/t/PNG_3.out @@ -1,4 +1,4 @@ -[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.55 +[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.62 [File, File, Image] FileType - File Type: PNG [File, File, Image] FileTypeExtension - File Type Extension: png [File, File, Image] MIMEType - MIME Type: image/png @@ -25,7 +25,7 @@ [PNG, PNG, Image] URL - URL: http://owl.phy.queensu.ca/~phil/exiftool/ [PNG, PNG, Time] create-date - Create Date: 2001:05:19 18:36:41 [PNG, PNG, Time] tIME - Modify Date: 2004:02:26 09:36:46 -[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 11.55 +[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 11.62 [XMP, XMP-dc, Author] creator - Creator: Phil Harvey [XMP, XMP-dc, Image] description - Description: UTF-16 (big-endian) encoded XMP [XMP, XMP-dc, Author] rights - Rights: Copyright 2004 Phil Harvey @@ -116,7 +116,7 @@ [Photoshop, Photoshop, Image] 1049 - Global Altitude: 30 [Composite, Composite, Image] Exif::Aperture - Aperture: 3.5 [Composite, Composite, Image] Exif::ShutterSpeed - Shutter Speed: 1/64 -[Composite, Composite, Other] XMP::Flash - Flash: Fired +[Composite, Composite, Camera] XMP::Flash - Flash: Fired [Composite, Composite, Image] Exif::ImageSize - Image Size: 16x16 [Composite, Composite, Image] Exif::LightValue - Light Value: 9.6 [Composite, Composite, Image] Exif::Megapixels - Megapixels: 0.000256 diff --git a/t/Sony_3.out b/t/Sony_3.out index 376b3c2f..0d7d3f74 100644 --- a/t/Sony_3.out +++ b/t/Sony_3.out @@ -1,10 +1,10 @@ -[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.55 +[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.62 [File, System, Image] FileName - File Name: Sony_3_failed.jpg [File, System, Image] Directory - Directory: t [File, System, Image] FileSize - File Size: 5.5 kB -[File, System, Time] FileModifyDate - File Modification Date/Time: 2019:07:03 12:17:02-04:00 -[File, System, Time] FileAccessDate - File Access Date/Time: 2019:07:03 12:17:02-04:00 -[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2019:07:03 12:17:02-04:00 +[File, System, Time] FileModifyDate - File Modification Date/Time: 2019:08:12 12:07:52-04:00 +[File, System, Time] FileAccessDate - File Access Date/Time: 2019:08:12 12:07:52-04:00 +[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2019:08:12 12:07:52-04:00 [File, System, Image] FilePermissions - File Permissions: rw-r--r-- [File, File, Image] FileType - File Type: JPEG [File, File, Image] FileTypeExtension - File Type Extension: jpg @@ -77,11 +77,11 @@ [PrintIM, PrintIM, Printing] PrintIMVersion - PrintIM Version: 0250 [PrintIM, PrintIM, Printing] 2 - Print IM 0x0002: 0x00000001 [PrintIM, PrintIM, Printing] 257 - Print IM 0x0101: 0x00000000 -[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 11.55 +[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 11.62 [XMP, XMP-exif, Camera] FlashFired - Flash Fired: True [Composite, Composite, Image] Exif::Aperture - Aperture: 7.1 [Composite, Composite, Image] Exif::ShutterSpeed - Shutter Speed: 1/250 -[Composite, Composite, Other] XMP::Flash - Flash: Fired +[Composite, Composite, Camera] XMP::Flash - Flash: Fired [Composite, Composite, Image] Exif::ImageSize - Image Size: 8x8 [Composite, Composite, Image] Exif::Megapixels - Megapixels: 0.000064 [Composite, Composite, Camera] Exif::FocalLength35efl - Focal Length: 12.5 mm diff --git a/t/Writer_10.out b/t/Writer_10.out index d78197c3..f2a7d67a 100644 --- a/t/Writer_10.out +++ b/t/Writer_10.out @@ -1,10 +1,10 @@ -[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.55 +[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.62 [File, System, Image] FileName - File Name: Writer_10_failed.jpg [File, System, Image] Directory - Directory: t [File, System, Image] FileSize - File Size: 7.0 kB -[File, System, Time] FileModifyDate - File Modification Date/Time: 2019:07:03 11:48:35-04:00 -[File, System, Time] FileAccessDate - File Access Date/Time: 2019:07:03 11:48:34-04:00 -[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2019:07:03 11:48:35-04:00 +[File, System, Time] FileModifyDate - File Modification Date/Time: 2019:08:12 12:07:54-04:00 +[File, System, Time] FileAccessDate - File Access Date/Time: 2019:08:12 12:07:54-04:00 +[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2019:08:12 12:07:54-04:00 [File, System, Image] FilePermissions - File Permissions: rw-r--r-- [File, File, Image] FileType - File Type: JPEG [File, File, Image] FileTypeExtension - File Type Extension: jpg @@ -217,7 +217,7 @@ [MakerNotes, Pentax, Image] 16 - WB Shift AB: 0 [MakerNotes, Pentax, Image] 17 - WB Shift GM: 0 [PrintIM, PrintIM, Printing] PrintIMVersion - PrintIM Version: 0300 -[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 11.55 +[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 11.62 [XMP, XMP-dc, Time] date - Date: 2008:03:02 [XMP, XMP-exif, Image] ComponentsConfiguration - Components Configuration: Y, Cb, Cr, - [XMP, XMP-exif, Camera] FlashFired - Flash Fired: False @@ -234,7 +234,7 @@ [XMP, XMP-tiff, Image] YCbCrSubSampling - Y Cb Cr Sub Sampling: YCbCr4:2:0 (2 2) [Composite, Composite, Image] Exif::Aperture - Aperture: 13.0 [Composite, Composite, Image] Exif::ShutterSpeed - Shutter Speed: 1/100 -[Composite, Composite, Other] XMP::Flash - Flash: Off, Did not fire +[Composite, Composite, Camera] XMP::Flash - Flash: Off, Did not fire [Composite, Composite, Image] Exif::ImageSize - Image Size: 8x8 [Composite, Composite, Camera] Exif::LensID - Lens ID: Sigma AF 10-20mm F4-5.6 EX DC [Composite, Composite, Image] Exif::LightValue - Light Value: 14.0 diff --git a/t/Writer_48.out b/t/Writer_48.out index 452a97b7..1af9ca97 100644 --- a/t/Writer_48.out +++ b/t/Writer_48.out @@ -1,4 +1,4 @@ -[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.55 +[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.62 [File, System, Image] Directory - Directory: t [File, System, Image] FileSize - File Size: 3.8 kB [File, System, Image] FilePermissions - File Permissions: rw-r--r-- @@ -21,11 +21,11 @@ [IPTC, IPTC, Other] 25 - Keywords: A [IPTC, IPTC, Location] 90 - City: A [IPTC, IPTC, Other] 0 - Application Record Version: 4 -[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 11.55 +[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 11.62 [XMP, XMP-iptcExt, Location] LocationCreatedCity - Location Created City: A [XMP, XMP-dc, Image] subject - Subject: A [XMP, XMP-dc, Image] title - Title: A [XMP, XMP-exif, Camera] FlashFired - Flash Fired: True -[Composite, Composite, Other] XMP::Flash - Flash: Fired +[Composite, Composite, Camera] XMP::Flash - Flash: Fired [Composite, Composite, Image] Exif::ImageSize - Image Size: 8x8 [Composite, Composite, Image] Exif::Megapixels - Megapixels: 0.000064 diff --git a/t/Writer_9.out b/t/Writer_9.out index b7b4277d..e98631d2 100644 --- a/t/Writer_9.out +++ b/t/Writer_9.out @@ -1,10 +1,10 @@ -[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.55 +[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.62 [File, System, Image] FileName - File Name: Writer_9_failed.jpg [File, System, Image] Directory - Directory: t [File, System, Image] FileSize - File Size: 10.0 kB -[File, System, Time] FileModifyDate - File Modification Date/Time: 2019:07:03 12:17:04-04:00 -[File, System, Time] FileAccessDate - File Access Date/Time: 2019:07:03 12:17:04-04:00 -[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2019:07:03 12:17:04-04:00 +[File, System, Time] FileModifyDate - File Modification Date/Time: 2019:08:12 12:07:54-04:00 +[File, System, Time] FileAccessDate - File Access Date/Time: 2019:08:12 12:07:54-04:00 +[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2019:08:12 12:07:54-04:00 [File, System, Image] FilePermissions - File Permissions: rw-r--r-- [File, File, Image] FileType - File Type: JPEG [File, File, Image] FileTypeExtension - File Type Extension: jpg @@ -164,7 +164,7 @@ [MakerNotes, Canon, Camera] 9 - AF Area Y Positions: 0 0 -506 0 506 0 0 [MakerNotes, Canon, Camera] 10 - AF Points In Focus: (none) [MakerNotes, Canon, Camera] 19 - Thumbnail Image Valid Area: 0 159 7 112 -[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 11.55 +[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 11.62 [XMP, XMP-aux, Camera] Lens - Lens: 18.0 - 55.0 mm [XMP, XMP-exif, Image] ComponentsConfiguration - Components Configuration: Y, Cb, Cr, - [XMP, XMP-exif, Image] CompressedBitsPerPixel - Compressed Bits Per Pixel: 9 @@ -227,7 +227,7 @@ [Composite, Composite, Camera] Canon::WB_RGGBLevels - WB RGGB Levels: 1719 832 831 990 [Composite, Composite, Image] Exif::Aperture - Aperture: 14.0 [Composite, Composite, Image] Exif::ShutterSpeed - Shutter Speed: 4 -[Composite, Composite, Other] XMP::Flash - Flash: No Flash +[Composite, Composite, Camera] XMP::Flash - Flash: No Flash [Composite, Composite, Camera] Exif::BlueBalance - Blue Balance: 1.190619 [Composite, Composite, Image] Exif::ImageSize - Image Size: 8x8 [Composite, Composite, Camera] Exif::LensID - Lens ID: Unknown 18-55mm @@ -258,7 +258,7 @@ my $testnum = 1; ++$testnum; my @writeInfo = ( [ 'all' => undef ], - [ 'xmp-dc:all' => undef, Replace => 2 ], + [ 'xmp-dc:all' => undef, Replace => 2 ], [ 'xmp-xmprights:all' => undef, Replace => 2 ], ); print 'not ' unless writeCheck(\@writeInfo, $testname, $testnum, diff --git a/t/XMP_36.out b/t/XMP_36.out index 3380c2c5..6f3030ce 100644 --- a/t/XMP_36.out +++ b/t/XMP_36.out @@ -1,10 +1,10 @@ -[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.55 +[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.62 [File, System, Image] FileName - File Name: XMP5.xmp [File, System, Image] Directory - Directory: t/images [File, System, Image] FileSize - File Size: 4.6 kB [File, System, Time] FileModifyDate - File Modification Date/Time: 2015:04:11 08:20:05-04:00 -[File, System, Time] FileAccessDate - File Access Date/Time: 2019:07:03 12:17:05-04:00 -[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2019:07:02 12:56:21-04:00 +[File, System, Time] FileAccessDate - File Access Date/Time: 2019:08:12 12:07:58-04:00 +[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2019:08:07 07:18:09-04:00 [File, System, Image] FilePermissions - File Permissions: rw-r--r-- [File, File, Image] FileType - File Type: XMP [File, File, Image] FileTypeExtension - File Type Extension: xmp @@ -16,4 +16,4 @@ [XMP, XMP-mwg-rs, Image] Regions - Region Info: {RegionList=[{Area={H=8,W=8,X=0,Y=0},Name=Region 1,SeeAlso=plus:Licensee,Type=Face},{Extensions={XMP-exif:Flash={Mode=On,Return=Return not detected},XMP-iptcExt:ArtworkOrObject=[{AOTitle-de=verfänglich}],XMP-myXMPns:BTestTag={Field1=[this is wild]},XMP-xmpRights:UsageTerms-fr=libre}}]} [XMP, XMP-myXMPns, Other] BTestTag - B Test Tag: {Field1-en-CA=[eh?],Field1-en-US=[huh?,groovy],Field1-fr=[,ingénieux]} [XMP, XMP-plus, Author] Licensee - Licensee: [{LicenseeName=Phil}] -[Composite, Composite, Other] XMP::Flash - Flash: Off, Did not fire +[Composite, Composite, Camera] XMP::Flash - Flash: Off, Did not fire diff --git a/t/XMP_37.out b/t/XMP_37.out index fb4c6c4c..cd51732e 100644 --- a/t/XMP_37.out +++ b/t/XMP_37.out @@ -1,10 +1,10 @@ -[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.55 +[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.62 [File, System, Image] FileName - File Name: XMP5.xmp [File, System, Image] Directory - Directory: t/images [File, System, Image] FileSize - File Size: 4.6 kB [File, System, Time] FileModifyDate - File Modification Date/Time: 2015:04:11 08:20:05-04:00 -[File, System, Time] FileAccessDate - File Access Date/Time: 2019:07:03 12:17:05-04:00 -[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2019:07:02 12:56:21-04:00 +[File, System, Time] FileAccessDate - File Access Date/Time: 2019:08:12 12:07:58-04:00 +[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2019:08:07 07:18:09-04:00 [File, System, Image] FilePermissions - File Permissions: rw-r--r-- [File, File, Image] FileType - File Type: XMP [File, File, Image] FileTypeExtension - File Type Extension: xmp @@ -33,4 +33,4 @@ [XMP, XMP-myXMPns, Other] BTestTagField1-en-US - Renamed (en-US): huh?, groovy [XMP, XMP-myXMPns, Other] BTestTagField1-fr - Renamed (fr): ingénieux [XMP, XMP-plus, Author] LicenseeLicenseeName - Licensee Name: Phil -[Composite, Composite, Other] XMP::Flash - Flash: Off, Did not fire +[Composite, Composite, Camera] XMP::Flash - Flash: Off, Did not fire diff --git a/t/XMP_6.out b/t/XMP_6.out index bf6082b5..63664ca1 100644 --- a/t/XMP_6.out +++ b/t/XMP_6.out @@ -1,15 +1,15 @@ -[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.55 +[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 11.62 [File, System, Image] FileName - File Name: XMP_6_failed.xmp [File, System, Image] Directory - Directory: t [File, System, Image] FileSize - File Size: 5.7 kB -[File, System, Time] FileModifyDate - File Modification Date/Time: 2019:07:03 12:17:05-04:00 -[File, System, Time] FileAccessDate - File Access Date/Time: 2019:07:03 12:17:04-04:00 -[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2019:07:03 12:17:05-04:00 +[File, System, Time] FileModifyDate - File Modification Date/Time: 2019:08:12 12:07:58-04:00 +[File, System, Time] FileAccessDate - File Access Date/Time: 2019:08:12 12:07:58-04:00 +[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2019:08:12 12:07:58-04:00 [File, System, Image] FilePermissions - File Permissions: rw-r--r-- [File, File, Image] FileType - File Type: XMP [File, File, Image] FileTypeExtension - File Type Extension: xmp [File, File, Image] MIMEType - MIME Type: application/rdf+xml -[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 11.55 +[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 11.62 [XMP, XMP-dc, Author] creator - Creator: Phil Harvey [XMP, XMP-dc, Image] description - Description: UTF-16 (big-endian) encoded XMP [XMP, XMP-dc, Author] rights - Rights: Copyright 2004 Phil Harvey @@ -82,7 +82,7 @@ [XMP, XMP-xmpRights, Author] WebStatement - Web Statement: http://owl.phy.queensu.ca/~phil/exiftool/ [Composite, Composite, Image] Exif::Aperture - Aperture: 3.5 [Composite, Composite, Image] Exif::ShutterSpeed - Shutter Speed: 1/64 -[Composite, Composite, Other] XMP::Flash - Flash: Fired +[Composite, Composite, Camera] XMP::Flash - Flash: Fired [Composite, Composite, Image] Exif::ImageSize - Image Size: 8x8 [Composite, Composite, Image] Exif::LightValue - Light Value: 9.6 [Composite, Composite, Image] Exif::Megapixels - Megapixels: 0.000064 |