diff options
| author | exiftool <exiftool@users.sourceforge.net> | 2019-01-15 09:07:37 -0500 |
|---|---|---|
| committer | exiftool <exiftool@users.sourceforge.net> | 2019-01-15 09:07:37 -0500 |
| commit | 441100259d06a30761d1ec2f7e1f1f762871a83c (patch) | |
| tree | 3b85ad57031a5afc23a5e83d3d81cc7c07ac293a | |
| parent | 9e0ce916748abb56dbb8593d2184445080f678d0 (diff) | |
Update to 11.25
35 files changed, 761 insertions, 570 deletions
@@ -7,6 +7,20 @@ RSS feed: http://owl.phy.queensu.ca/~phil/exiftool/rss.xml Note: The most recent production release is Version 11.11. (Other versions are considered development releases, and are not uploaded to CPAN.) +Jan. 15, 2019 - Version 11.25 + + - Added a new Sony/Minolta LensType (thanks LibRaw) + - Added a new Nikon LensID + - Decode Leica D-Lux7 maker notes + - Decode more Nikon AF tags for newer models + - Decode Samsung Type2 maker notes with lower case Make + - Decode another Sony tag (thanks Jos Roost) + - Improved decoding of Nikon LensType + - Improved time shift feature to fix some incorrectly formatted date/time + values + - Renamed some Sony ImageCount tags to ShutterCount (thanks Jos Roost) + - Fixed problem reading back metadata written to some odd PDF files + Jan. 8, 2019 - Version 11.24 - Compatibility Notice: Changed the meaning of '-' and '+' modifiers for %C @@ -15,7 +29,7 @@ Jan. 8, 2019 - Version 11.24 - Added new Olympus FlashType and FlashModel values (thanks Per) - Added a new Canon LensType - Added a new Nikon LensID - - Made all GeoTIFF tags writable + - Made more GeoTIFF tags writable - Handle XMP rdf:value when reading - Improved warning when trying to read a file with a zero-length name - Fixed decoding of PictureControl tags for Nikon Z-7 @@ -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.24.tar.gz | tar -xf - - cd Image-ExifTool-11.24 + gzip -dc Image-ExifTool-11.25.tar.gz | tar -xf - + cd Image-ExifTool-11.25 ./exiftool t/images/ExifTool.jpg Note: These commands extract meta information from one of the test images. @@ -12,7 +12,7 @@ use strict; require 5.004; -my $version = '11.24'; +my $version = '11.25'; # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool' my $exeDir; @@ -990,6 +990,7 @@ for (;;) { /^(m|ignoreminorerrors)$/i and $mt->Options(IgnoreMinorErrors => 1), next; /^(n|-printconv)$/i and $mt->Options(PrintConv => 0), next; /^(-n|printconv)$/i and $mt->Options(PrintConv => 1), next; + $a eq 'nop' and $helped=1, next; # (no operation) if (/^o(ut)?$/i) { $outOpt = shift; defined $outOpt or Error("Expected output file or directory name for -o option\n"), $badCmd=1, next; @@ -5065,7 +5066,7 @@ with this command: produces output like this: - -- Generated by ExifTool 11.24 -- + -- Generated by ExifTool 11.25 -- 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 @@ -6153,10 +6154,11 @@ ExifTool 9.79 and later allow the file name encoding to be specified with C<-charset filename=CHARSET>, where C<CHARSET> is the name of a valid ExifTool character set, preferably C<UTF8> (see the B<-charset> option for a complete list). Setting this triggers the use of Windows wide-character i/o -routines, thus providing support for all Unicode file names. But note that -it is not trivial to pass properly encoded file names on the Windows command -line (see L<http://owl.phy.queensu.ca/~phil/exiftool/faq.html#Q18> for -details), so placing them in a UTF-8 encoded B<-@> argfile and using +routines, thus providing support for most Unicode file names (see note 4). +But note that it is not trivial to pass properly encoded file names on the +Windows command line (see +L<http://owl.phy.queensu.ca/~phil/exiftool/faq.html#Q18> for details), so +placing them in a UTF-8 encoded B<-@> argfile and using C<-charset filename=utf8> is recommended if possible. A warning is issued if a specified filename contains special characters and @@ -6189,6 +6191,9 @@ like Cygwin. 3) See L</WRITING READ-ONLY FILES> below for a note about editing read-only files with Unicode names. +4) Unicode file names with surrogate pairs (code points over U+FFFF) still +cause problems. + =head1 WRITING READ-ONLY FILES In general, ExifTool may be used to write metadata to read-only files diff --git a/html/ExifTool.pdf b/html/ExifTool.pdf index 919fe8ea..a9ad5f9b 100644 --- a/html/ExifTool.pdf +++ b/html/ExifTool.pdf @@ -12,7 +12,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 1)Tj +( -- Image::ExifTool 11.25 -- 1)Tj /TT4 1 Tf 0 -1.6333 TD (EXIFTOOL\(1\) User Contributed Perl Documentation EXIFTOOL\(1\))Tj @@ -189,7 +189,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 2)Tj +( -- Image::ExifTool 11.25 -- 2)Tj /TT4 1 Tf 0 -1.6333 TD ( ASF r | FFF r/w | MIFF r | PFA r | TIFF r/w)Tj @@ -382,7 +382,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 3)Tj +( -- Image::ExifTool 11.25 -- 3)Tj /TT4 1 Tf 0 -1.6333 TD (M)Tj @@ -619,7 +619,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 4)Tj +( -- Image::ExifTool 11.25 -- 4)Tj /TT4 1 Tf 0 -1.6333 TD ( used afterward to access member functions. Must be the first)Tj @@ -770,7 +770,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 5)Tj +( -- Image::ExifTool 11.25 -- 5)Tj /TT4 1 Tf 0 -1.6333 TD ( still generated, but the tag value is undefined.)Tj @@ -965,7 +965,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 6)Tj +( -- Image::ExifTool 11.25 -- 6)Tj /TT4 1 Tf 0 -2.7333 TD ( ExifToolVersion - The ExifTool version number.)Tj @@ -1108,7 +1108,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 7)Tj +( -- Image::ExifTool 11.25 -- 7)Tj /TT4 1 Tf 0 -1.6333 TD ( ExifTool with code points above U+007F. Default is 'UTF8'.)Tj @@ -1257,7 +1257,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 8)Tj +( -- Image::ExifTool 11.25 -- 8)Tj /TT4 1 Tf 0 -1.6333 TD ( Internal encoding to assume for strings in RIFF metadata \(eg.)Tj @@ -1406,7 +1406,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 9)Tj +( -- Image::ExifTool 11.25 -- 9)Tj /TT4 1 Tf 0 -1.6333 TD ( This option is ignored for specifically requested tags. Tags)Tj @@ -1561,7 +1561,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 10)Tj +( -- Image::ExifTool 11.25 -- 10)Tj /TT4 1 Tf 0 -1.6333 TD ( otherwise geotagging fails\). Default is 1800.)Tj @@ -1750,7 +1750,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 11)Tj +( -- Image::ExifTool 11.25 -- 11)Tj /TT4 1 Tf 0 -1.6333 TD ( Available languages are given by the Image::ExifTool::Lang)Tj @@ -1897,7 +1897,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 12)Tj +( -- Image::ExifTool 11.25 -- 12)Tj /TT4 1 Tf 0 -1.6333 TD ( it has no way to tell if XMP already exists later in the file)Tj @@ -2048,7 +2048,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 13)Tj +( -- Image::ExifTool 11.25 -- 13)Tj /TT4 1 Tf 0 -2.7333 TD ( StrictDate)Tj @@ -2201,7 +2201,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 14)Tj +( -- Image::ExifTool 11.25 -- 14)Tj /TT4 1 Tf 0 -1.6333 TD ( insensitive\).)Tj @@ -2384,7 +2384,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 15)Tj +( -- Image::ExifTool 11.25 -- 15)Tj /TT4 1 Tf 0 -1.6333 TD ( $success = $exifTool->ExtractInfo\('image.jpg', \\%options\);)Tj @@ -2553,7 +2553,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 16)Tj +( -- Image::ExifTool 11.25 -- 16)Tj /TT4 1 Tf 0 -1.6333 TD ( # add information to a source file, writing output to new file)Tj @@ -2708,7 +2708,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 17)Tj +( -- Image::ExifTool 11.25 -- 17)Tj /TT4 1 Tf 0 -1.6333 TD ( @tags = $exifTool->GetTagList\($info, 'Group0'\);)Tj @@ -2911,7 +2911,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 18)Tj +( -- Image::ExifTool 11.25 -- 18)Tj /TT4 1 Tf 0 -1.6333 TD ( 'Keywords' for example\) are handled specially. In scalar context, the)Tj @@ -3076,7 +3076,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 19)Tj +( -- Image::ExifTool 11.25 -- 19)Tj /TT4 1 Tf 0 -1.6333 TD ( to set the values of many tags before using "WriteInfo" to write the)Tj @@ -3211,7 +3211,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 20)Tj +( -- Image::ExifTool 11.25 -- 20)Tj /TT4 1 Tf 0 -2.7333 TD ( Inputs:)Tj @@ -3358,7 +3358,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 21)Tj +( -- Image::ExifTool 11.25 -- 21)Tj /TT4 1 Tf 0 -1.6333 TD ( not found otherwise.)Tj @@ -3569,7 +3569,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 22)Tj +( -- Image::ExifTool 11.25 -- 22)Tj /TT4 1 Tf 0 -1.6333 TD ( $rawVal = $exifTool->GetNewValue\($tag\);)Tj @@ -3742,7 +3742,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 23)Tj +( -- Image::ExifTool 11.25 -- 23)Tj /TT4 1 Tf 0 -1.6333 TD ( may be used in the tag name. A tag name of '*' is commonly used)Tj @@ -3889,7 +3889,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 24)Tj +( -- Image::ExifTool 11.25 -- 24)Tj /TT4 1 Tf 0 -1.6333 TD ( When simply copying all information between files of the same type,)Tj @@ -4140,7 +4140,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 25)Tj +( -- Image::ExifTool 11.25 -- 25)Tj /TT4 1 Tf 0 -1.6333 TD ( 3\) [optional] Tag to write: 'FileModifyDate' \(default\), or)Tj @@ -4345,7 +4345,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 26)Tj +( -- Image::ExifTool 11.25 -- 26)Tj /TT4 1 Tf 0 -2.7333 TD ( @groups = $exifTool->GetNewGroups\(\);)Tj @@ -4532,7 +4532,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 27)Tj +( -- Image::ExifTool 11.25 -- 27)Tj /TT4 1 Tf 0 -1.6333 TD ( specified, "GetGroup" returns the name of the group in family 0)Tj @@ -4693,7 +4693,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 28)Tj +( -- Image::ExifTool 11.25 -- 28)Tj /TT4 1 Tf 0 -2.7333 TD ( B)Tj @@ -5020,7 +5020,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 29)Tj +( -- Image::ExifTool 11.25 -- 29)Tj /TT4 1 Tf 0 -2.7333 TD ( @tagList = Image::ExifTool::GetWritableTags\($group\);)Tj @@ -5209,7 +5209,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 30)Tj +( -- Image::ExifTool 11.25 -- 30)Tj /TT4 1 Tf 0 -1.6333 TD ( GAudio, XMP-GImage, XMP-GPano, XMP-GSpherical, XMP-MP, XMP-MP1,)Tj @@ -5432,7 +5432,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 31)Tj +( -- Image::ExifTool 11.25 -- 31)Tj /TT4 1 Tf 0 -1.6333 TD ( unsupported files \(otherwise the return value for unsupported files)Tj @@ -5723,7 +5723,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 32)Tj +( -- Image::ExifTool 11.25 -- 32)Tj /TT4 1 Tf 0 -1.6333 TD ( Certain meta information formats allow coded character sets other than)Tj @@ -5926,7 +5926,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 33)Tj +( -- Image::ExifTool 11.25 -- 33)Tj /TT4 1 Tf 0 -1.6333 TD ( \(see the Extra Tags documentation\).)Tj @@ -6087,7 +6087,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 34)Tj +( -- Image::ExifTool 11.25 -- 34)Tj /TT4 1 Tf 0 -1.6333 TD ( from the specified character set and stored as UTF-8.)Tj @@ -6380,7 +6380,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- Image::ExifTool 11.24 -- 35)Tj +( -- Image::ExifTool 11.25 -- 35)Tj /TT4 1 Tf 0 -1.6333 TD ( in html/index.html of the Image::ExifTool distribution package for a)Tj @@ -6635,7 +6635,7 @@ BT 0.6 0 TD (G\(3pm\))Tj -27 -4.4 TD -(perl v5.18.2 2019-01-02 EXIFTOOL\(1\))Tj +(perl v5.18.2 2019-01-10 EXIFTOOL\(1\))Tj ET endstream endobj @@ -7063,8 +7063,8 @@ endobj endobj 118 0 obj << -/CreationDate (D:20190108083047-05'00') -/ModDate (D:20190108083047-05'00') +/CreationDate (D:20190115090530-05'00') +/ModDate (D:20190115090530-05'00') /Producer (Apple pstopdf) >> endobj @@ -7202,7 +7202,7 @@ trailer /Size 120 /Root 119 0 R /Info 118 0 R -/ID [<116356895a36d2307962c5b27b6c4856><116356895a36d2307962c5b27b6c4856>] +/ID [<f2ac6f85d3eb09eb987c7d3b14ddb652><f2ac6f85d3eb09eb987c7d3b14ddb652>] >> startxref 166737 diff --git a/html/Shift.pdf b/html/Shift.pdf index 390ae14e..65d243f6 100644 --- a/html/Shift.pdf +++ b/html/Shift.pdf @@ -482,7 +482,7 @@ BT 0.6 0 TD (l\(3pm\))Tj -12.6 -4.4 TD -(perl v5.18.2 2019-01-02 SHIFT\(1\))Tj +(perl v5.18.2 2019-01-10 SHIFT\(1\))Tj ET endstream endobj @@ -589,8 +589,8 @@ endobj endobj 16 0 obj << -/CreationDate (D:20190108083048-05'00') -/ModDate (D:20190108083048-05'00') +/CreationDate (D:20190115090531-05'00') +/ModDate (D:20190115090531-05'00') /Producer (Apple pstopdf) >> endobj @@ -626,7 +626,7 @@ trailer /Size 18 /Root 17 0 R /Info 16 0 R -/ID [<7e8ec759e935aa0e168191502c3fdff3><7e8ec759e935aa0e168191502c3fdff3>] +/ID [<2d8506e05daae8845efa2ee5837f89ea><2d8506e05daae8845efa2ee5837f89ea>] >> startxref 11680 diff --git a/html/TagNames/DNG.html b/html/TagNames/DNG.html index d3370dd4..5ecb8bfd 100644 --- a/html/TagNames/DNG.html +++ b/html/TagNames/DNG.html @@ -107,6 +107,7 @@ still proprietary) Adobe format.</p> <br>MakerNoteLeica7 <br>MakerNoteLeica8 <br>MakerNoteLeica9 + <br>MakerNoteLeica10 <br>MakerNotePanasonic <br>MakerNotePanasonic2 <br>MakerNotePanasonic3 @@ -139,7 +140,7 @@ still proprietary) Adobe format.</p> <br>MakerNoteUnknownText <br>MakerNoteUnknownBinary <br>MakerNoteUnknown</td> -<td class=c>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef</td> +<td class=c>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef</td> <td>--> <a href='Apple.html'>Apple Tags</a> <br>--> <a href='Nikon.html'>Nikon Tags</a> <br>--> <a href='Canon.html'>Canon Tags</a> @@ -195,6 +196,7 @@ still proprietary) Adobe format.</p> <br>--> <a href='Panasonic.html#Leica5'>Panasonic Leica5 Tags</a> <br>--> <a href='Panasonic.html#Leica9'>Panasonic Leica9 Tags</a> <br>--> <a href='Panasonic.html'>Panasonic Tags</a> + <br>--> <a href='Panasonic.html'>Panasonic Tags</a> <br>--> <a href='Panasonic.html#Type2'>Panasonic Type2 Tags</a> <br>--> <a href='Panasonic.html'>Panasonic Tags</a> <br>--> <a href='Pentax.html'>Pentax Tags</a> @@ -295,7 +297,7 @@ information.</p> <hr> (This document generated automatically by Image::ExifTool::BuildTagLookup) -<br><i>Last revised Sep 21, 2018</i> +<br><i>Last revised Jan 14, 2019</i> <p class=lf><a href='index.html'><-- ExifTool Tag Names</a></p> </body> </html> diff --git a/html/TagNames/EXIF.html b/html/TagNames/EXIF.html index 4cc5c383..4d34c4d3 100644 --- a/html/TagNames/EXIF.html +++ b/html/TagNames/EXIF.html @@ -1866,6 +1866,7 @@ hours, 2. If present, the time zone offset of ModifyDate)</span></span></td></tr <br>MakerNoteLeica7 <br>MakerNoteLeica8 <br>MakerNoteLeica9 + <br>MakerNoteLeica10 <br>MakerNotePanasonic <br>MakerNotePanasonic2 <br>MakerNotePanasonic3 @@ -1898,8 +1899,8 @@ hours, 2. If present, the time zone offset of ModifyDate)</span></span></td></tr <br>MakerNoteUnknownText <br>MakerNoteUnknownBinary <br><u>MakerNoteUnknown</u></td> -<td class=c>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef</td> -<td class=c>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD</td> +<td class=c>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef</td> +<td class=c>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD</td> <td>--> <a href='Apple.html'>Apple Tags</a> <br>--> <a href='Nikon.html'>Nikon Tags</a> <br>--> <a href='Canon.html'>Canon Tags</a> @@ -1955,6 +1956,7 @@ hours, 2. If present, the time zone offset of ModifyDate)</span></span></td></tr <br>--> <a href='Panasonic.html#Leica5'>Panasonic Leica5 Tags</a> <br>--> <a href='Panasonic.html#Leica9'>Panasonic Leica9 Tags</a> <br>--> <a href='Panasonic.html'>Panasonic Tags</a> + <br>--> <a href='Panasonic.html'>Panasonic Tags</a> <br>--> <a href='Panasonic.html#Type2'>Panasonic Type2 Tags</a> <br>--> <a href='Panasonic.html'>Panasonic Tags</a> <br>--> <a href='Pentax.html'>Pentax Tags</a> @@ -3560,7 +3562,7 @@ these unless they already exist in the file)</span></span></td></tr> <hr> (This document generated automatically by Image::ExifTool::BuildTagLookup) -<br><i>Last revised Jan 8, 2019</i> +<br><i>Last revised Jan 14, 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 9d8e45e3..2a8ddfc3 100644 --- a/html/TagNames/Minolta.html +++ b/html/TagNames/Minolta.html @@ -645,38 +645,39 @@ adapter is used.</p> </tr><tr><td>65535.63</td><td>= Sigma 16mm F1.4 DC DN | C</td> </tr><tr><td>65535.64</td><td>= Sigma 105mm F1.4 DG HSM | A</td> </tr><tr><td>65535.65</td><td>= Sigma 56mm F1.4 DC DN | C</td> -</tr><tr><td>65535.66</td><td>= Sigma 70mm F2.8 DG MACRO | A</td> -</tr><tr><td>65535.67</td><td>= Tamron 18-200mm F3.5-6.3 Di III VC</td> -</tr><tr><td>65535.68</td><td>= Tamron 28-75mm F2.8 Di III RXD</td> -</tr><tr><td>65535.69</td><td>= Tokina Firin 20mm F2 FE MF</td> -</tr><tr><td>65535.70</td><td>= Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III</td> -</tr><tr><td>65535.71</td><td>= Voigtlander HELIAR-HYPER WIDE 10mm F5.6</td> -</tr><tr><td>65535.72</td><td>= Voigtlander ULTRA WIDE-HELIAR 12mm F5.6 III</td> -</tr><tr><td>65535.73</td><td>= Voigtlander MACRO APO-LANTHAR 65mm F2 Aspherical</td> -</tr><tr><td>65535.74</td><td>= Voigtlander NOKTON 40mm F1.2 Aspherical</td> -</tr><tr><td>65535.75</td><td>= Voigtlander NOKTON classic 35mm F1.4</td> -</tr><tr><td>65535.76</td><td>= Voigtlander MACRO APO-LANTHAR 110mm F2.5</td> -</tr><tr><td>65535.77</td><td>= Voigtlander COLOR-SKOPAR 21mm F3.5 Aspherical</td> -</tr><tr><td>65535.78</td><td>= Zeiss Touit 12mm F2.8</td> -</tr><tr><td>65535.79</td><td>= Zeiss Touit 32mm F1.8</td> -</tr><tr><td>65535.80</td><td>= Zeiss Touit 50mm F2.8 Macro</td> -</tr><tr><td>65535.81</td><td>= Zeiss Batis 25mm F2</td> -</tr><tr><td>65535.82</td><td>= Zeiss Batis 85mm F1.8</td> -</tr><tr><td>65535.83</td><td>= Zeiss Batis 18mm F2.8</td> -</tr><tr><td>65535.84</td><td>= Zeiss Batis 135mm F2.8</td> -</tr><tr><td>65535.85</td><td>= Zeiss Batis 40mm F2 CF</td> -</tr><tr><td>65535.86</td><td>= Zeiss Loxia 50mm F2</td> -</tr><tr><td>65535.87</td><td>= Zeiss Loxia 35mm F2</td> -</tr><tr><td>65535.88</td><td>= Zeiss Loxia 21mm F2.8</td> -</tr><tr><td>65535.89</td><td>= Zeiss Loxia 85mm F2.4</td> -</tr><tr><td>65535.90</td><td>= Zeiss Loxia 25mm F2.4</td> -</tr><tr><td>65535.91</td><td>= Arax MC 35mm F2.8 Tilt+Shift</td> -</tr><tr><td>65535.92</td><td>= Arax MC 80mm F2.8 Tilt+Shift</td> -</tr><tr><td>65535.93</td><td>= Zenitar MF 16mm F2.8 Fisheye M42</td> -</tr><tr><td>65535.94</td><td>= Samyang 500mm Mirror F8.0</td> -</tr><tr><td>65535.95</td><td>= Pentacon Auto 135mm F2.8</td> -</tr><tr><td>65535.96</td><td>= Pentacon Auto 29mm F2.8</td> -</tr><tr><td>65535.97</td><td>= Helios 44-2 58mm F2.0</td> +</tr><tr><td>65535.66</td><td>= Sigma 70-200mm F2.8 DG OS HSM | S</td> +</tr><tr><td>65535.67</td><td>= Sigma 70mm F2.8 DG MACRO | A</td> +</tr><tr><td>65535.68</td><td>= Tamron 18-200mm F3.5-6.3 Di III VC</td> +</tr><tr><td>65535.69</td><td>= Tamron 28-75mm F2.8 Di III RXD</td> +</tr><tr><td>65535.70</td><td>= Tokina Firin 20mm F2 FE MF</td> +</tr><tr><td>65535.71</td><td>= Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III</td> +</tr><tr><td>65535.72</td><td>= Voigtlander HELIAR-HYPER WIDE 10mm F5.6</td> +</tr><tr><td>65535.73</td><td>= Voigtlander ULTRA WIDE-HELIAR 12mm F5.6 III</td> +</tr><tr><td>65535.74</td><td>= Voigtlander MACRO APO-LANTHAR 65mm F2 Aspherical</td> +</tr><tr><td>65535.75</td><td>= Voigtlander NOKTON 40mm F1.2 Aspherical</td> +</tr><tr><td>65535.76</td><td>= Voigtlander NOKTON classic 35mm F1.4</td> +</tr><tr><td>65535.77</td><td>= Voigtlander MACRO APO-LANTHAR 110mm F2.5</td> +</tr><tr><td>65535.78</td><td>= Voigtlander COLOR-SKOPAR 21mm F3.5 Aspherical</td> +</tr><tr><td>65535.79</td><td>= Zeiss Touit 12mm F2.8</td> +</tr><tr><td>65535.80</td><td>= Zeiss Touit 32mm F1.8</td> +</tr><tr><td>65535.81</td><td>= Zeiss Touit 50mm F2.8 Macro</td> +</tr><tr><td>65535.82</td><td>= Zeiss Batis 25mm F2</td> +</tr><tr><td>65535.83</td><td>= Zeiss Batis 85mm F1.8</td> +</tr><tr><td>65535.84</td><td>= Zeiss Batis 18mm F2.8</td> +</tr><tr><td>65535.85</td><td>= Zeiss Batis 135mm F2.8</td> +</tr><tr><td>65535.86</td><td>= Zeiss Batis 40mm F2 CF</td> +</tr><tr><td>65535.87</td><td>= Zeiss Loxia 50mm F2</td> +</tr><tr><td>65535.88</td><td>= Zeiss Loxia 35mm F2</td> +</tr><tr><td>65535.89</td><td>= Zeiss Loxia 21mm F2.8</td> +</tr><tr><td>65535.90</td><td>= Zeiss Loxia 85mm F2.4</td> +</tr><tr><td>65535.91</td><td>= Zeiss Loxia 25mm F2.4</td> +</tr><tr><td>65535.92</td><td>= Arax MC 35mm F2.8 Tilt+Shift</td> +</tr><tr><td>65535.93</td><td>= Arax MC 80mm F2.8 Tilt+Shift</td> +</tr><tr><td>65535.94</td><td>= Zenitar MF 16mm F2.8 Fisheye M42</td> +</tr><tr><td>65535.95</td><td>= Samyang 500mm Mirror F8.0</td> +</tr><tr><td>65535.96</td><td>= Pentacon Auto 135mm F2.8</td> +</tr><tr><td>65535.97</td><td>= Pentacon Auto 29mm F2.8</td> +</tr><tr><td>65535.98</td><td>= Helios 44-2 58mm F2.0</td> </tr></table></td></tr></table></blockquote> <h2><a name='CameraSettings'>Minolta CameraSettings Tags</a></h2> @@ -2676,7 +2677,7 @@ DiMAGE X and Xt.</p> <hr> (This document generated automatically by Image::ExifTool::BuildTagLookup) -<br><i>Last revised Dec 12, 2018</i> +<br><i>Last revised Jan 14, 2019</i> <p class=lf><a href='index.html'><-- ExifTool Tag Names</a></p> </body> </html> diff --git a/html/TagNames/Nikon.html b/html/TagNames/Nikon.html index a5b390d5..9b2777e6 100644 --- a/html/TagNames/Nikon.html +++ b/html/TagNames/Nikon.html @@ -296,7 +296,9 @@ causes the other information to be re-encrypted with the new key)</span></span>< <td><span class=s>Bit 0 = MF <br>Bit 1 = D <br>Bit 2 = G - <br>Bit 3 = VR</span></td></tr> + <br>Bit 3 = VR + <br>Bit 4 = 1 + <br>Bit 6 = E</span></td></tr> <tr class=b> <td title='0x0084 = 132'>0x0084</td> <td>Lens</td> @@ -4733,9 +4735,12 @@ D5200, D7000.</p> <br>131 = Face Priority (41 points) <br>192 = Pinpoint <br>193 = Single + <br>194 = Dynamic <br>195 = Wide (S) <br>196 = Wide (L) - <br>197 = Auto</td></tr></table> + <br>197 = Auto + <br>198 = Auto (198) + <br>199 = Auto (focus lock)</td></tr></table> </td></tr> <tr class=b> <td class=r title='6 = 0x6'>6</td> @@ -5167,7 +5172,10 @@ D500 and D850)</span></span><table class=cols><tr> <br>151 = G1 <br>152 = H1 <br>153 = I1</td></tr></table> -<span class=s><span class=n>(future models?...)</span> +<span class=s><span class=n>(Nikon models with 493-point AF -- 17 rows (A-Q) and 29 columns (1-29), I15 +at the center)</span> + <br>0 = (none) + <br><span class=n>(future models?...)</span> <br>0 = (none) <br>1 = Center</span></td></tr> <tr class=b> @@ -5179,8 +5187,9 @@ D500 and D850)</span></span><table class=cols><tr> <br>AFPointsUsed <br>AFPointsUsed <br>AFPointsUsed + <br>AFPointsUsed <br>AFPointsUsed</td> -<td class=c>undef[7]<br>undef[2]<br>undef[5]<br>undef[17]<br>undef[21]<br>undef[29]<br>undef[20]<br>undef[7]</td> +<td class=c>undef[7]<br>undef[2]<br>undef[5]<br>undef[17]<br>undef[21]<br>undef[29]<br>undef[20]<br>undef[62]<br>undef[7]</td> <td><span class=s><span class=n>(models with 51-point AF -- 5 rows: A1-9, B1-11, C1-11, D1-11, E1-9. Center point is C6)</span> <br><span class=n>(models with 11-point AF)</span></span><table class=cols><tr> @@ -5207,7 +5216,9 @@ point is F8)</span> <br><span class=n>(models with 171-point AF -- 9 rows (B-J) and 19 columns (2-20). Center point is F10)</span> <br><span class=n>(models with 153-point AF -- 9 rows (A-I) and 17 columns (1-17). Center -point is E9)</span></span></td></tr> +point is E9)</span> + <br><span class=n>(models with 493-point AF -- 17 rows (A-Q) and 29 columns (1-29). Center +point is I15)</span></span></td></tr> <tr> <td class=r title='16 = 0x10'>16</td> <td>AFImageWidth</td> @@ -5245,17 +5256,35 @@ point is E9)</span></span></td></tr> <td><span class=s>0 = No <br>1 = Yes</span></td></tr> <tr class=b> -<td class=r title='47 = 0x2f'>47</td> -<td>AFAreaColumn</td> -<td class=c>int8u</td> -<td><span class=s><span class=n>(column number of selected AF area in contrast-detect mode for models such as -the Z-7. Range is 1-30)</span></span></td></tr> +<td class=r title='42 = 0x2a'>42</td> +<td>AFImageWidth</td> +<td class=c>int16u</td> +<td> </td></tr> <tr> -<td class=r title='49 = 0x31'>49</td> -<td>AFAreaRow</td> -<td class=c>int8u</td> -<td><span class=s><span class=n>(row number of selected AF area in contrast-detect mode for models such as -the Z-7. Range is 1-19)</span></span></td></tr> +<td class=r title='44 = 0x2c'>44</td> +<td>AFImageHeight</td> +<td class=c>int16u</td> +<td> </td></tr> +<tr class=b> +<td class=r title='46 = 0x2e'>46</td> +<td>AFAreaXPosition</td> +<td class=c>int16u</td> +<td> </td></tr> +<tr> +<td class=r title='48 = 0x30'>48</td> +<td>AFAreaYPosition</td> +<td class=c>int16u</td> +<td> </td></tr> +<tr class=b> +<td class=r title='50 = 0x32'>50</td> +<td>AFAreaWidth</td> +<td class=c>int16u</td> +<td> </td></tr> +<tr> +<td class=r title='52 = 0x34'>52</td> +<td>AFAreaHeight</td> +<td class=c>int16u</td> +<td> </td></tr> <tr class=b> <td class=r title='68 = 0x44'>68</td> <td>PrimaryAFPoint</td> @@ -6938,6 +6967,7 @@ ExifTool to choose in these cases (see the </tr><tr><td>'A1 40 18 37 2C 34 A3 06'</td><td>= AF-S DX Nikkor 10-24mm f/3.5-4.5G ED</td> </tr><tr><td>'A1 41 19 31 2C 2C 4B 06'</td><td>= Sigma 10-20mm F3.5 EX DC HSM</td> </tr><tr><td>'A1 54 55 55 0C 0C BC 06'</td><td>= AF-S Nikkor 58mm f/1.4G</td> +</tr><tr><td>'A2 38 5C 8E 34 40 CD 86'</td><td>= AF-P DX Nikkor 70-300mm f/4.5-6.3G VR</td> </tr><tr><td>'A2 40 2D 53 2C 3C BD 0E'</td><td>= AF-S DX Nikkor 18-55mm f/3.5-5.6G VR II</td> </tr><tr><td>'A2 48 5C 80 24 24 A4 0E'</td><td>= AF-S Nikkor 70-200mm f/2.8G ED VR II</td> </tr><tr><td>'A3 38 5C 8E 34 40 CE 0E'</td><td>= AF-P DX Nikkor 70-300mm f/4.5-6.3G ED</td> @@ -7078,7 +7108,7 @@ ExifTool to choose in these cases (see the <hr> (This document generated automatically by Image::ExifTool::BuildTagLookup) -<br><i>Last revised Jan 8, 2019</i> +<br><i>Last revised Jan 14, 2019</i> <p class=lf><a href='index.html'><-- ExifTool Tag Names</a></p> </body> </html> diff --git a/html/TagNames/Shortcuts.html b/html/TagNames/Shortcuts.html index 4e97c3ac..2b92f9b3 100644 --- a/html/TagNames/Shortcuts.html +++ b/html/TagNames/Shortcuts.html @@ -192,6 +192,7 @@ memory limitations are a problem)</span></span></td></tr> <br>MakerNoteLeica7 <br>MakerNoteLeica8 <br>MakerNoteLeica9 + <br>MakerNoteLeica10 <br>MakerNotePanasonic <br>MakerNotePanasonic2 <br>MakerNotePanasonic3 @@ -277,7 +278,7 @@ as a shortcut to use when rebuilding JPEG EXIF from scratch. See <hr> (This document generated automatically by Image::ExifTool::BuildTagLookup) -<br><i>Last revised May 16, 2018</i> +<br><i>Last revised Jan 14, 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 6bfa704e..a3d6c5c0 100644 --- a/html/TagNames/Sony.html +++ b/html/TagNames/Sony.html @@ -1683,38 +1683,39 @@ adapter is used.</p> </tr><tr><td>6553.63</td><td>= Sigma 16mm F1.4 DC DN | C</td> </tr><tr><td>6553.64</td><td>= Sigma 105mm F1.4 DG HSM | A</td> </tr><tr><td>6553.65</td><td>= Sigma 56mm F1.4 DC DN | C</td> -</tr><tr><td>6553.66</td><td>= Sigma 70mm F2.8 DG MACRO | A</td> -</tr><tr><td>6553.67</td><td>= Tamron 18-200mm F3.5-6.3 Di III VC</td> -</tr><tr><td>6553.68</td><td>= Tamron 28-75mm F2.8 Di III RXD</td> -</tr><tr><td>6553.69</td><td>= Tokina Firin 20mm F2 FE MF</td> -</tr><tr><td>6553.70</td><td>= Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III</td> -</tr><tr><td>6553.71</td><td>= Voigtlander HELIAR-HYPER WIDE 10mm F5.6</td> -</tr><tr><td>6553.72</td><td>= Voigtlander ULTRA WIDE-HELIAR 12mm F5.6 III</td> -</tr><tr><td>6553.73</td><td>= Voigtlander MACRO APO-LANTHAR 65mm F2 Aspherical</td> -</tr><tr><td>6553.74</td><td>= Voigtlander NOKTON 40mm F1.2 Aspherical</td> -</tr><tr><td>6553.75</td><td>= Voigtlander NOKTON classic 35mm F1.4</td> -</tr><tr><td>6553.76</td><td>= Voigtlander MACRO APO-LANTHAR 110mm F2.5</td> -</tr><tr><td>6553.77</td><td>= Voigtlander COLOR-SKOPAR 21mm F3.5 Aspherical</td> -</tr><tr><td>6553.78</td><td>= Zeiss Touit 12mm F2.8</td> -</tr><tr><td>6553.79</td><td>= Zeiss Touit 32mm F1.8</td> -</tr><tr><td>6553.80</td><td>= Zeiss Touit 50mm F2.8 Macro</td> -</tr><tr><td>6553.81</td><td>= Zeiss Batis 25mm F2</td> -</tr><tr><td>6553.82</td><td>= Zeiss Batis 85mm F1.8</td> -</tr><tr><td>6553.83</td><td>= Zeiss Batis 18mm F2.8</td> -</tr><tr><td>6553.84</td><td>= Zeiss Batis 135mm F2.8</td> -</tr><tr><td>6553.85</td><td>= Zeiss Batis 40mm F2 CF</td> -</tr><tr><td>6553.86</td><td>= Zeiss Loxia 50mm F2</td> -</tr><tr><td>6553.87</td><td>= Zeiss Loxia 35mm F2</td> -</tr><tr><td>6553.88</td><td>= Zeiss Loxia 21mm F2.8</td> -</tr><tr><td>6553.89</td><td>= Zeiss Loxia 85mm F2.4</td> -</tr><tr><td>6553.90</td><td>= Zeiss Loxia 25mm F2.4</td> -</tr><tr><td>6553.91</td><td>= Arax MC 35mm F2.8 Tilt+Shift</td> -</tr><tr><td>6553.92</td><td>= Arax MC 80mm F2.8 Tilt+Shift</td> -</tr><tr><td>6553.93</td><td>= Zenitar MF 16mm F2.8 Fisheye M42</td> -</tr><tr><td>6553.94</td><td>= Samyang 500mm Mirror F8.0</td> -</tr><tr><td>6553.95</td><td>= Pentacon Auto 135mm F2.8</td> -</tr><tr><td>6553.96</td><td>= Pentacon Auto 29mm F2.8</td> -</tr><tr><td>6553.97</td><td>= Helios 44-2 58mm F2.0</td> +</tr><tr><td>6553.66</td><td>= Sigma 70-200mm F2.8 DG OS HSM | S</td> +</tr><tr><td>6553.67</td><td>= Sigma 70mm F2.8 DG MACRO | A</td> +</tr><tr><td>6553.68</td><td>= Tamron 18-200mm F3.5-6.3 Di III VC</td> +</tr><tr><td>6553.69</td><td>= Tamron 28-75mm F2.8 Di III RXD</td> +</tr><tr><td>6553.70</td><td>= Tokina Firin 20mm F2 FE MF</td> +</tr><tr><td>6553.71</td><td>= Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III</td> +</tr><tr><td>6553.72</td><td>= Voigtlander HELIAR-HYPER WIDE 10mm F5.6</td> +</tr><tr><td>6553.73</td><td>= Voigtlander ULTRA WIDE-HELIAR 12mm F5.6 III</td> +</tr><tr><td>6553.74</td><td>= Voigtlander MACRO APO-LANTHAR 65mm F2 Aspherical</td> +</tr><tr><td>6553.75</td><td>= Voigtlander NOKTON 40mm F1.2 Aspherical</td> +</tr><tr><td>6553.76</td><td>= Voigtlander NOKTON classic 35mm F1.4</td> +</tr><tr><td>6553.77</td><td>= Voigtlander MACRO APO-LANTHAR 110mm F2.5</td> +</tr><tr><td>6553.78</td><td>= Voigtlander COLOR-SKOPAR 21mm F3.5 Aspherical</td> +</tr><tr><td>6553.79</td><td>= Zeiss Touit 12mm F2.8</td> +</tr><tr><td>6553.80</td><td>= Zeiss Touit 32mm F1.8</td> +</tr><tr><td>6553.81</td><td>= Zeiss Touit 50mm F2.8 Macro</td> +</tr><tr><td>6553.82</td><td>= Zeiss Batis 25mm F2</td> +</tr><tr><td>6553.83</td><td>= Zeiss Batis 85mm F1.8</td> +</tr><tr><td>6553.84</td><td>= Zeiss Batis 18mm F2.8</td> +</tr><tr><td>6553.85</td><td>= Zeiss Batis 135mm F2.8</td> +</tr><tr><td>6553.86</td><td>= Zeiss Batis 40mm F2 CF</td> +</tr><tr><td>6553.87</td><td>= Zeiss Loxia 50mm F2</td> +</tr><tr><td>6553.88</td><td>= Zeiss Loxia 35mm F2</td> +</tr><tr><td>6553.89</td><td>= Zeiss Loxia 21mm F2.8</td> +</tr><tr><td>6553.90</td><td>= Zeiss Loxia 85mm F2.4</td> +</tr><tr><td>6553.91</td><td>= Zeiss Loxia 25mm F2.4</td> +</tr><tr><td>6553.92</td><td>= Arax MC 35mm F2.8 Tilt+Shift</td> +</tr><tr><td>6553.93</td><td>= Arax MC 80mm F2.8 Tilt+Shift</td> +</tr><tr><td>6553.94</td><td>= Zenitar MF 16mm F2.8 Fisheye M42</td> +</tr><tr><td>6553.95</td><td>= Samyang 500mm Mirror F8.0</td> +</tr><tr><td>6553.96</td><td>= Pentacon Auto 135mm F2.8</td> +</tr><tr><td>6553.97</td><td>= Pentacon Auto 29mm F2.8</td> +</tr><tr><td>6553.98</td><td>= Helios 44-2 58mm F2.0</td> </tr><tr><td>18688</td><td>= Sigma MC-11 SA-E Mount Converter with not-supported Sigma lens</td> </tr><tr><td>25501</td><td>= Minolta AF 50mm F1.7</td> </tr><tr><td>25511</td><td>= Minolta AF 35-70mm F4 or Other Lens</td> @@ -1907,38 +1908,39 @@ adapter is used.</p> </tr><tr><td>65535.63</td><td>= Sigma 16mm F1.4 DC DN | C</td> </tr><tr><td>65535.64</td><td>= Sigma 105mm F1.4 DG HSM | A</td> </tr><tr><td>65535.65</td><td>= Sigma 56mm F1.4 DC DN | C</td> -</tr><tr><td>65535.66</td><td>= Sigma 70mm F2.8 DG MACRO | A</td> -</tr><tr><td>65535.67</td><td>= Tamron 18-200mm F3.5-6.3 Di III VC</td> -</tr><tr><td>65535.68</td><td>= Tamron 28-75mm F2.8 Di III RXD</td> -</tr><tr><td>65535.69</td><td>= Tokina Firin 20mm F2 FE MF</td> -</tr><tr><td>65535.70</td><td>= Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III</td> -</tr><tr><td>65535.71</td><td>= Voigtlander HELIAR-HYPER WIDE 10mm F5.6</td> -</tr><tr><td>65535.72</td><td>= Voigtlander ULTRA WIDE-HELIAR 12mm F5.6 III</td> -</tr><tr><td>65535.73</td><td>= Voigtlander MACRO APO-LANTHAR 65mm F2 Aspherical</td> -</tr><tr><td>65535.74</td><td>= Voigtlander NOKTON 40mm F1.2 Aspherical</td> -</tr><tr><td>65535.75</td><td>= Voigtlander NOKTON classic 35mm F1.4</td> -</tr><tr><td>65535.76</td><td>= Voigtlander MACRO APO-LANTHAR 110mm F2.5</td> -</tr><tr><td>65535.77</td><td>= Voigtlander COLOR-SKOPAR 21mm F3.5 Aspherical</td> -</tr><tr><td>65535.78</td><td>= Zeiss Touit 12mm F2.8</td> -</tr><tr><td>65535.79</td><td>= Zeiss Touit 32mm F1.8</td> -</tr><tr><td>65535.80</td><td>= Zeiss Touit 50mm F2.8 Macro</td> -</tr><tr><td>65535.81</td><td>= Zeiss Batis 25mm F2</td> -</tr><tr><td>65535.82</td><td>= Zeiss Batis 85mm F1.8</td> -</tr><tr><td>65535.83</td><td>= Zeiss Batis 18mm F2.8</td> -</tr><tr><td>65535.84</td><td>= Zeiss Batis 135mm F2.8</td> -</tr><tr><td>65535.85</td><td>= Zeiss Batis 40mm F2 CF</td> -</tr><tr><td>65535.86</td><td>= Zeiss Loxia 50mm F2</td> -</tr><tr><td>65535.87</td><td>= Zeiss Loxia 35mm F2</td> -</tr><tr><td>65535.88</td><td>= Zeiss Loxia 21mm F2.8</td> -</tr><tr><td>65535.89</td><td>= Zeiss Loxia 85mm F2.4</td> -</tr><tr><td>65535.90</td><td>= Zeiss Loxia 25mm F2.4</td> -</tr><tr><td>65535.91</td><td>= Arax MC 35mm F2.8 Tilt+Shift</td> -</tr><tr><td>65535.92</td><td>= Arax MC 80mm F2.8 Tilt+Shift</td> -</tr><tr><td>65535.93</td><td>= Zenitar MF 16mm F2.8 Fisheye M42</td> -</tr><tr><td>65535.94</td><td>= Samyang 500mm Mirror F8.0</td> -</tr><tr><td>65535.95</td><td>= Pentacon Auto 135mm F2.8</td> -</tr><tr><td>65535.96</td><td>= Pentacon Auto 29mm F2.8</td> -</tr><tr><td>65535.97</td><td>= Helios 44-2 58mm F2.0</td> +</tr><tr><td>65535.66</td><td>= Sigma 70-200mm F2.8 DG OS HSM | S</td> +</tr><tr><td>65535.67</td><td>= Sigma 70mm F2.8 DG MACRO | A</td> +</tr><tr><td>65535.68</td><td>= Tamron 18-200mm F3.5-6.3 Di III VC</td> +</tr><tr><td>65535.69</td><td>= Tamron 28-75mm F2.8 Di III RXD</td> +</tr><tr><td>65535.70</td><td>= Tokina Firin 20mm F2 FE MF</td> +</tr><tr><td>65535.71</td><td>= Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III</td> +</tr><tr><td>65535.72</td><td>= Voigtlander HELIAR-HYPER WIDE 10mm F5.6</td> +</tr><tr><td>65535.73</td><td>= Voigtlander ULTRA WIDE-HELIAR 12mm F5.6 III</td> +</tr><tr><td>65535.74</td><td>= Voigtlander MACRO APO-LANTHAR 65mm F2 Aspherical</td> +</tr><tr><td>65535.75</td><td>= Voigtlander NOKTON 40mm F1.2 Aspherical</td> +</tr><tr><td>65535.76</td><td>= Voigtlander NOKTON classic 35mm F1.4</td> +</tr><tr><td>65535.77</td><td>= Voigtlander MACRO APO-LANTHAR 110mm F2.5</td> +</tr><tr><td>65535.78</td><td>= Voigtlander COLOR-SKOPAR 21mm F3.5 Aspherical</td> +</tr><tr><td>65535.79</td><td>= Zeiss Touit 12mm F2.8</td> +</tr><tr><td>65535.80</td><td>= Zeiss Touit 32mm F1.8</td> +</tr><tr><td>65535.81</td><td>= Zeiss Touit 50mm F2.8 Macro</td> +</tr><tr><td>65535.82</td><td>= Zeiss Batis 25mm F2</td> +</tr><tr><td>65535.83</td><td>= Zeiss Batis 85mm F1.8</td> +</tr><tr><td>65535.84</td><td>= Zeiss Batis 18mm F2.8</td> +</tr><tr><td>65535.85</td><td>= Zeiss Batis 135mm F2.8</td> +</tr><tr><td>65535.86</td><td>= Zeiss Batis 40mm F2 CF</td> +</tr><tr><td>65535.87</td><td>= Zeiss Loxia 50mm F2</td> +</tr><tr><td>65535.88</td><td>= Zeiss Loxia 35mm F2</td> +</tr><tr><td>65535.89</td><td>= Zeiss Loxia 21mm F2.8</td> +</tr><tr><td>65535.90</td><td>= Zeiss Loxia 85mm F2.4</td> +</tr><tr><td>65535.91</td><td>= Zeiss Loxia 25mm F2.4</td> +</tr><tr><td>65535.92</td><td>= Arax MC 35mm F2.8 Tilt+Shift</td> +</tr><tr><td>65535.93</td><td>= Arax MC 80mm F2.8 Tilt+Shift</td> +</tr><tr><td>65535.94</td><td>= Zenitar MF 16mm F2.8 Fisheye M42</td> +</tr><tr><td>65535.95</td><td>= Samyang 500mm Mirror F8.0</td> +</tr><tr><td>65535.96</td><td>= Pentacon Auto 135mm F2.8</td> +</tr><tr><td>65535.97</td><td>= Pentacon Auto 29mm F2.8</td> +</tr><tr><td>65535.98</td><td>= Helios 44-2 58mm F2.0</td> </tr></table></td></tr></table></blockquote> <h2><a name='CameraInfo'>Sony CameraInfo Tags</a></h2> @@ -4959,13 +4961,13 @@ multi-frame noise reduction)</span></span></td></tr> </tr><tr><td>49236</td><td>= Zeiss Loxia 25mm F2.4</td> </tr><tr><td>49457</td><td>= Tamron 28-75mm F2.8 Di III RXD</td> </tr><tr><td>50480</td><td>= Sigma 30mm F1.4 DC DN | C</td> -</tr><tr><td>50481</td><td>= Sigma 50mm F1.4 DG HSM | A + MC-11</td> +</tr><tr><td>50481</td><td>= Sigma 50mm F1.4 DG HSM | A</td> </tr><tr><td>50482</td><td>= Sigma 18-300mm F3.5-6.3 DC MACRO OS HSM | C + MC-11</td> </tr><tr><td>50483</td><td>= Sigma 18-35mm F1.8 DC HSM | A + MC-11</td> </tr><tr><td>50484</td><td>= Sigma 24-35mm F2 DG HSM | A + MC-11</td> </tr><tr><td>50486</td><td>= Sigma 150-600mm F5-6.3 DG OS HSM | C + MC-11</td> </tr><tr><td>50487</td><td>= Sigma 20mm F1.4 DG HSM | A + MC-11</td> -</tr><tr><td>50488</td><td>= Sigma 35mm F1.4 DG HSM | A + MC-11</td> +</tr><tr><td>50488</td><td>= Sigma 35mm F1.4 DG HSM | A</td> </tr><tr><td>50489</td><td>= Sigma 150-600mm F5-6.3 DG OS HSM | S + MC-11</td> </tr><tr><td>50490</td><td>= Sigma 120-300mm F2.8 DG OS HSM | S + MC-11</td> </tr><tr><td>50492</td><td>= Sigma 24-105mm F4 DG OS HSM | A + MC-11</td> @@ -4976,6 +4978,7 @@ multi-frame noise reduction)</span></span></td></tr> </tr><tr><td>50503</td><td>= Sigma 16mm F1.4 DC DN | C</td> </tr><tr><td>50507</td><td>= Sigma 105mm F1.4 DG HSM | A</td> </tr><tr><td>50508</td><td>= Sigma 56mm F1.4 DC DN | C</td> +</tr><tr><td>50512</td><td>= Sigma 70-200mm F2.8 DG OS HSM | S</td> </tr><tr><td>50513</td><td>= Sigma 70mm F2.8 DG MACRO | A</td> </tr><tr><td>50992</td><td>= Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III</td> </tr><tr><td>50993</td><td>= Voigtlander HELIAR-HYPER WIDE 10mm F5.6</td> @@ -7882,7 +7885,7 @@ substitution cipher, but the deciphered values are listed below.</p> </td></tr> <tr class=b> <td title='0x0032 = 50'>0x0032</td> -<td>ImageCount</td> +<td>ShutterCount</td> <td class=c>int32u</td> <td><span class=s><span class=n>(total number of image exposures made by the camera, modulo 65536 for some models)</span></span></td></tr> @@ -7903,7 +7906,7 @@ models)</span></span></td></tr> <td>--> <a href='Sony.html#ReleaseMode2'>Sony ReleaseMode2 Values</a></td></tr> <tr class=b> <td title='0x004c = 76'>0x004c</td> -<td>ImageCount2</td> +<td>ShutterCount2</td> <td class=c>int32u</td> <td> </td></tr> <tr> @@ -7969,17 +7972,17 @@ models)</span></span></td></tr> <td> </td></tr> <tr class=b> <td title='0x01a0 = 416'>0x01a0</td> -<td>ImageCount3</td> +<td>ShutterCount3</td> <td class=c>int32u</td> <td> </td></tr> <tr> <td title='0x01aa = 426'>0x01aa</td> -<td>ImageCount3</td> +<td>ShutterCount3</td> <td class=c>int32u</td> <td> </td></tr> <tr class=b> <td title='0x01bd = 445'>0x01bd</td> -<td>ImageCount3</td> +<td>ShutterCount3</td> <td class=c>int32u</td> <td> </td></tr> </table></td></tr></table></blockquote> @@ -8002,6 +8005,12 @@ models)</span></span></td></tr> <td class=c>int8u</td> <td> </td></tr> <tr> +<td title='0x002c = 44'>0x002c</td> +<td>Shutter</td> +<td class=c>int8u</td> +<td><span class=s>0 = Silent / Electronic + <br>56 = Mechanical</span></td></tr> +<tr class=b> <td title='0x0039 = 57'>0x0039</td> <td>FlashStatus</td> <td class=c>int8u</td> @@ -8014,108 +8023,108 @@ models)</span></span></td></tr> <br>128 = External Flash present <br>129 = External Flash Fired</td></tr></table> </td></tr> -<tr class=b> +<tr> <td title='0x003a = 58'>0x003a</td> -<td>ImageCount</td> +<td>ShutterCount</td> <td class=c>int32u</td> <td><span class=s><span class=n>(total number of image exposures made by the camera)</span></span></td></tr> -<tr> +<tr class=b> <td title='0x0046 = 70'>0x0046</td> <td>SonyExposureTime</td> <td class=c>int16u</td> <td> </td></tr> -<tr class=b> +<tr> <td title='0x0048 = 72'>0x0048</td> <td>SonyFNumber</td> <td class=c>int16u</td> <td> </td></tr> -<tr> +<tr class=b> <td title='0x004b = 75'>0x004b</td> <td>ReleaseMode2</td> <td class=c>int8u</td> <td>--> <a href='Sony.html#ReleaseMode2'>Sony ReleaseMode2 Values</a></td></tr> -<tr class=b> +<tr> <td title='0x0052 = 82'>0x0052</td> -<td>ImageCount2</td> +<td>ShutterCount2</td> <td class=c title=' ~ = Writable only with -n'>int32u~</td> <td> </td></tr> -<tr> +<tr class=b> <td title='0x0058 = 88'>0x0058</td> -<td>ImageCount2</td> +<td>ShutterCount2</td> <td class=c>int32u</td> <td> </td></tr> -<tr class=b> +<tr> <td title='0x0061 = 97'>0x0061</td> <td>SonyTimeMinSec</td> <td class=c>no</td> <td> </td></tr> -<tr> +<tr class=b> <td title='0x0073 = 115'>0x0073</td> <td>ReleaseMode2</td> <td class=c>int8u</td> <td>--> <a href='Sony.html#ReleaseMode2'>Sony ReleaseMode2 Values</a></td></tr> -<tr class=b> +<tr> <td title='0x0088 = 136'>0x0088</td> <td>InternalSerialNumber</td> <td class=c title=' ~ = Writable only with -n'>int8u[6]~</td> <td> </td></tr> -<tr> +<tr class=b> <td title='0x0105 = 261'>0x0105</td> <td>LensMount</td> <td class=c>int8u</td> <td><span class=s>0 = Unknown <br>1 = A-mount <br>2 = E-mount</span></td></tr> -<tr class=b> +<tr> <td title='0x0106 = 262'>0x0106</td> <td>LensFormat</td> <td class=c>int8u</td> <td><span class=s>0 = Unknown <br>1 = APS-C <br>2 = Full-frame</span></td></tr> -<tr> +<tr class=b> <td title='0x0107 = 263'>0x0107</td> <td>LensType2</td> <td class=c>int16u</td> <td>--> <a href='Sony.html#LensType2'>Sony LensType2 Values</a></td></tr> -<tr class=b> +<tr> <td title='0x0109 = 265'>0x0109</td> <td>LensType</td> <td class=c>int16u</td> <td>--> <a href='Sony.html#LensType'>Sony LensType Values</a> <br><span class='n s'>(SLT models, and NEX with A-mount lenses)</span></td></tr> -<tr> +<tr class=b> <td title='0x010b = 267'>0x010b</td> <td>DistortionCorrParamsPresent</td> <td class=c>int8u</td> <td><span class=s>0 = No <br>1 = Yes</span></td></tr> -<tr class=b> +<tr> <td title='0x0116 = 278'>0x0116</td> <td>LensSpecFeatures</td> <td class=c>undef[2]</td> <td> </td></tr> -<tr> +<tr class=b> <td title='0x019f = 415'>0x019f</td> -<td>ImageCount3</td> +<td>ShutterCount3</td> <td class=c>int32u</td> <td> </td></tr> -<tr class=b> +<tr> <td title='0x01cb = 459'>0x01cb</td> -<td>ImageCount3</td> +<td>ShutterCount3</td> <td class=c>int32u</td> <td> </td></tr> -<tr> +<tr class=b> <td title='0x01cd = 461'>0x01cd</td> -<td>ImageCount3</td> +<td>ShutterCount3</td> <td class=c>int32u</td> <td> </td></tr> -<tr class=b> +<tr> <td title='0x021c = 540'>0x021c</td> <td>LensSpecFeatures</td> <td class=c>undef[2]</td> <td> </td></tr> -<tr> +<tr class=b> <td title='0x021e = 542'>0x021e</td> <td>LensSpecFeatures</td> <td class=c>undef[2]</td> @@ -11209,7 +11218,7 @@ some models when the ExtractEmbedded option is used.</p> <hr> (This document generated automatically by Image::ExifTool::BuildTagLookup) -<br><i>Last revised Dec 12, 2018</i> +<br><i>Last revised Jan 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 43ec22f7..7a68845e 100644 --- a/html/exiftool_pod.html +++ b/html/exiftool_pod.html @@ -637,7 +637,7 @@ <p>produces output like this:</p> -<pre><code> -- Generated by ExifTool 11.24 -- +<pre><code> -- Generated by ExifTool 11.25 -- 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 @@ -1304,7 +1304,7 @@ <p>In Windows, command-line arguments are specified using the current code page and are recoded automatically to the system code page. This recoding is not done for arguments in ExifTool arg files, so by default filenames in arg files use the system code page. Unfortunately, these code pages are not complete character sets, so not all file names may be represented.</p> -<p>ExifTool 9.79 and later allow the file name encoding to be specified with <code>-charset filename=CHARSET</code>, where <code>CHARSET</code> is the name of a valid ExifTool character set, preferably <code>UTF8</code> (see the <b>-charset</b> option for a complete list). Setting this triggers the use of Windows wide-character i/o routines, thus providing support for all Unicode file names. But note that it is not trivial to pass properly encoded file names on the Windows command line (see <a href="http://owl.phy.queensu.ca/~phil/exiftool/faq.html#Q18">http://owl.phy.queensu.ca/~phil/exiftool/faq.html#Q18</a> for details), so placing them in a UTF-8 encoded <b>-@</b> argfile and using <code>-charset filename=utf8</code> is recommended if possible.</p> +<p>ExifTool 9.79 and later allow the file name encoding to be specified with <code>-charset filename=CHARSET</code>, where <code>CHARSET</code> is the name of a valid ExifTool character set, preferably <code>UTF8</code> (see the <b>-charset</b> option for a complete list). Setting this triggers the use of Windows wide-character i/o routines, thus providing support for most Unicode file names (see note 4). But note that it is not trivial to pass properly encoded file names on the Windows command line (see <a href="http://owl.phy.queensu.ca/~phil/exiftool/faq.html#Q18">http://owl.phy.queensu.ca/~phil/exiftool/faq.html#Q18</a> for details), so placing them in a UTF-8 encoded <b>-@</b> argfile and using <code>-charset filename=utf8</code> is recommended if possible.</p> <p>A warning is issued if a specified filename contains special characters and the filename character set was not provided. However, the warning may be disabled by setting <code>-charset filename=""</code>, and ExifTool may still function correctly if the system code page matches the character set used for the file names.</p> @@ -1320,6 +1320,8 @@ <p>3) See <a href="#WRITING-READ-ONLY-FILES">"WRITING READ-ONLY FILES"</a> below for a note about editing read-only files with Unicode names.</p> +<p>4) Unicode file names with surrogate pairs (code points over U+FFFF) still cause problems.</p> + <h1 id="WRITING-READ-ONLY-FILES">WRITING READ-ONLY FILES</h1> <p>In general, ExifTool may be used to write metadata to read-only files provided that the user has write permission in the directory. However, there are three cases where file write permission is also required:</p> diff --git a/html/exiftool_pod.pdf b/html/exiftool_pod.pdf index c491b346..8d517ea6 100644 --- a/html/exiftool_pod.pdf +++ b/html/exiftool_pod.pdf @@ -12,7 +12,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 1)Tj +( -- ExifTool 11.25 -- 1)Tj /TT4 1 Tf 0 -1.6333 TD (EXIFTOOL\(1\) User Contributed Perl Documentation EXIFTOOL\(1\))Tj @@ -637,7 +637,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 2)Tj +( -- ExifTool 11.25 -- 2)Tj /TT4 1 Tf 0 -1.6333 TD ( BMP r | FLIF r/w | MKV r | PGF r | TTF r)Tj @@ -832,7 +832,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 3)Tj +( -- ExifTool 11.25 -- 3)Tj /TT4 1 Tf 0 -1.6333 TD ( -d FMT \(-dateFormat\) Set format for date/time values)Tj @@ -987,7 +987,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 4)Tj +( -- ExifTool 11.25 -- 4)Tj /TT4 1 Tf 0 -2.7333 TD ( -delete_original[!] Delete "_original" backups)Tj @@ -1334,7 +1334,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 5)Tj +( -- ExifTool 11.25 -- 5)Tj /TT4 1 Tf 0 -1.6333 TD ( shift date/time values \(see Image::ExifTool::Shift.pl and note 6)Tj @@ -1611,7 +1611,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 6)Tj +( -- ExifTool 11.25 -- 6)Tj /TT4 1 Tf 0 -1.6333 TD ( delete JPEG application segments which are not associated with)Tj @@ -2196,7 +2196,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 7)Tj +( -- ExifTool 11.25 -- 7)Tj /TT4 1 Tf 0 -1.6333 TD ( to prevent shell redirection, and there is no "=" sign as when)Tj @@ -2567,7 +2567,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 8)Tj +( -- ExifTool 11.25 -- 8)Tj /TT4 1 Tf 0 -1.6333 TD ( exiftool -addtagsfromfile @ '-subject<make' '-subject<model' ...)Tj @@ -3072,7 +3072,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 9)Tj +( -- ExifTool 11.25 -- 9)Tj /TT4 1 Tf 0 -2.7333 TD ( -)Tj @@ -3387,7 +3387,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 10)Tj +( -- ExifTool 11.25 -- 10)Tj /TT4 1 Tf 0 -1.6333 TD ( ID3 Internal encoding of ID3v1 information Latin)Tj @@ -3702,7 +3702,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 11)Tj +( -- ExifTool 11.25 -- 11)Tj /TT4 1 Tf 0 -1.6333 TD ( contain formatting codes beginning with a percent character \("%"\))Tj @@ -4335,7 +4335,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 12)Tj +( -- ExifTool 11.25 -- 12)Tj /TT4 1 Tf 0 -1.6333 TD ( other file formats.)Tj @@ -4832,7 +4832,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 13)Tj +( -- ExifTool 11.25 -- 13)Tj /TT4 1 Tf 0 -1.6333 TD ( but the the -)Tj @@ -5135,7 +5135,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 14)Tj +( -- ExifTool 11.25 -- 14)Tj /TT4 1 Tf 0 -1.6333 TD ( # this is a comment line)Tj @@ -5154,7 +5154,7 @@ T* T* ( produces output like this:)Tj T* -( -- Generated by ExifTool 11.24 --)Tj +( -- Generated by ExifTool 11.25 --)Tj 0 -1.1 TD ( File: a.jpg - 2003:10:31 15:44:19)Tj T* @@ -5552,7 +5552,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 15)Tj +( -- ExifTool 11.25 -- 15)Tj /TT4 1 Tf 0 -2.7333 TD ( Note that an empty separator \(""\) is allowed, and will join items)Tj @@ -6063,7 +6063,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 16)Tj +( -- ExifTool 11.25 -- 16)Tj /TT4 1 Tf 0 -1.6333 TD ( the leading '.'. For example:)Tj @@ -6280,7 +6280,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 17)Tj +( -- ExifTool 11.25 -- 17)Tj /TT4 1 Tf 0 -1.6333 TD ( pics/2012/02 %-:1d pics/2012/ up one directory level)Tj @@ -6519,7 +6519,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 18)Tj +( -- ExifTool 11.25 -- 18)Tj /TT4 1 Tf 0 -1.6333 TD ( extension.\) This change allows a simple file name to be)Tj @@ -7120,7 +7120,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 19)Tj +( -- ExifTool 11.25 -- 19)Tj /TT4 1 Tf 0 -1.6333 TD ( Extract existing tags only -- don't calculate composite tags.)Tj @@ -7527,7 +7527,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 20)Tj +( -- ExifTool 11.25 -- 20)Tj /TT4 1 Tf 0 -1.6333 TD ( benefits, -)Tj @@ -7974,7 +7974,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 21)Tj +( -- ExifTool 11.25 -- 21)Tj /TT4 1 Tf 0 -1.6333 TD ( 2\) Some binary data blocks are not extracted unless specified)Tj @@ -8361,7 +8361,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 22)Tj +( -- ExifTool 11.25 -- 22)Tj /TT4 1 Tf 0 -1.6333 TD ( The output file type is determined by the extension of _)Tj @@ -8988,7 +8988,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 23)Tj +( -- ExifTool 11.25 -- 23)Tj /TT4 1 Tf 0 -1.6333 TD ( -)Tj @@ -9405,7 +9405,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 24)Tj +( -- ExifTool 11.25 -- 24)Tj /TT4 1 Tf 0 -1.6333 TD ( "#" are ignored \(unless they start with "#[CSTR]", in which case)Tj @@ -10040,7 +10040,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 25)Tj +( -- ExifTool 11.25 -- 25)Tj /TT4 1 Tf 0 -1.6333 TD ( print addition system information \(see the README file of the full)Tj @@ -10405,7 +10405,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 26)Tj +( -- ExifTool 11.25 -- 26)Tj /TT4 1 Tf 0 -2.7333 TD ( # return all date/times, shifted back by 1 hour)Tj @@ -10940,7 +10940,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 27)Tj +( -- ExifTool 11.25 -- 27)Tj /TT4 1 Tf 0 -1.6333 TD ( ".ExifTool_config". If used, this option must come before all)Tj @@ -11559,7 +11559,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 28)Tj +( -- ExifTool 11.25 -- 28)Tj /TT4 1 Tf 0 -1.6333 TD ( appended to the "-execute" option is echoed in the "{ready}")Tj @@ -11996,7 +11996,7 @@ endobj endobj 93 0 obj << -/Length 6060 +/Length 6076 >> stream
BT @@ -12006,7 +12006,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 29)Tj +( -- ExifTool 11.25 -- 29)Tj /TT4 1 Tf 0 -1.6333 TD ( expression is empty \(ie. "${TAG;}"\). This removes the characters / \\ ?)Tj @@ -12167,11 +12167,11 @@ T* -42.6 -1.1 TD ( option for a complete list\). Setting this triggers the use of Windows)Tj T* -( wide-character i/o routines, thus providing support for all Unicode)Tj +( wide-character i/o routines, thus providing support for most Unicode)Tj T* -( file names. But note that it is not trivial to pass properly encoded)Tj +( file names \(see note 4\). But note that it is not trivial to pass)Tj T* -( file names on the Windows command line \(see)Tj +( properly encoded file names on the Windows command line \(see)Tj T* ( <http://owl.phy.queensu.ca/˜phil/exiftool/faq.html#Q18> for details\),)Tj T* @@ -12341,7 +12341,7 @@ endobj endobj 96 0 obj << -/Length 5359 +/Length 5253 >> stream
BT @@ -12351,7 +12351,7 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 30)Tj +( -- ExifTool 11.25 -- 30)Tj /TT4 1 Tf 0 -1.6333 TD ( the order doesn't matter with respect to other options.)Tj @@ -12372,6 +12372,10 @@ T* 0 -1.1 TD ( only files with Unicode names.)Tj 0 -2.2 TD +( 4\) Unicode file names with surrogate pairs \(code points over U+FFFF\))Tj +0 -1.1 TD +( still cause problems.)Tj +0 -2.2 TD (W)Tj 0 0 TD (WR)Tj @@ -12627,12 +12631,6 @@ T* ( Save thumbnail image from "image.jpg" to a file called)Tj T* ( "thumbnail.jpg".)Tj -0 -2.2 TD -( exiftool -b -JpgFromRaw -w _JFR.JPG -ext NEF -r .)Tj -0 -1.1 TD -( Recursively extract JPG image from all Nikon NEF files in the)Tj -T* -( current directory, adding "_JFR.JPG" for the name of the output)Tj ET endstream endobj @@ -12650,7 +12648,7 @@ endobj endobj 99 0 obj << -/Length 4290 +/Length 4363 >> stream
BT @@ -12660,9 +12658,15 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 31)Tj +( -- ExifTool 11.25 -- 31)Tj /TT4 1 Tf 0 -1.6333 TD +( exiftool -b -JpgFromRaw -w _JFR.JPG -ext NEF -r .)Tj +0 -1.1 TD +( Recursively extract JPG image from all Nikon NEF files in the)Tj +T* +( current directory, adding "_JFR.JPG" for the name of the output)Tj +T* ( JPG files.)Tj 0 -2.2 TD ( exiftool -a -b -W %d%f_%t%-c.%s -preview:all dir)Tj @@ -12796,10 +12800,6 @@ T* ( Replace existing keyword list with two new keywords \("EXIF" and)Tj T* ( "editor"\).)Tj -0 -2.2 TD -( exiftool -Keywords+=word -o newfile.jpg src.jpg)Tj -0 -1.1 TD -( Copy a source image to a new file, and add a keyword \("word"\) to)Tj ET endstream endobj @@ -12817,7 +12817,7 @@ endobj endobj 103 0 obj << -/Length 4160 +/Length 4154 >> stream
BT @@ -12827,9 +12827,13 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 32)Tj +( -- ExifTool 11.25 -- 32)Tj /TT4 1 Tf -0 -1.6333 TD +0 -2.7333 TD +( exiftool -Keywords+=word -o newfile.jpg src.jpg)Tj +0 -1.1 TD +( Copy a source image to a new file, and add a keyword \("word"\) to)Tj +T* ( the current list of keywords.)Tj 0 -2.2 TD ( exiftool -exposurecompensation+=-0.5 a.jpg)Tj @@ -12935,10 +12939,6 @@ T* ( this tag would get written to the IPTC group since "City" exists)Tj T* ( in both, and IPTC is preferred by default.\))Tj -0 -2.2 TD -( exiftool -LightSource-='Unknown \(0\)' dst.tiff)Tj -0 -1.1 TD -( Delete "LightSource" tag only if it is unknown with a value of 0.)Tj ET endstream endobj @@ -12956,7 +12956,7 @@ endobj endobj 106 0 obj << -/Length 4374 +/Length 4353 >> stream
BT @@ -12966,9 +12966,13 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 33)Tj +( -- ExifTool 11.25 -- 33)Tj /TT4 1 Tf 0 -2.7333 TD +( exiftool -LightSource-='Unknown \(0\)' dst.tiff)Tj +0 -1.1 TD +( Delete "LightSource" tag only if it is unknown with a value of 0.)Tj +0 -2.2 TD ( exiftool -whitebalance-=auto -WhiteBalance=tung dst.jpg)Tj 0 -1.1 TD ( Set "WhiteBalance" to "Tungsten" only if it was previously "Auto".)Tj @@ -13102,10 +13106,6 @@ T* ( XMP information and the thumbnail image from the destination.)Tj 0 -2.2 TD ( exiftool -TagsFromFile src.jpg -title -author=Phil dst.jpg)Tj -0 -1.1 TD -( Copy title from one image to another and set a new author name.)Tj -0 -2.2 TD -( exiftool -TagsFromFile a.jpg -ISO -TagsFromFile b.jpg -comment dst.jpg)Tj ET endstream endobj @@ -13123,7 +13123,7 @@ endobj endobj 109 0 obj << -/Length 5070 +/Length 4679 >> stream
BT @@ -13133,11 +13133,15 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 34)Tj +( -- ExifTool 11.25 -- 34)Tj /TT4 1 Tf 0 -1.6333 TD -( Copy ISO from one image and Comment from another image to a)Tj +( Copy title from one image to another and set a new author name.)Tj +0 -2.2 TD +( exiftool -TagsFromFile a.jpg -ISO -TagsFromFile b.jpg -comment dst.jpg)Tj 0 -1.1 TD +( Copy ISO from one image and Comment from another image to a)Tj +T* ( destination image.)Tj 0 -2.2 TD ( exiftool -tagsfromfile src.jpg -exif:all --subifd:all dst.jpg)Tj @@ -13275,9 +13279,38 @@ T* ( files in DIR, saving them with file names like "image_EXT.jpg",)Tj T* ( then add all meta information from the original files to the)Tj -T* +ET +endstream +endobj +110 0 obj +<< +/ProcSet [/PDF /Text ] +/Font << +/TT2 4 0 R +/TT4 5 0 R +>> +/ExtGState << +/GS1 6 0 R +>> +>> +endobj +112 0 obj +<< +/Length 5811 +>> +stream
+BT +/TT2 1 Tf +10 0 0 10 29 806.3333 Tm +0 g +/GS1 gs +0 Tc +0 Tw +( -- ExifTool 11.25 -- 35)Tj +/TT4 1 Tf +0 -1.6333 TD ( extracted images. Here, the command line is broken into three)Tj -T* +0 -1.1 TD ( sections \(separated by -)Tj 21 0 TD (-e)Tj @@ -13321,38 +13354,9 @@ T* (gs)Tj 0.6 0 TD (s option causes the)Tj -ET -endstream -endobj -110 0 obj -<< -/ProcSet [/PDF /Text ] -/Font << -/TT2 4 0 R -/TT4 5 0 R ->> -/ExtGState << -/GS1 6 0 R ->> ->> -endobj -112 0 obj -<< -/Length 5431 ->> -stream
-BT -/TT2 1 Tf -10 0 0 10 29 806.3333 Tm -0 g -/GS1 gs -0 Tc -0 Tw -( -- ExifTool 11.24 -- 35)Tj -/TT4 1 Tf -0 -1.6333 TD +-35.4 -1.1 TD ( "--ext jpg DIR" arguments to be applied to all three commands, and)Tj -0 -1.1 TD +T* ( the -)Tj 9.6 0 TD (-s)Tj @@ -13556,12 +13560,6 @@ T* ( ExifTool implements geotagging via 3 special tags: Geotag \(which for)Tj T* ( convenience is also implemented as an exiftool option\), Geosync and)Tj -T* -( Geotime. The examples below highlight some geotagging features. See)Tj -T* -( <http://owl.phy.queensu.ca/˜phil/exiftool/geotag.html> for additional)Tj -T* -( documentation.)Tj ET endstream endobj @@ -13579,7 +13577,7 @@ endobj endobj 115 0 obj << -/Length 4273 +/Length 4360 >> stream
BT @@ -13589,9 +13587,15 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 36)Tj +( -- ExifTool 11.25 -- 36)Tj /TT4 1 Tf -0 -2.7333 TD +0 -1.6333 TD +( Geotime. The examples below highlight some geotagging features. See)Tj +0 -1.1 TD +( <http://owl.phy.queensu.ca/˜phil/exiftool/geotag.html> for additional)Tj +T* +( documentation.)Tj +0 -2.2 TD ( exiftool -geotag track.log a.jpg)Tj 0 -1.1 TD ( Geotag an image \("a.jpg"\) from position information in a GPS track)Tj @@ -13731,10 +13735,6 @@ T* (t option prevents exiftool from scanning for)Tj -18 -1.1 TD ( trailer information, so only the meta information header is)Tj -T* -( transferred.)Tj -0 -2.2 TD -( exiftool a.jpg -thumbnailimage -b | exiftool -comment=wow - | exiftool)Tj ET endstream endobj @@ -13752,7 +13752,7 @@ endobj endobj 118 0 obj << -/Length 2735 +/Length 2859 >> stream
BT @@ -13762,11 +13762,15 @@ BT /GS1 gs 0 Tc 0 Tw -( -- ExifTool 11.24 -- 37)Tj +( -- ExifTool 11.25 -- 37)Tj /TT4 1 Tf 0 -1.6333 TD -( a.jpg -thumbnailimage'<=-')Tj +( transferred.)Tj +0 -2.2 TD +( exiftool a.jpg -thumbnailimage -b | exiftool -comment=wow - | exiftool)Tj 0 -1.1 TD +( a.jpg -thumbnailimage'<=-')Tj +T* ( Add a comment to an embedded thumbnail image. \(Why anyone would)Tj T* ( want to do this I don't know, but I've included this as an example)Tj @@ -13995,7 +13999,7 @@ T* 0.6 0 TD (s\(3pm\), Image::ExifTool::Shift.pl)Tj -19.2 -4.4 TD -(perl v5.18.2 2019-01-08 EXIFTOOL\(1\))Tj +(perl v5.18.2 2019-01-11 EXIFTOOL\(1\))Tj ET endstream endobj @@ -14439,8 +14443,8 @@ endobj endobj 124 0 obj << -/CreationDate (D:20190108083046-05'00') -/ModDate (D:20190108083046-05'00') +/CreationDate (D:20190115090529-05'00') +/ModDate (D:20190115090529-05'00') /Producer (Apple pstopdf) >> endobj @@ -14454,138 +14458,138 @@ endobj xref 0 126 0000000000 65535 f -0000244417 00000 n +0000244573 00000 n 0000000016 00000 n 0000007975 00000 n -0000243428 00000 n -0000243817 00000 n -0000242893 00000 n -0000247607 00000 n -0000244497 00000 n +0000243584 00000 n +0000243973 00000 n +0000243049 00000 n +0000247763 00000 n +0000244653 00000 n 0000008081 00000 n 0000013499 00000 n -0000244578 00000 n +0000244734 00000 n 0000013606 00000 n 0000018865 00000 n -0000244661 00000 n +0000244817 00000 n 0000018972 00000 n 0000025399 00000 n -0000244744 00000 n +0000244900 00000 n 0000025506 00000 n 0000031535 00000 n -0000244827 00000 n +0000244983 00000 n 0000031642 00000 n 0000040300 00000 n -0000244910 00000 n +0000245066 00000 n 0000040407 00000 n 0000047111 00000 n -0000244993 00000 n +0000245149 00000 n 0000047218 00000 n 0000054771 00000 n -0000245076 00000 n +0000245232 00000 n 0000054878 00000 n 0000060895 00000 n -0000245159 00000 n +0000245315 00000 n 0000061002 00000 n 0000067211 00000 n -0000245242 00000 n +0000245398 00000 n 0000067318 00000 n 0000076097 00000 n -0000248141 00000 n -0000247742 00000 n -0000245326 00000 n +0000248297 00000 n +0000247898 00000 n +0000245482 00000 n 0000076204 00000 n 0000084099 00000 n -0000245410 00000 n +0000245566 00000 n 0000084206 00000 n 0000090026 00000 n -0000245494 00000 n +0000245650 00000 n 0000090133 00000 n 0000096422 00000 n -0000245578 00000 n +0000245734 00000 n 0000096529 00000 n 0000104460 00000 n -0000245662 00000 n +0000245818 00000 n 0000104567 00000 n 0000109554 00000 n -0000245746 00000 n +0000245902 00000 n 0000109661 00000 n 0000115446 00000 n -0000245830 00000 n +0000245986 00000 n 0000115553 00000 n 0000123926 00000 n -0000245914 00000 n +0000246070 00000 n 0000124033 00000 n 0000130997 00000 n -0000245998 00000 n +0000246154 00000 n 0000131104 00000 n 0000138334 00000 n -0000246082 00000 n +0000246238 00000 n 0000138441 00000 n 0000145181 00000 n -0000247880 00000 n -0000246166 00000 n +0000248036 00000 n +0000246322 00000 n 0000145288 00000 n 0000154162 00000 n -0000246250 00000 n +0000246406 00000 n 0000154269 00000 n 0000160827 00000 n -0000246334 00000 n +0000246490 00000 n 0000160934 00000 n 0000169708 00000 n -0000246418 00000 n +0000246574 00000 n 0000169815 00000 n 0000176381 00000 n -0000246502 00000 n +0000246658 00000 n 0000176488 00000 n 0000183884 00000 n -0000246586 00000 n +0000246742 00000 n 0000183991 00000 n 0000192621 00000 n -0000246670 00000 n +0000246826 00000 n 0000192728 00000 n 0000199581 00000 n -0000246754 00000 n +0000246910 00000 n 0000199688 00000 n -0000205801 00000 n -0000246838 00000 n -0000205908 00000 n -0000211320 00000 n -0000246922 00000 n -0000211427 00000 n -0000215770 00000 n -0000248018 00000 n -0000247008 00000 n -0000215878 00000 n -0000220092 00000 n -0000247096 00000 n -0000220200 00000 n -0000224628 00000 n -0000247184 00000 n -0000224736 00000 n -0000229860 00000 n -0000247272 00000 n -0000229968 00000 n -0000235453 00000 n -0000247360 00000 n -0000235561 00000 n -0000239888 00000 n -0000247448 00000 n -0000239996 00000 n -0000242785 00000 n -0000243033 00000 n -0000243236 00000 n -0000247536 00000 n -0000247565 00000 n -0000248247 00000 n -0000248371 00000 n +0000205817 00000 n +0000246994 00000 n +0000205924 00000 n +0000211230 00000 n +0000247078 00000 n +0000211337 00000 n +0000215753 00000 n +0000248174 00000 n +0000247164 00000 n +0000215861 00000 n +0000220069 00000 n +0000247252 00000 n +0000220177 00000 n +0000224584 00000 n +0000247340 00000 n +0000224692 00000 n +0000229425 00000 n +0000247428 00000 n +0000229533 00000 n +0000235398 00000 n +0000247516 00000 n +0000235506 00000 n +0000239920 00000 n +0000247604 00000 n +0000240028 00000 n +0000242941 00000 n +0000243189 00000 n +0000243392 00000 n +0000247692 00000 n +0000247721 00000 n +0000248403 00000 n +0000248527 00000 n trailer << /Size 126 /Root 125 0 R /Info 124 0 R -/ID [<166d2d1868f7a0c131ceb7559a6cc519><166d2d1868f7a0c131ceb7559a6cc519>] +/ID [<8f58af548b64b3c87c6a784864c81a1d><8f58af548b64b3c87c6a784864c81a1d>] >> startxref -248443 +248599 %%EOF diff --git a/html/fix_corrupted_nef.html b/html/fix_corrupted_nef.html index b67110fc..ffaea8ce 100644 --- a/html/fix_corrupted_nef.html +++ b/html/fix_corrupted_nef.html @@ -28,8 +28,8 @@ or older versions of <b>ViewNX 2</b> (and probably Capture NX 2) may result in <b>corrupted NEF</b> images that can no longer be opened.</p> <p>This utility <b>repairs these corrupted NEF images</b> for the D4, Df, -D600, D610, D750, D800, D800E, D810, D850, D3200, D5200, D5300, D5500, D7100 -and D7200.</p> +D600, D610, D750, D800, D800E, D810, D850, D3200, D5200, D5300, D5500, D7100, +D7200 and D7500.</p> <p>It <b><u>DOES NOT REPAIR</u></b> images corrupted by <b>memory card problems</b>, <b>disk errors</b>, or <b>other software</b>. @@ -152,6 +152,7 @@ donation, this can be done from <a href="http://owl.phy.queensu.ca/~phil/exiftoo <p> - Phil Harvey</p> <hr><h3>Revisions</h3> +<p><b>2019-01-09 - Version 3.2</b> - Added support for D7500 images</p> <p><b>2017-11-03 - Version 3.1</b> - Added support for D850 images</p> <p><b>2016-09-14 - Version 3.0</b> - Added support for D5300 images</p> <p><b>2016-08-04 - Version 2.9</b> - Added support for D500 DX and 1.3x images</p> diff --git a/html/history.html b/html/history.html index b821d93e..442a08bf 100644 --- a/html/history.html +++ b/html/history.html @@ -17,6 +17,21 @@ considered development releases, and are not uploaded to <a href="https://metacp <!-- Use line width of 80 --> <!-- *********************************************************************** --> +<a name='v11.25'><b>Jan. 15, 2019 - Version 11.25</b></a> +<ul> +<li>Added a new Sony/Minolta LensType (thanks LibRaw) +<li>Added a new Nikon LensID +<li>Decode Leica D-Lux7 maker notes +<li>Decode more Nikon AF tags for newer models +<li>Decode Samsung Type2 maker notes with lower case Make +<li>Decode another Sony tag (thanks Jos Roost) +<li>Improved decoding of Nikon LensType +<li>Improved time shift feature to fix some incorrectly formatted date/time + values +<li>Renamed some Sony ImageCount tags to ShutterCount (thanks Jos Roost) +<li>Fixed problem reading back metadata written to some odd PDF files +</ul> + <a name='v11.24'><b>Jan. 8, 2019 - Version 11.24</b></a> <ul> <li>Compatibility Notice: Changed the meaning of '-' and '+' modifiers for %C @@ -25,7 +40,7 @@ considered development releases, and are not uploaded to <a href="https://metacp <li>Added new Olympus FlashType and FlashModel values (thanks Per) <li>Added a new Canon LensType <li>Added a new Nikon LensID -<li>Made all GeoTIFF tags writable +<li>Made more GeoTIFF tags writable <li>Handle XMP rdf:value when reading <li>Improved warning when trying to read a file with a zero-length name <li>Fixed decoding of PictureControl tags for Nikon Z-7 diff --git a/html/idiosyncracies.html b/html/idiosyncracies.html index 4ac2b173..f9a2418b 100644 --- a/html/idiosyncracies.html +++ b/html/idiosyncracies.html @@ -81,7 +81,13 @@ start of the individual IFD entry.</p> <p><a name="Kyocera"><b>Kyocera:</b></a> A number of models write all maker notes offsets relative to the start of the individual IFD entry.</p> -<p><a name="Leica"><b>Leica:</b></a> The M8 and M9 write the EXIF ComponentsConfiguration value in +<p><a name="Leica"><b>Leica:</b></a> Leica is hands-down the most inconsistent +company when it comes to writing makernote information. Various models use +different signatures and different bases for the offsets for the maker notes. As +well as this, they do a number of really peculiar things with in their +metadata.</p> + +<p>The M8 and M9 write the EXIF ComponentsConfiguration value in ASCII instead of binary. The M8 writes EXIF ExposureCompensation and ShutterSpeedValue incorrectly as a unsigned rationals when they should be signed. This leads to crazy values like "+65536" for small negative exposure @@ -272,7 +278,7 @@ are absolute. What a mess!</p> <hr> <i>Created Mar. 25, 2005</i> -<br><i>Last revised Apr. 30, 2018</i> +<br><i>Last revised Jan. 11, 2019</i> <p class='lf'><a href="index.html"><-- Back to ExifTool home page</a></p> </body> </html> diff --git a/html/index.html b/html/index.html index 42194b98..a7382a61 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="http://sourceforge.net/projects/exiftool/files/Image-ExifTool-11.24.tar.gz/download"> -Download Version 11.24</a> (4.3 MB) - -<a href="history.html">Jan. 8, 2019</a></b></td></tr></table></blockquote> +<a href="http://sourceforge.net/projects/exiftool/files/Image-ExifTool-11.25.tar.gz/download"> +Download Version 11.25</a> (4.3 MB) - +<a href="history.html">Jan. 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="http://sourceforge.net/projects/exiftool/files/exiftool-11.24.zip/download"> - exiftool-11.24.zip</a> (6.0 MB)</b></td></tr></table></blockquote> +<a href="http://sourceforge.net/projects/exiftool/files/exiftool-11.25.zip/download"> + exiftool-11.25.zip</a> (6.0 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 @@ -141,7 +141,7 @@ of Windows.</p> <blockquote><table class='dl lg'><tr><td><b> MacOS Package: <a href="http://sourceforge.net/projects/exiftool/files/ExifTool-9.70.dmg/download"> - ExifTool-11.24.dmg</a> (2.8 MB)</b></td></tr></table></blockquote> + ExifTool-11.25.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 diff --git a/html/install.html b/html/install.html index 3cefb8ba..a13b3e8b 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.24.zip</code>".)</span></li> +<br><span class=lt>(The file you download should be named "<code>exiftool-11.25.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.24.zip</code>" to open +<br><span class=lt>(Double-click on "<code>exiftool-11.25.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.24.tar.gz</code>".)</span></li> +<br><span class=lt>(The file you download should be named "<code>Image-ExifTool-11.25.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.24.dmg</code>".)</span></li> +<br><span class=lt>(The file you download should be named "<code>ExifTool-11.25.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.24.tar.gz</code>".)</span></li> +<br><span class=lt>(The file you download should be named "<code>Image-ExifTool-11.25.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.24.tar.gz - cd Image-ExifTool-11.24 + tar -xzf Image-ExifTool-11.25.tar.gz + cd Image-ExifTool-11.25 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.24.pkg" can't be opened because it is from an +<blockquote class=red>"ExifTool-11.25.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.24.tar.gz</code>".)</span></li> +<br><span class=lt>(The file you download should be named "<code>Image-ExifTool-11.25.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.24.tar.gz | tar -xf - - cd Image-ExifTool-11.24 + gzip -dc Image-ExifTool-11.25.tar.gz | tar -xf - + cd Image-ExifTool-11.25 </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/html/mistakes.html b/html/mistakes.html index 93df3a45..e2abb9aa 100644 --- a/html/mistakes.html +++ b/html/mistakes.html @@ -60,8 +60,8 @@ because this technique is case-insensitive.</li> expands wildcards (eg. Mac and Linux) because a malicious arrangement of file names could potentially have unwanted effects since they may be interpreted as ExifTool options (see <a href="index.html#security">Security Issues</a>).</li> -<li>Wildcards can't yet be used to match files with Unicode characters in their -names on Windows systems.</li> +<li>There are problems using wildcards to match files with Unicode characters in +their names on Windows systems.</li> </ol> </blockquote> diff --git a/html/sample_images.html b/html/sample_images.html index 492ddd14..75c5f969 100644 --- a/html/sample_images.html +++ b/html/sample_images.html @@ -146,10 +146,10 @@ repository as more suitable samples become available.</p> <td align='right'>5.0 MB </td> <td> <a href='HTC.tar.gz'>HTC.tar.gz</a></td> <td align='center'>2017-05-12</td></tr> -<tr><td> Huawei</td><td align='center'>19</td> -<td align='right'>694 kB </td> +<tr><td> Huawei</td><td align='center'>20</td> +<td align='right'>722 kB </td> <td> <a href='Huawei.tar.gz'>Huawei.tar.gz</a></td> -<td align='center'>2018-10-19</td></tr> +<td align='center'>2019-01-11</td></tr> <tr><td> ImpressCam</td><td align='center'>8</td> <td align='right'>228 kB </td> <td> <a href='ImpressCam.tar.gz'>ImpressCam.tar.gz</a></td> @@ -178,10 +178,10 @@ repository as more suitable samples become available.</p> <td align='right'>77 kB </td> <td> <a href='Legend.tar.gz'>Legend.tar.gz</a></td> <td align='center'>2009-09-08</td></tr> -<tr><td> Leica</td><td align='center'>50</td> -<td align='right'>982 kB </td> +<tr><td> Leica</td><td align='center'>52</td> +<td align='right'>1021 kB </td> <td> <a href='Leica.tar.gz'>Leica.tar.gz</a></td> -<td align='center'>2018-08-23</td></tr> +<td align='center'>2019-01-11</td></tr> <tr><td> LG</td><td align='center'>141</td> <td align='right'>2.3 MB </td> <td> <a href='LG.tar.gz'>LG.tar.gz</a></td> @@ -422,12 +422,12 @@ repository as more suitable samples become available.</p> <td align='right'>351 kB </td> <td> <a href='ZTE.tar.gz'>ZTE.tar.gz</a></td> <td align='center'>2015-07-27</td></tr> -<tr bgcolor='#dddddd'><th>Total</th><td align='center'>6775 models</td> -<td align='right'>129.3 MB </td><td align='center'>100 makes</td> -<td align='center'>2018-11-19</td></tr> +<tr bgcolor='#dddddd'><th>Total</th><td align='center'>6778 models</td> +<td align='right'>129.4 MB </td><td align='center'>100 makes</td> +<td align='center'>2019-01-11</td></tr> </table></blockquote><hr> <i>Created May 15, 2006</i><br> -<i>Last revised Nov 19, 2018</i> +<i>Last revised Jan 11, 2019</i> <p class='lf'><a href='index.html'><-- Back to ExifTool home page</a></p> </body> </html> diff --git a/lib/Image/ExifTool.pm b/lib/Image/ExifTool.pm index e62446b0..85953fd9 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.24'; +$VERSION = '11.25'; $RELEASE = ''; @ISA = qw(Exporter); %EXPORT_TAGS = ( diff --git a/lib/Image/ExifTool/Lang/de.pm b/lib/Image/ExifTool/Lang/de.pm index 2ebe1761..2ebe1761 100755..100644 --- a/lib/Image/ExifTool/Lang/de.pm +++ b/lib/Image/ExifTool/Lang/de.pm diff --git a/lib/Image/ExifTool/MakerNotes.pm b/lib/Image/ExifTool/MakerNotes.pm index d35d88d7..5b685a7c 100644 --- a/lib/Image/ExifTool/MakerNotes.pm +++ b/lib/Image/ExifTool/MakerNotes.pm @@ -21,7 +21,7 @@ sub ProcessKodakPatch($$$); sub WriteUnknownOrPreview($$$); sub FixLeicaBase($$;$); -$VERSION = '2.06'; +$VERSION = '2.08'; my $debug; # set to 1 to enable debugging code @@ -692,6 +692,15 @@ my $debug; # set to 1 to enable debugging code }, }, { + Name => 'MakerNoteLeica10', # used by the D-Lux7 + Condition => '$$valPt =~ /^LEICA CAMERA AG\0/', + SubDirectory => { + TagTable => 'Image::ExifTool::Panasonic::Main', + Start => '$valuePtr + 18', + ByteOrder => 'Unknown', + }, + }, + { Name => 'MakerNotePanasonic', # (starts with "Panasonic\0") Condition => '$$valPt=~/^Panasonic/ and $$self{Model} ne "DC-FT7"', @@ -891,9 +900,9 @@ my $debug; # set to 1 to enable debugging code }, { Name => 'MakerNoteSamsung2', - # Samsung EXIF-format maker notes + # Samsung EXIF-format maker notes ( Condition => q{ - $$self{Make} eq 'SAMSUNG' and ($$self{TIFF_TYPE} eq 'SRW' or + uc $$self{Make} eq 'SAMSUNG' and ($$self{TIFF_TYPE} eq 'SRW' or $$valPt=~/^(\0.\0\x01\0\x07\0{3}\x04|.\0\x01\0\x07\0\x04\0{3})0100/s) }, SubDirectory => { diff --git a/lib/Image/ExifTool/Minolta.pm b/lib/Image/ExifTool/Minolta.pm index 81df8b01..517adcba 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.69'; +$VERSION = '2.70'; # Full list of product codes for Sony-compatible Minolta lenses # (ref http://www.kb.sony.com/selfservice/documentLink.do?externalId=C1000570) @@ -607,43 +607,44 @@ $VERSION = '2.69'; '65535.61' => 'Sigma 30mm F1.4 DC DN | C', #IB (50480) (016) '65535.62' => 'Sigma 85mm F1.4 DG HSM | A', #JR (50499) (018) '65535.63' => 'Sigma 16mm F1.4 DC DN | C', #JR (50503) (017) - '65535.64' => 'Sigma 105mm F1.4 DG HSM | A', #IB (50507) (018) + '65535.64' => 'Sigma 105mm F1.4 DG HSM | A', #IB (50507) (018) '65535.65' => 'Sigma 56mm F1.4 DC DN | C', #JR (50508) (018) - '65535.66' => 'Sigma 70mm F2.8 DG MACRO | A', #JR (50513) (018) - '65535.67' => 'Tamron 18-200mm F3.5-6.3 Di III VC', #JR (0 - Model B011) - '65535.68' => 'Tamron 28-75mm F2.8 Di III RXD', #JR (49457 - Model A036) - '65535.69' => 'Tokina Firin 20mm F2 FE MF', #JR (0) - '65535.70' => 'Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III', #JR (50992) - '65535.71' => 'Voigtlander HELIAR-HYPER WIDE 10mm F5.6', #IB (50993) - '65535.72' => 'Voigtlander ULTRA WIDE-HELIAR 12mm F5.6 III', #IB (50994) - '65535.73' => 'Voigtlander MACRO APO-LANTHAR 65mm F2 Aspherical', #JR (50995) - '65535.74' => 'Voigtlander NOKTON 40mm F1.2 Aspherical', #JR (50996) - '65535.75' => 'Voigtlander NOKTON classic 35mm F1.4', #JR (50997) - '65535.76' => 'Voigtlander MACRO APO-LANTHAR 110mm F2.5', #JR (50998) - '65535.77' => 'Voigtlander COLOR-SKOPAR 21mm F3.5 Aspherical', #IB (50999) - '65535.78' => 'Zeiss Touit 12mm F2.8', #JR (49201 or 0) - '65535.79' => 'Zeiss Touit 32mm F1.8', #JR (49202 or 0) - '65535.80' => 'Zeiss Touit 50mm F2.8 Macro', #JR (49203 or 0) - '65535.81' => 'Zeiss Batis 25mm F2', #JR (49216) - '65535.82' => 'Zeiss Batis 85mm F1.8', #JR (49217) - '65535.83' => 'Zeiss Batis 18mm F2.8', #IB (49218) - '65535.84' => 'Zeiss Batis 135mm F2.8', #IB (49219) - '65535.85' => 'Zeiss Batis 40mm F2 CF', #JR (49220) - '65535.86' => 'Zeiss Loxia 50mm F2', #JR (49232 or 0) - '65535.87' => 'Zeiss Loxia 35mm F2', #JR (49233 or 0) - '65535.88' => 'Zeiss Loxia 21mm F2.8', #JR (49234) - '65535.89' => 'Zeiss Loxia 85mm F2.4', #JR (49235) - '65535.90' => 'Zeiss Loxia 25mm F2.4', #JR (49236) + '65535.66' => 'Sigma 70-200mm F2.8 DG OS HSM | S',#IB (50512) (018) + '65535.67' => 'Sigma 70mm F2.8 DG MACRO | A', #JR (50513) (018) + '65535.68' => 'Tamron 18-200mm F3.5-6.3 Di III VC', #JR (0 - Model B011) + '65535.69' => 'Tamron 28-75mm F2.8 Di III RXD', #JR (49457 - Model A036) + '65535.70' => 'Tokina Firin 20mm F2 FE MF', #JR (0) + '65535.71' => 'Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III', #JR (50992) + '65535.72' => 'Voigtlander HELIAR-HYPER WIDE 10mm F5.6', #IB (50993) + '65535.73' => 'Voigtlander ULTRA WIDE-HELIAR 12mm F5.6 III', #IB (50994) + '65535.74' => 'Voigtlander MACRO APO-LANTHAR 65mm F2 Aspherical', #JR (50995) + '65535.75' => 'Voigtlander NOKTON 40mm F1.2 Aspherical', #JR (50996) + '65535.76' => 'Voigtlander NOKTON classic 35mm F1.4', #JR (50997) + '65535.77' => 'Voigtlander MACRO APO-LANTHAR 110mm F2.5', #JR (50998) + '65535.78' => 'Voigtlander COLOR-SKOPAR 21mm F3.5 Aspherical', #IB (50999) + '65535.79' => 'Zeiss Touit 12mm F2.8', #JR (49201 or 0) + '65535.80' => 'Zeiss Touit 32mm F1.8', #JR (49202 or 0) + '65535.81' => 'Zeiss Touit 50mm F2.8 Macro', #JR (49203 or 0) + '65535.82' => 'Zeiss Batis 25mm F2', #JR (49216) + '65535.83' => 'Zeiss Batis 85mm F1.8', #JR (49217) + '65535.84' => 'Zeiss Batis 18mm F2.8', #IB (49218) + '65535.85' => 'Zeiss Batis 135mm F2.8', #IB (49219) + '65535.86' => 'Zeiss Batis 40mm F2 CF', #JR (49220) + '65535.87' => 'Zeiss Loxia 50mm F2', #JR (49232 or 0) + '65535.88' => 'Zeiss Loxia 35mm F2', #JR (49233 or 0) + '65535.89' => 'Zeiss Loxia 21mm F2.8', #JR (49234) + '65535.90' => 'Zeiss Loxia 85mm F2.4', #JR (49235) + '65535.91' => 'Zeiss Loxia 25mm F2.4', #JR (49236) # # other lenses # - '65535.91' => 'Arax MC 35mm F2.8 Tilt+Shift', #JD - '65535.92' => 'Arax MC 80mm F2.8 Tilt+Shift', #JD - '65535.93' => 'Zenitar MF 16mm F2.8 Fisheye M42', #JD - '65535.94' => 'Samyang 500mm Mirror F8.0', #19 - '65535.95' => 'Pentacon Auto 135mm F2.8', #19 - '65535.96' => 'Pentacon Auto 29mm F2.8', #19 - '65535.97' => 'Helios 44-2 58mm F2.0', #19 + '65535.92' => 'Arax MC 35mm F2.8 Tilt+Shift', #JD + '65535.93' => 'Arax MC 80mm F2.8 Tilt+Shift', #JD + '65535.94' => 'Zenitar MF 16mm F2.8 Fisheye M42', #JD + '65535.95' => 'Samyang 500mm Mirror F8.0', #19 + '65535.96' => 'Pentacon Auto 135mm F2.8', #19 + '65535.97' => 'Pentacon Auto 29mm F2.8', #19 + '65535.98' => 'Helios 44-2 58mm F2.0', #19 ); %minoltaTeleconverters = ( @@ -2978,7 +2979,7 @@ sub ConvertWhiteBalance($) my $printConv = $minoltaWhiteBalance{$val}; unless (defined $printConv) { if ($val & 0xffff0000) { - # the A2 values can be shifted by += 3 settings, where + # the A2 values can be shifted by +- 3 settings, where # each setting adds or subtracts 0x0010000 (ref 2) my $type = ($val & 0xff000000) + 0x800000; if ($minoltaWhiteBalance{$type}) { diff --git a/lib/Image/ExifTool/Nikon.pm b/lib/Image/ExifTool/Nikon.pm index 291c453d..0294a1ee 100644 --- a/lib/Image/ExifTool/Nikon.pm +++ b/lib/Image/ExifTool/Nikon.pm @@ -59,7 +59,7 @@ use Image::ExifTool qw(:DataAccess :Utils); use Image::ExifTool::Exif; use Image::ExifTool::GPS; -$VERSION = '3.58'; +$VERSION = '3.59'; sub LensIDConv($$$); sub ProcessNikonAVI($$$); @@ -315,6 +315,7 @@ sub GetAFPointGrid($$;$); 'A0 40 2D 53 2C 3C CA 8E' => 'AF-P DX Nikkor 18-55mm f/3.5-5.6G', #Yang You pvt communication 'A0 40 2D 53 2C 3C CA 0E' => 'AF-P DX Nikkor 18-55mm f/3.5-5.6G VR', #PH 'AF 4C 37 37 14 14 CC 06' => 'AF-S Nikkor 24mm f/1.8G ED', #IB + 'A2 38 5C 8E 34 40 CD 86' => 'AF-P DX Nikkor 70-300mm f/4.5-6.3G VR', #PH 'A3 38 5C 8E 34 40 CE 8E' => 'AF-P DX Nikkor 70-300mm f/4.5-6.3G ED VR', 'A3 38 5C 8E 34 40 CE 0E' => 'AF-P DX Nikkor 70-300mm f/4.5-6.3G ED', 'A4 48 5C 80 24 24 CF 4E' => 'AF-S Nikkor 70-200mm f/2.8E FL ED VR', @@ -1345,19 +1346,25 @@ my %binaryDataAttrs = ( 1 => 'D', 2 => 'G', 3 => 'VR', - # bit 4 set for Nikon 1 lenses - PH + 4 => '1', #PH # bit 5 set for FT-1 adapter? - PH - # bit 6 set for FL lenses? - PH + 6 => 'E', #PH (electromagnetic aperture mechanism) + # bit 7 set for AF-P lenses? - PH }) : 'AF'; # remove commas and change "D G" to just "G" - s/,//g; s/\bD G\b/G/; $_ + s/,//g; s/\bD G\b/G/; + s/ E\b// and s/^(G )?/E /; # put "E" at the start instead of "G" + s/ 1// and $_ = "1 $_"; # put "1" at start + return $_; ], PrintConvInv => q[ my $bits = 0; - $bits |= 0x01 if $val =~ /\bMF\b/i; - $bits |= 0x02 if $val =~ /\bD\b/i; - $bits |= 0x06 if $val =~ /\bG\b/i; - $bits |= 0x08 if $val =~ /\bVR\b/i; + $bits |= 0x01 if $val =~ /\bMF\b/i; # bit 0 + $bits |= 0x02 if $val =~ /\bD\b/i; # bit 1 + $bits |= 0x06 if $val =~ /\bG\b/i; # bits 1 and 2 + $bits |= 0x08 if $val =~ /\bVR\b/i; # bit 3 + $bits |= 0x10 if $val =~ /\b1\b/; # bit 4 + $bits |= 0x46 if $val =~ /\bE\b/i; # bits 1, 2 and 6 return $bits; ], }, @@ -2417,10 +2424,10 @@ my %binaryDataAttrs = ( 6 => { Name => 'VRMode', PrintConv => { - 0 => 'Normal', # (Z-7 gives this value for "off" - PH) + 0 => 'Normal', # (Z7 gives this value for "off" - PH) 1 => 'On (1)', #PH (NC) 2 => 'Active', # (1J1) - 3 => 'Sport', #PH (Z-7) + 3 => 'Sport', #PH (Z7) }, }, # 7 - values: 0, 1 @@ -2793,7 +2800,7 @@ my %binaryDataAttrs = ( }, ); -# Picture Control information V3 (ref PH, Z-7) +# Picture Control information V3 (ref PH, Z7) %Image::ExifTool::Nikon::PictureControl3 = ( %binaryDataAttrs, GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' }, @@ -3186,7 +3193,7 @@ my %binaryDataAttrs = ( RawConv => '$$self{ContrastDetectAF} = $val', PrintConv => { %offOn, - 2 => 'On (2)', #PH (Z-7) + 2 => 'On (2)', #PH (Z7) }, Notes => 'this is Off for the hybrid AF used in Nikon 1 models', }, @@ -3243,11 +3250,14 @@ my %binaryDataAttrs = ( 129 => 'Auto (41 points)', #PH (NC) 130 => 'Subject Tracking (41 points)', #PH (NC) 131 => 'Face Priority (41 points)', #PH (NC) - 192 => 'Pinpoint', #PH (Z-7) - 193 => 'Single', #PH (Z-7) - 195 => 'Wide (S)', #PH (Z-7) - 196 => 'Wide (L)', #PH (Z-7) - 197 => 'Auto', #PH (Z-7) + 192 => 'Pinpoint', #PH (Z7) + 193 => 'Single', #PH (Z7) (AF-S?) + 194 => 'Dynamic', #PH (Z7) + 195 => 'Wide (S)', #PH (Z7) + 196 => 'Wide (L)', #PH (Z7) + 197 => 'Auto', #PH (Z7) + 198 => 'Auto (198)', #PH (Z7) (focus lock with AF-C maybe?) + 199 => 'Auto (focus lock)', #PH (Z7, AF-S) }, }, ], @@ -3265,7 +3275,7 @@ my %binaryDataAttrs = ( 5 => 'On (5)', #PH (1S2[128/129], 1J4/1V3[129]) 6 => 'On (105-point)', #PH (1J4/1V3[128/130]) 7 => 'On (153-point)', #PH (D5/D500/D850) - 8 => 'On (8)', #PH (Z-7) + 8 => 'On (8)', #PH (Z7) }, }, 7 => [ @@ -3377,6 +3387,21 @@ my %binaryDataAttrs = ( 1 => 'E9 (Center)', }, }, + { #PH (Z7) (NC) + Name => 'PrimaryAFPoint', + Condition => '$$self{PhaseDetectAF} == 8 and $$self{AFInfo2Version} =~ /^03/', + Notes => q{ + Nikon models with 493-point AF -- 17 rows (A-Q) and 29 columns (1-29), I15 + at the center + }, + PrintConv => { + 0 => '(none)', + OTHER => sub { + my ($val, $inv) = @_; + return GetAFPointGrid($val, 29, $inv); + }, + }, + }, { Name => 'PrimaryAFPoint', Condition => '$$self{AFInfo2Version} eq "0100"', @@ -3494,7 +3519,20 @@ my %binaryDataAttrs = ( PrintConv => sub { PrintAFPoints(shift, \%afPoints153); }, PrintConvInv => sub { PrintAFPointsInv(shift, \%afPoints153); }, }, - { + { #PH (Z7) (NC) + Name => 'AFPointsUsed', + Condition => '$$self{PhaseDetectAF} == 8', + Notes => q{ + models with 493-point AF -- 17 rows (A-Q) and 29 columns (1-29). Center + point is I15 + }, + Format => 'undef[62]', + ValueConv => 'join(" ", unpack("H2"x62, $val))', + ValueConvInv => '$val=~tr/ //d; pack("H*",$val)', + PrintConv => sub { PrintAFPointsGrid(shift, 29); }, + PrintConvInv => sub { PrintAFPointsGridInv(shift, 29, 62); }, + }, + { #PH Name => 'AFPointsUsed', Format => 'undef[7]', ValueConv => 'join(" ", unpack("H2"x7, $val))', @@ -3551,23 +3589,39 @@ my %binaryDataAttrs = ( PrintConv => { 0 => 'No', 1 => 'Yes' }, }, # 0x1d - always zero (with or without live view) - # 0x2e - related to AFAreaColumn: left->right=232,240,244,248,252,0,4,8,...,88 - PH (Z7) - 0x2f => { #PH - Name => 'AFAreaColumn', + 0x2a => { #PH (Z7) + Name => 'AFImageWidth', + Condition => '$$self{AFInfo2Version} =~ /^03/', + Format => 'int16u', + RawConv => '$val ? $val : undef', + }, + 0x2c => { #PH (Z7) + Name => 'AFImageHeight', + Condition => '$$self{AFInfo2Version} =~ /^03/', + Format => 'int16u', + RawConv => '$val ? $val : undef', + }, + 0x2e => { #PH (Z7) + Name => 'AFAreaXPosition', Condition => '$$self{ContrastDetectAF} == 2 and $$self{AFInfo2Version} =~ /^03/', - Notes => q{ - column number of selected AF area in contrast-detect mode for models such as - the Z-7. Range is 1-30 - }, + Format => 'int16u', }, - # 0x30 - related to AFAreaRow: top->bottom=160,...,192,...,224 - PH (Z7) - 0x31 => { #PH - Name => 'AFAreaRow', + 0x30 => { #PH (Z7) + Name => 'AFAreaYPosition', Condition => '$$self{ContrastDetectAF} == 2 and $$self{AFInfo2Version} =~ /^03/', - Notes => q{ - row number of selected AF area in contrast-detect mode for models such as - the Z-7. Range is 1-19 - }, + Format => 'int16u', + }, + 0x32 => { #PH (Z7) + Name => 'AFAreaWidth', + Condition => '$$self{AFInfo2Version} =~ /^03/', + Format => 'int16u', + RawConv => '$val ? $val : undef', + }, + 0x34 => { #PH (Z7) + Name => 'AFAreaHeight', + Condition => '$$self{AFInfo2Version} =~ /^03/', + Format => 'int16u', + RawConv => '$val ? $val : undef', }, 0x44 => [ { @@ -4515,6 +4569,7 @@ my %nikonFocalConversions = ( 1 => 'On', }, }, + # 0xac - int16u[600] TiffMeteringImage1: 30x20 image (ShotInfoVersion 0800, ref JR) 0x157 => { #JD Name => 'ShutterCount', Condition => '$$self{ShotInfoVersion} eq "0205"', @@ -4545,6 +4600,14 @@ my %nikonFocalConversions = ( Priority => 0, }, # note: DecryptLen currently set to 0x251 + + # 0x55c - int16u[2400] TiffMeteringImage2: 60x40 image (ShotInfoVersion 0800, ref JR) + # 0x181c - int16u[1200] TiffMeteringImage?: 60x20 image for some NEF's (ShotInfoVersion 0800, ref JR) + # 0x217c - int16u[2400] TiffMeteringImage3: 60x40 image (ShotInfoVersion 0800, ref JR) + # 0x3d9c - int16u[2400] TiffMeteringImage4: 60x40 image (ShotInfoVersion 0800, ref JR) + # 0x59c0 - TiffMeteringImageWidth (ShotInfoVersion 0800, ref JR) + # 0x59c2 - TiffMeteringImageHeight (ShotInfoVersion 0800, ref JR) + # 0x59c4 - int16u[1800] TiffMeteringImage5: 30x20 RGB image (ShotInfoVersion 0800, ref JR) ); # shot information for D40 and D40X (encrypted) - ref PH diff --git a/lib/Image/ExifTool/PDF.pm b/lib/Image/ExifTool/PDF.pm index e632fc35..962c3dc5 100644 --- a/lib/Image/ExifTool/PDF.pm +++ b/lib/Image/ExifTool/PDF.pm @@ -21,7 +21,7 @@ use vars qw($VERSION $AUTOLOAD $lastFetched); use Image::ExifTool qw(:DataAccess :Utils); require Exporter; -$VERSION = '1.46'; +$VERSION = '1.47'; sub FetchObject($$$$); sub ExtractObject($$;$$); @@ -2174,6 +2174,9 @@ XRef: $raf->Read($buff, 20) == 20 or return -6; $buff =~ /^\s*(\d{10}) (\d{5}) (f|n)/s or return -4; my $num = $start + $i; + # locate object to generate entry from stream if necessary + # (must do this before we test $xref{$num}) + LocateAnyObject(\%xref, $num) if $xref{dicts}; # save offset for newest copy of all objects # (or next object number for free objects) unless (defined $xref{$num}) { diff --git a/lib/Image/ExifTool/README b/lib/Image/ExifTool/README index 8f9b4441..e04f0493 100644 --- a/lib/Image/ExifTool/README +++ b/lib/Image/ExifTool/README @@ -757,19 +757,20 @@ numerical. tag is written. The value is a hash reference. The hash keys are the names of the tags to write, and the values are evaluated to obtain the ValueConv values of each tag (or undef - to delete the tag). In the eval, $val is the Raw value of the - parent tag (which may be undef if the tag is being deleted, - and should not be modified because it will affect subsequent - WriteAlso tags), and the %opts hash may be accessed to modify - SetNewValue options for each tag. By default, Type is set to - "ValueConv" and the Protected option has bit 0x02 set to allow - writing of Protected tags that aren't directly writable. The - AddValue, DelValue, Shift and Replace options from the parent - tag are also defined, but no other options are set by default. - Previous new values of WriteAlso tags have already been - removed prior to the eval if the Replace option was used for - the parent tag. If an empty warning is issued ("\n"), the - target tag is not written and no error is reported. + to delete the tag). In the eval, $val is the new Raw value of + the parent tag (which may be undef if the tag is being + deleted, and should not be modified because it will affect + subsequent WriteAlso tags), and the %opts hash may be accessed + to modify SetNewValue options for each tag. By default, Type + is set to "ValueConv" and the Protected option has bit 0x02 + set to allow writing of Protected tags that aren't directly + writable. The AddValue, DelValue, Shift and Replace options + from the parent tag are also defined, but no other options are + set by default. Previous new values of WriteAlso tags have + already been removed prior to the eval if the Replace option + was used for the parent tag. If an empty warning is issued + ("\n"), the target tag is not written and no error is + reported. WriteCheck : If given, specifies a scalar which is evaluated as a Perl expression for a one-time validatation the Raw value being diff --git a/lib/Image/ExifTool/Shift.pl b/lib/Image/ExifTool/Shift.pl index 15d0fe85..07f5d916 100644 --- a/lib/Image/ExifTool/Shift.pl +++ b/lib/Image/ExifTool/Shift.pl @@ -418,7 +418,7 @@ sub ShiftTime($$;$$) # # insert shifted time components back into original string # - my ($i, $err); + my $i; for ($i=0; $i<@toTime; ++$i) { next unless defined $time[$i] and defined $toTime[$i]; my ($v, $d, $s); @@ -447,11 +447,9 @@ sub ShiftTime($$;$$) my $sig = $len - length $s; my $dec = $d ? length($d) - 1 : 0; my $newNum = sprintf($dec ? "$s%0$sig.${dec}f" : "$s%0${sig}d", $nv); - length($newNum) != $len and $err = 1; substr($val, $pos - $len, $len) = $newNum; - pos($val) = $pos; + pos($val) = $pos + length($newNum) - $len; } - $err and return "Error packing shifted time ($val)"; $_[0] = $val; # return shifted value return undef; # success! } diff --git a/lib/Image/ExifTool/Shortcuts.pm b/lib/Image/ExifTool/Shortcuts.pm index 47889f33..7fde4bb0 100644 --- a/lib/Image/ExifTool/Shortcuts.pm +++ b/lib/Image/ExifTool/Shortcuts.pm @@ -19,7 +19,7 @@ package Image::ExifTool::Shortcuts; use strict; use vars qw($VERSION); -$VERSION = '1.60'; +$VERSION = '1.61'; # this is a special table used to define command-line shortcuts # (documentation Notes may be added for these via %shortcutNotes in BuildTagLookup.pm) @@ -167,6 +167,7 @@ $VERSION = '1.60'; 'MakerNoteLeica7', 'MakerNoteLeica8', 'MakerNoteLeica9', + 'MakerNoteLeica10', 'MakerNotePanasonic', 'MakerNotePanasonic2', 'MakerNotePanasonic3', diff --git a/lib/Image/ExifTool/Sony.pm b/lib/Image/ExifTool/Sony.pm index 15f40da4..4bdda45f 100644 --- a/lib/Image/ExifTool/Sony.pm +++ b/lib/Image/ExifTool/Sony.pm @@ -32,7 +32,7 @@ use Image::ExifTool qw(:DataAccess :Utils); use Image::ExifTool::Exif; use Image::ExifTool::Minolta; -$VERSION = '2.97'; +$VERSION = '2.98'; sub ProcessSRF($$$); sub ProcessSR2($$$); @@ -147,13 +147,13 @@ my %sonyLensTypes2 = ( 49457 => 'Tamron 28-75mm F2.8 Di III RXD', #JR (Model A036) 50480 => 'Sigma 30mm F1.4 DC DN | C', #IB/JR (016) - 50481 => 'Sigma 50mm F1.4 DG HSM | A + MC-11', #JR (014) + 50481 => 'Sigma 50mm F1.4 DG HSM | A', #JR (014 + MC-11 or 018) 50482 => 'Sigma 18-300mm F3.5-6.3 DC MACRO OS HSM | C + MC-11', #JR (014) 50483 => 'Sigma 18-35mm F1.8 DC HSM | A + MC-11', #JR (013) 50484 => 'Sigma 24-35mm F2 DG HSM | A + MC-11', #JR (015) 50486 => 'Sigma 150-600mm F5-6.3 DG OS HSM | C + MC-11', #JR (015) 50487 => 'Sigma 20mm F1.4 DG HSM | A + MC-11', #JR (015) - 50488 => 'Sigma 35mm F1.4 DG HSM | A + MC-11', #JR (012) + 50488 => 'Sigma 35mm F1.4 DG HSM | A', #JR (012 + MC-11 or 018) 50489 => 'Sigma 150-600mm F5-6.3 DG OS HSM | S + MC-11', #JR (014) 50490 => 'Sigma 120-300mm F2.8 DG OS HSM | S + MC-11', #JR (013) 50492 => 'Sigma 24-105mm F4 DG OS HSM | A + MC-11', #JR (013) @@ -164,6 +164,7 @@ my %sonyLensTypes2 = ( 50503 => 'Sigma 16mm F1.4 DC DN | C', #JR (017) 50507 => 'Sigma 105mm F1.4 DG HSM | A', #IB (018) 50508 => 'Sigma 56mm F1.4 DC DN | C', #JR (018) + 50512 => 'Sigma 70-200mm F2.8 DG OS HSM | S', #IB (018) 50513 => 'Sigma 70mm F2.8 DG MACRO | A', #JR (018) 50992 => 'Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III', #JR @@ -7020,6 +7021,7 @@ my %pictureProfile2010 = ( # appears to be difference between used FNumber and MaxAperture, 256 being +1 APEX or stop # however, not always valid e.g. bracketing, Shutter-prio e.a. # difference between 0x0002 and 0x0004 mostly 0.0, 0.1 or 0.2 stops. + # 0x0020 - int16u[3]: all 0's when Silent Shooting / Electronic Shutter (ILCE-7S only) 0x0031 => { #JR Name => 'FlashStatus', RawConv => '$$self{FlashFired} = $val', @@ -7034,7 +7036,7 @@ my %pictureProfile2010 = ( }, }, 0x0032 => { #13 - Name => 'ImageCount', + Name => 'ShutterCount', # this seems to be valid for the A7R,A37,A57,A65,A77,A99,A99V and possibly the # NEX-5N/7. For the A99V it is definitely more than 16 bits, but it wraps at # 65536 for the A7R. @@ -7069,9 +7071,9 @@ my %pictureProfile2010 = ( # e.g for SAL70400G2: 9 5 5 64 69 74 79 84 89 94 98 104 255 105 89 80 # where 9 means 9 focal lengths: 64 ... 104, # corresponding to 70-400mm via FocalLength = 4.375*2**($val/16) -# 0x004c, 0x0051: E-Mount: ImageCount and dateTime +# 0x004c, 0x0051: E-Mount: ShutterCount and dateTime 0x004c => { # only ILCE-7/7R/7S/7M2/5000/5100/6000/QX1 - but appears not valid when flash is used ... - Name => 'ImageCount2', + Name => 'ShutterCount2', Condition => '($$self{Model} =~ /^(ILCE-(7(R|S|M2)?|[56]000|5100|QX1))\b/) and (($$self{FlashFired} & 0x01) != 1)', Format => 'int32u', RawConv => '$val & 0x00ffffff', @@ -7188,27 +7190,27 @@ my %pictureProfile2010 = ( # 0x012d => {Name=>'LensType',Format=>'int16u',Condition =>'$$self{Model}=~/^(SLT-A(37|57|65|77)V?|Lunar|NEX-(F3|5N|7|VG20E))/'}, # 0x012e => {Name=>'LensType',Format=>'int16u',Condition =>'$$self{Model}=~/^(SLT-A(58|99V?)|HV|ILCA-(68|77M2)|NEX-(3N|5R|5T|6|VG30E|VG900)|ILCE-(3000|3500|5000|5100|6000|7|7R|7S|7M2|QX1))/'}, -# ImageCount3 = ImageCount for SLT-A58, ILCE, ILCA, NEX-3N -# ImageCount-1 for SLT-A37,A57,A65,A77,A99, NEX-F3,5N,5R,5T,6,7, sometimes 0 -# ImageCount-2 for NEX-VG, and often 0; "ImageCount-2" also seen on a few A99V images -# The offset for ImageCount3 changes with firmware version for the ILCE-7/7R/7S/7M2, so don't decode it for now: +# ShutterCount3 = ShutterCount for SLT-A58, ILCE, ILCA, NEX-3N +# ShutterCount-1 for SLT-A37,A57,A65,A77,A99, NEX-F3,5N,5R,5T,6,7, sometimes 0 +# ShutterCount-2 for NEX-VG, and often 0; "ShutterCount-2" also seen on a few A99V images +# The offset for ShutterCount3 changes with firmware version for the ILCE-7/7R/7S/7M2, so don't decode it for now: # ILCE-7M2/7S: 0x01a0 (firmware 1.0x, 1.1x), 0x01b6 (firmware 1.20, 1.21, 2.00) # ILCE-7/7R: 0x01aa (firmware 1.0x, 1.1x), 0x01c0 (firmware 1.20, 1.21, 2.00) # Similarly for ILCE-6000 v2.00: 0x01aa --> 0x01c0: removed from 0x01aa 0x01a0 => { - Name => 'ImageCount3', + Name => 'ShutterCount3', Format => 'int32u', RawConv => '$val == 0 ? undef : $val', Condition => '$$self{Model} =~ /^(ILCE-(5100|QX1)|ILCA-(68|77M2))/', }, 0x01aa => { - Name => 'ImageCount3', + Name => 'ShutterCount3', Format => 'int32u', RawConv => '$val == 0 ? undef : $val', Condition => '$$self{Model} =~ /^(SLT-A(58|99V?)|HV|NEX-(3N|5R|5T|6|VG900|VG30E)|ILCE-([35]000|3500))\b/', }, 0x01bd => { - Name => 'ImageCount3', + Name => 'ShutterCount3', Format => 'int32u', RawConv => '$val == 0 ? undef : $val', Condition => '$$self{Model} =~ /^(SLT-A(37|57|65|77)V?|Lunar|NEX-(F3|5N|7|VG20E))/', @@ -7273,6 +7275,14 @@ my %pictureProfile2010 = ( PrintConv => 'sprintf("%.0f",$val)', PrintConvInv => '$val', }, + # 0x0026 - int16u[3]: all 0's when Silent Shooting / Electronic Shutter + 0x002c => { + Name => 'Shutter', + PrintConv => { + 0 => 'Silent / Electronic', + 56 => 'Mechanical', + }, + }, 0x0039 => { Name => 'FlashStatus', RawConv => '$$self{FlashFired} = $val', @@ -7287,7 +7297,7 @@ my %pictureProfile2010 = ( }, }, 0x003a => { - Name => 'ImageCount', + Name => 'ShutterCount', # or "ShutterCount"? : number of shutter actuations, does not increase during Silent Shooting, # at least for ILCE-7RM2 Format => 'int32u', @@ -7315,7 +7325,7 @@ my %pictureProfile2010 = ( %releaseMode2, }, 0x0052 => { - Name => 'ImageCount2', + Name => 'ShutterCount2', Condition => '(($$self{FlashFired} & 0x01) != 1) and ($$self{Model} =~ /^(ILCE-(7M3|7RM3))/)', Format => 'int32u', RawConv => '$val & 0x00ffffff', @@ -7325,9 +7335,9 @@ my %pictureProfile2010 = ( # e.g for SAL70400G2: 9 5 5 64 69 74 79 84 89 94 98 104 255 105 89 80 # where 9 means 9 focal lengths: 64 ... 104, # corresponding to 70-400mm via FocalLength = 4.375*2**($val/16) -# 0x0058, 0x0061: E-Mount: ImageCount and dateTime +# 0x0058, 0x0061: E-Mount: ShutterCount and dateTime 0x0058 => { # appears not valid when flash is used ... not for ILCA-99M2 - Name => 'ImageCount2', + Name => 'ShutterCount2', Condition => '(($$self{FlashFired} & 0x01) != 1) and ($$self{Model} !~ /^(ILCA-99M2|ILCE-(7M3|7RM3))/)', Format => 'int32u', RawConv => '$val & 0x00ffffff', @@ -7413,19 +7423,19 @@ my %pictureProfile2010 = ( # tags becoming model- and/or firmware-dependent from here. # 0x019f => { - Name => 'ImageCount3', + Name => 'ShutterCount3', Condition => '$$self{Model} =~ /^(ILCE-(7M3|7RM3|9))/', Format => 'int32u', RawConv => '$val == 0 ? undef : $val', }, 0x01cb => { - Name => 'ImageCount3', + Name => 'ShutterCount3', Condition => '$$self{Model} =~ /^(ILCE-(7RM2|7SM2))/', Format => 'int32u', RawConv => '$val == 0 ? undef : $val', }, 0x01cd => { - Name => 'ImageCount3', + Name => 'ShutterCount3', Condition => '$$self{Model} =~ /^(ILCE-(6300|6500)|ILCA-99M2)/', Format => 'int32u', RawConv => '$val == 0 ? undef : $val', diff --git a/lib/Image/ExifTool/TagLookup.pm b/lib/Image/ExifTool/TagLookup.pm index 18cfb284..543349ca 100644 --- a/lib/Image/ExifTool/TagLookup.pm +++ b/lib/Image/ExifTool/TagLookup.pm @@ -604,20 +604,18 @@ my %tagLookup = ( 'afadjustment' => { 336 => 0x72, 345 => 0x267 }, 'afandmeteringbuttons' => { 78 => 0x701 }, 'afaperture' => { 207 => 0x5, 208 => 0x5, 212 => 0x5 }, - 'afareacolumn' => { 183 => 0x2f }, - 'afareaheight' => { 183 => [0x1a,0x50] }, + 'afareaheight' => { 183 => [0x1a,0x34,0x50] }, 'afareaillumination' => { 174 => 0x4b, 272 => '15.3' }, 'afareamode' => { 120 => '0.2', 170 => 0x33, 174 => 0xe, 182 => 0x0, 183 => 0x5, 301 => 0xf, 362 => 0x1205, 373 => [0xa,0x3a], 380 => 0x11, 381 => 0x10, 382 => 0x24, 392 => 0xb043, 415 => 0x17 }, 'afareamodesetting' => { 263 => '11.1', 266 => '0.1', 272 => '16.1', 276 => '2.1', 392 => 0x201c }, 'afareapointsize' => { 120 => '0.3' }, - 'afarearow' => { 183 => 0x31 }, 'afareas' => { 278 => 0x304 }, 'afareaselectionmethod' => { 2 => 0xd }, 'afareaselectmethod' => { 78 => 0x51b }, - 'afareawidth' => { 183 => [0x18,0x4e] }, - 'afareaxposition' => { 183 => [0x14,0x4a], 362 => 0x1203 }, + 'afareawidth' => { 183 => [0x18,0x32,0x4e] }, + 'afareaxposition' => { 183 => [0x14,0x2e,0x4a], 362 => 0x1203 }, 'afareaxposition1' => { 362 => 0x1201 }, - 'afareayposition' => { 183 => [0x16,0x4c], 362 => 0x1204 }, + 'afareayposition' => { 183 => [0x16,0x30,0x4c], 362 => 0x1204 }, 'afareayposition1' => { 362 => 0x1202 }, 'afareazonesize' => { 120 => '0.4' }, 'afassist' => { 76 => 0x5, 84 => 0x5, 174 => 0x48, 261 => '2.5', 263 => '0.2', 266 => '0.2', 267 => '1.1', 268 => '1.1', 269 => '1.3', 270 => '2.4', 271 => '1.3', 272 => '0.2', 274 => '2.4', 276 => '2.3' }, @@ -638,8 +636,8 @@ my %tagLookup = ( 'affiney' => { 439 => 'AffineY' }, 'afhold' => { 312 => 0x1fd }, 'afilluminator' => { 380 => 0x29, 392 => 0xb044 }, - 'afimageheight' => { 183 => [0x12,0x48] }, - 'afimagewidth' => { 183 => [0x10,0x46] }, + 'afimageheight' => { 183 => [0x12,0x2c,0x48] }, + 'afimagewidth' => { 183 => [0x10,0x2a,0x46] }, 'afintegrationtime' => { 312 => 0x7 }, 'afmicroadj' => { 373 => [0x17d,0x50] }, 'afmicroadjmode' => { 3 => 0x1, 377 => 0x131 }, @@ -2873,9 +2871,7 @@ my %tagLookup = ( 'imageareaoffset' => { 336 => 0x38 }, 'imageauthentication' => { 214 => 0x20 }, 'imageboundary' => { 214 => 0x16 }, - 'imagecount' => { 121 => 0x1438, 214 => 0xa5, 395 => 0x11b, 410 => 0x32, 411 => 0x3a }, - 'imagecount2' => { 410 => 0x4c, 411 => [0x52,0x58] }, - 'imagecount3' => { 410 => [0x1a0,0x1aa,0x1bd], 411 => [0x19f,0x1cb,0x1cd] }, + 'imagecount' => { 121 => 0x1438, 214 => 0xa5, 395 => 0x11b }, 'imagecreator' => { 288 => 'ImageCreator' }, 'imagecreatorid' => { 288 => [\'ImageCreator','ImageCreatorImageCreatorID'] }, 'imagecreatorimageid' => { 288 => 'ImageCreatorImageID' }, @@ -3439,6 +3435,7 @@ my %tagLookup = ( 'makernotekodakunknown' => { 111 => 'MakN', 113 => 0x927c }, 'makernotekyocera' => { 111 => 'MakN', 113 => 0x927c }, 'makernoteleica' => { 111 => 'MakN', 113 => 0x927c }, + 'makernoteleica10' => { 111 => 'MakN', 113 => 0x927c }, 'makernoteleica2' => { 111 => 'MakN', 113 => 0x927c }, 'makernoteleica3' => { 111 => 'MakN', 113 => 0x927c }, 'makernoteleica4' => { 111 => 'MakN', 113 => 0x927c }, @@ -4952,10 +4949,13 @@ my %tagLookup = ( 'shownevent' => { 456 => 'EventExt' }, 'showneventidentifier' => { 456 => [\'EventExt','EventExtIdentifier'] }, 'showneventname' => { 456 => [\'EventExt','EventExtName'] }, + 'shutter' => { 411 => 0x2c }, 'shutter-aelock' => { 76 => 0x4, 78 => 0x701, 79 => 0x3, 80 => 0x4, 81 => 0x3, 82 => 0x3, 83 => 0x4, 84 => 0x2 }, 'shutteraelbutton' => { 77 => 0x4 }, 'shutterbuttonafonbutton' => { 78 => 0x701 }, - 'shuttercount' => { 10 => 0x176, 54 => 0x1, 214 => 0xa7, 223 => [0x6a,0x157,0x24d], 224 => 0x286, 225 => 0x279, 226 => 0x284, 227 => 0x242, 228 => 0x280, 229 => 0x276, 230 => [0x27d,0x27f], 231 => 0x246, 234 => 0x2d6, 235 => 0x321, 236 => 0xbd8, 237 => 0x287, 238 => 0x320, 239 => 0x24a, 240 => 0x5fb, 243 => 0x2d5, 336 => 0x5d, 391 => 0x846, 395 => [0x125,0x14a] }, + 'shuttercount' => { 10 => 0x176, 54 => 0x1, 214 => 0xa7, 223 => [0x6a,0x157,0x24d], 224 => 0x286, 225 => 0x279, 226 => 0x284, 227 => 0x242, 228 => 0x280, 229 => 0x276, 230 => [0x27d,0x27f], 231 => 0x246, 234 => 0x2d6, 235 => 0x321, 236 => 0xbd8, 237 => 0x287, 238 => 0x320, 239 => 0x24a, 240 => 0x5fb, 243 => 0x2d5, 336 => 0x5d, 391 => 0x846, 395 => [0x125,0x14a], 410 => 0x32, 411 => 0x3a }, + 'shuttercount2' => { 410 => 0x4c, 411 => [0x52,0x58] }, + 'shuttercount3' => { 410 => [0x1a0,0x1aa,0x1bd], 411 => [0x19f,0x1cb,0x1cd] }, 'shuttercurtainsync' => { 76 => 0xf, 77 => 0xf, 78 => 0x305, 79 => 0xe, 80 => 0xf, 81 => 0x8, 82 => 0x8, 83 => 0xf, 84 => 0x8 }, 'shuttermode' => { 133 => 0x1b, 214 => 0x34 }, 'shutterreleasebuttonae-l' => { 261 => '17.7', 262 => '18.4', 264 => '78.4', 265 => '78.4', 266 => '16.1', 267 => '17.1', 268 => '17.1', 269 => '17.1', 270 => '7.1', 271 => '17.5', 274 => '18.4', 275 => '78.4', 276 => '18.2' }, @@ -9731,7 +9731,6 @@ my %tagExists = ( 'shotinfoversion' => 1, 'showmode' => 1, 'showobjects' => 1, - 'shutter' => 1, 'shuttercurtainhack' => 1, 'shutterspeed' => 1, 'shutterspeeddisplayed' => 1, diff --git a/lib/Image/ExifTool/TagNames.pod b/lib/Image/ExifTool/TagNames.pod index 8268de25..68d479f4 100644 --- a/lib/Image/ExifTool/TagNames.pod +++ b/lib/Image/ExifTool/TagNames.pod @@ -649,6 +649,7 @@ official EXIF 2.31 specification. MakerNoteLeica7 ExifIFD Panasonic Leica6 MakerNoteLeica8 ExifIFD Panasonic Leica5 MakerNoteLeica9 ExifIFD Panasonic Leica9 + MakerNoteLeica10 ExifIFD Panasonic MakerNotePanasonic ExifIFD Panasonic MakerNotePanasonic2 ExifIFD Panasonic Type2 MakerNotePanasonic3 ExifIFD Panasonic @@ -11763,6 +11764,7 @@ These tags are written by Nikon DSLR's which have the live view feature. AFPointsUsed undef[21] AFPointsUsed undef[29] AFPointsUsed undef[20] + AFPointsUsed undef[62] AFPointsUsed undef[7] 16 AFImageWidth int16u 18 AFImageHeight int16u @@ -11771,8 +11773,12 @@ These tags are written by Nikon DSLR's which have the live view feature. 24 AFAreaWidth int16u 26 AFAreaHeight int16u 28 ContrastDetectAFInFocus int8u - 47 AFAreaColumn int8u - 49 AFAreaRow int8u + 42 AFImageWidth int16u + 44 AFImageHeight int16u + 46 AFAreaXPosition int16u + 48 AFAreaYPosition int16u + 50 AFAreaWidth int16u + 52 AFAreaHeight int16u 68 PrimaryAFPoint int8u 70 AFImageWidth int16u 72 AFImageHeight int16u @@ -16865,11 +16871,11 @@ substitution cipher, but the deciphered values are listed below. 0x0000 SonyMaxAperture int8u 0x0001 SonyMinAperture int8u 0x0031 FlashStatus int8u - 0x0032 ImageCount int32u + 0x0032 ShutterCount int32u 0x003a SonyExposureTime int16u 0x003c SonyFNumber int16u 0x003f ReleaseMode2 int8u - 0x004c ImageCount2 int32u + 0x004c ShutterCount2 int32u 0x0051 SonyDateTime2 undef[6] 0x0067 ReleaseMode2 int8u 0x007c InternalSerialNumber int8u[4]~ @@ -16881,9 +16887,9 @@ substitution cipher, but the deciphered values are listed below. 0x010b DistortionCorrParamsPresent int8u 0x0115 LensSpecFeatures undef[2] 0x0116 LensSpecFeatures undef[2] - 0x01a0 ImageCount3 int32u - 0x01aa ImageCount3 int32u - 0x01bd ImageCount3 int32u + 0x01a0 ShutterCount3 int32u + 0x01aa ShutterCount3 int32u + 0x01bd ShutterCount3 int32u =head3 Sony Tag9050b Tags @@ -16893,13 +16899,14 @@ Valid from July 2015 for ILCE-6300/6500/7M3/7RM2/7RM3/7SM2/9, ILCA-99M2. ------ -------- -------- 0x0000 SonyMaxAperture int8u 0x0001 SonyMinAperture int8u + 0x002c Shutter int8u 0x0039 FlashStatus int8u - 0x003a ImageCount int32u + 0x003a ShutterCount int32u 0x0046 SonyExposureTime int16u 0x0048 SonyFNumber int16u 0x004b ReleaseMode2 int8u - 0x0052 ImageCount2 int32u~ - 0x0058 ImageCount2 int32u + 0x0052 ShutterCount2 int32u~ + 0x0058 ShutterCount2 int32u 0x0061 SonyTimeMinSec no 0x0073 ReleaseMode2 int8u 0x0088 InternalSerialNumber int8u[6]~ @@ -16909,9 +16916,9 @@ Valid from July 2015 for ILCE-6300/6500/7M3/7RM2/7RM3/7SM2/9, ILCA-99M2. 0x0109 LensType int16u 0x010b DistortionCorrParamsPresent int8u 0x0116 LensSpecFeatures undef[2] - 0x019f ImageCount3 int32u - 0x01cb ImageCount3 int32u - 0x01cd ImageCount3 int32u + 0x019f ShutterCount3 int32u + 0x01cb ShutterCount3 int32u + 0x01cd ShutterCount3 int32u 0x021c LensSpecFeatures undef[2] 0x021e LensSpecFeatures undef[2] @@ -17600,6 +17607,7 @@ still proprietary) Adobe format. MakerNoteLeica7 Panasonic Leica6 MakerNoteLeica8 Panasonic Leica5 MakerNoteLeica9 Panasonic Leica9 + MakerNoteLeica10 Panasonic MakerNotePanasonic Panasonic MakerNotePanasonic2 Panasonic Type2 MakerNotePanasonic3 Panasonic @@ -33156,6 +33164,7 @@ for more details. MakerNoteLeica7 MakerNoteLeica8 MakerNoteLeica9 + MakerNoteLeica10 MakerNotePanasonic MakerNotePanasonic2 MakerNotePanasonic3 diff --git a/lib/Image/ExifTool/WriteXMP.pl b/lib/Image/ExifTool/WriteXMP.pl index 88c4f3bf..47c2e493 100644 --- a/lib/Image/ExifTool/WriteXMP.pl +++ b/lib/Image/ExifTool/WriteXMP.pl @@ -990,6 +990,7 @@ sub WriteXMP($$;$) my (%attrs, $deleted, $added, $existed); # delete existing entry if necessary if ($isStruct) { + # delete all structure (or pseudo-structure) elements require 'Image/ExifTool/XMPStruct.pl'; ($deleted, $added, $existed) = DeleteStruct($et, \%capture, \$path, $nvHash, \$changed); next unless $deleted or $added or $et->IsOverwriting($nvHash); diff --git a/perl-Image-ExifTool.spec b/perl-Image-ExifTool.spec index 3d4c02d9..1e77ed97 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.24 +Version: 11.25 Release: 1 License: Artistic/GPL Group: Development/Libraries/Perl diff --git a/windows_exiftool b/windows_exiftool index ca74e5b4..77f022e6 100755 --- a/windows_exiftool +++ b/windows_exiftool @@ -12,7 +12,7 @@ use strict; require 5.004; -my $version = '11.24'; +my $version = '11.25'; # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool' my $exeDir; @@ -1012,6 +1012,7 @@ for (;;) { /^(m|ignoreminorerrors)$/i and $mt->Options(IgnoreMinorErrors => 1), next; /^(n|-printconv)$/i and $mt->Options(PrintConv => 0), next; /^(-n|printconv)$/i and $mt->Options(PrintConv => 1), next; + $a eq 'nop' and $helped=1, next; # (no operation) if (/^o(ut)?$/i) { $outOpt = shift; defined $outOpt or Error("Expected output file or directory name for -o option\n"), $badCmd=1, next; @@ -5089,7 +5090,7 @@ OPTIONS produces output like this: - -- Generated by ExifTool 11.24 -- + -- Generated by ExifTool 11.25 -- 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 @@ -6158,9 +6159,9 @@ WINDOWS UNICODE FILE NAMES with "-charset filename=CHARSET", where "CHARSET" is the name of a valid ExifTool character set, preferably "UTF8" (see the -charset option for a complete list). Setting this triggers the use of Windows wide-character - i/o routines, thus providing support for all Unicode file names. But - note that it is not trivial to pass properly encoded file names on the - Windows command line (see + i/o routines, thus providing support for most Unicode file names (see + note 4). But note that it is not trivial to pass properly encoded file + names on the Windows command line (see <http://owl.phy.queensu.ca/~phil/exiftool/faq.html#Q18> for details), so placing them in a UTF-8 encoded -@ argfile and using "-charset filename=utf8" is recommended if possible. @@ -6195,6 +6196,9 @@ WINDOWS UNICODE FILE NAMES 3) See "WRITING READ-ONLY FILES" below for a note about editing read-only files with Unicode names. + 4) Unicode file names with surrogate pairs (code points over U+FFFF) + still cause problems. + WRITING READ-ONLY FILES In general, ExifTool may be used to write metadata to read-only files provided that the user has write permission in the directory. However, |