exiftool_vendored 11.90.0 → 11.91.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5677eed13951b747ce733d83056cd3ae7955318d
-  data.tar.gz: '0387be38d3952cedb4a7c641370bc6b131ad79e4'
+  metadata.gz: 4b56d18c61911252c42a22f6e39707ac57862cf5
+  data.tar.gz: caf3c917be76228cbff49eb7d63d88691fe0823b
 SHA512:
-  metadata.gz: 0d54ba249ad0f882b0d647160227a456d97ae11ee56a2f39770bc85dfd1b355b98b7f587fc5eaed17d7056dd4a220c761ce8942449d893acdb65a63c476db927
-  data.tar.gz: ae57fea277abb94cacd789c4b36c077bdb76e4bf3c30dd8bc72d445eab9a3e6651fabd0c1a758364a085cd1a533dfa724618db3adf58adc7f4ab635b77e00f80
+  metadata.gz: 28a21c824112d691d80bf60d1f4452cbdcb1e5359d8df8e2affd7dc1f07b95d8e00057e3efeed5e1a440d70c19cba726bed5fbf4e3185e31b62b57f657345259
+  data.tar.gz: aa4f7c3ce6057b14c1673125ad4e06344c62fa947e2037322e016fba345501ed40bd5712eb28785abcc93608ad5127411fac803175f22757f800951bc523f094

data/bin/Changes

@@ -7,10 +7,17 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 11.85. (Other versions are
 considered development releases, and are not uploaded to CPAN.)
 
+Mar. 5, 2020 - Version 11.91
+
+  - Decode a couple of new Panasonic tags
+  - Documented -ec option (available since version 11.54)
+  - Reverted -htmlDump fix of 11.90 because it broke more than it fixed, and
+    instead applied a targeted patch to fix this problem for RW2 files
+
 Mar. 3, 2020 - Version 11.90
 
   - Added a new Sony LensType (thanks LibRaw and Jos Roost)
-  - Aded two new Olypus LensType values
+  - Added two new Olympus LensType values
   - Added a new Canon LensType
   - Added some new Canon RecordMode values
   - Added some new QuickTime GeneralProfileIDC values

data/bin/META.json

@@ -47,6 +47,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "11.90",
+   "version" : "11.91",
    "x_serialization_backend" : "JSON::PP version 4.02"
 }

data/bin/META.yml

@@ -28,5 +28,5 @@ recommends:
   Time::HiRes: '0'
 requires:
   perl: '5.004'
-version: '11.90'
+version: '11.91'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

data/bin/README

@@ -105,8 +105,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.90.tar.gz | tar -xf -
-  cd Image-ExifTool-11.90
+  gzip -dc Image-ExifTool-11.91.tar.gz | tar -xf -
+  cd Image-ExifTool-11.91
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/exiftool

@@ -10,13 +10,15 @@
 use strict;
 require 5.004;
 
-my $version = '11.90';
+my $version = '11.91';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
 BEGIN {
+    # (undocumented -xpath option added in 11.91, must come before other options)
+    $Image::ExifTool::exePath = @ARGV && lc($ARGV[0]) eq '-xpath' && shift() ? $^X : $0;
     # get exe directory
-    $exeDir = ($0 =~ /(.*)[\\\/]/) ? $1 : '.';
+    $exeDir = ($Image::ExifTool::exePath =~ /(.*)[\\\/]/) ? $1 : '.';
     if (-l $0) {
         my $lnk = eval { readlink $0 };
         if (defined $lnk) {
@@ -842,7 +844,7 @@ for (;;) {
     (/^e$/ or $a eq '-composite') and $mt->Options(Composite => 0), next;
     (/^-e$/ or $a eq 'composite') and $mt->Options(Composite => 1), next;
     (/^E$/ or $a eq 'escapehtml') and require Image::ExifTool::HTML and $escapeHTML = 1, next;
-    ($a eq 'ec' or $a eq 'escapec') and $escapeC = 1, next; # (undocumented) added in 11.54
+    ($a eq 'ec' or $a eq 'escapec') and $escapeC = 1, next;
     ($a eq 'ex' or $a eq 'escapexml') and $escapeXML = 1, next;
     if (/^echo(\d)?$/i) {
         my $n = $1 || 1;
@@ -4390,7 +4392,7 @@ L<Input-output text formatting|/Input-output text formatting>
   -csv[[+]=CSVFILE]                Export/import tags in CSV format
   -d FMT      (-dateFormat)        Set format for date/time values
   -D          (-decimal)           Show tag ID numbers in decimal
-  -E, -ex     (-escape(HTML|XML))  Escape values for HTML (-E) or XML (-ex)
+  -E,-ex,-ec  (-escape(HTML|XML|C))Escape tag values for HTML, XML or C
   -f          (-forcePrint)        Force printing of all specified tags
   -g[NUM...]  (-groupHeadings)     Organize output by tag group
   -G[NUM...]  (-groupNames)        Print group name for each tag
@@ -4421,7 +4423,7 @@ L<Input-output text formatting|/Input-output text formatting>
 L<Processing control|/Processing control>
 
   -a          (-duplicates)        Allow duplicate tags to be extracted
-  -e          (--composite)        Do not calculate composite tags
+  -e          (--composite)        Do not generate composite tags
   -ee         (-extractEmbedded)   Extract information from embedded files
   -ext[+] EXT (-extension)         Process files with specified extension
   -F[OFFSET]  (-fixBase)           Fix the base for maker notes offsets
@@ -4969,14 +4971,15 @@ writing.
 
 Show tag ID number in decimal when extracting information.
 
-=item B<-E>, B<-ex> (B<-escapeHTML>, B<-escapeXML>)
+=item B<-E>, B<-ex>, B<-ec> (B<-escapeHTML>, B<-escapeXML>, B<-escapeC>)
 
-Escape characters in output values for HTML (B<-E>) or XML (B<-ex>).  For
-HTML, all characters with Unicode code points above U+007F are escaped as
-well as the following 5 characters: & (&amp;) E<39> (&#39;) E<quot> (&quot;)
-E<gt> (&gt;) and E<lt> (&lt;).  For XML, only these 5 characters are
-escaped.  The B<-E> option is implied with B<-h>, and B<-ex> is implied with
-B<-X>.  The inverse conversion is applied when writing tags.
+Escape characters in output tag values for HTML (B<-E>), XML (B<-ex>) or C
+(B<-ec>).  For HTML, all characters with Unicode code points above U+007F
+are escaped as well as the following 5 characters: & (&amp;) E<39> (&#39;)
+E<quot> (&quot;) E<gt> (&gt;) and E<lt> (&lt;).  For XML, only these 5
+characters are escaped.  The B<-E> option is implied with B<-h>, and B<-ex>
+is implied with B<-X>.  For C, all control characters and the backslash are
+escaped.  The inverse conversion is applied when writing tags.
 
 =item B<-f> (B<-forcePrint>)
 
@@ -5203,7 +5206,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 11.90 --
+    -- Generated by ExifTool 11.91 --
     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
@@ -5540,7 +5543,7 @@ when copying.
 
 =item B<-e> (B<--composite>)
 
-Extract existing tags only -- don't calculate composite tags.
+Extract existing tags only -- don't generate composite tags.
 
 =item B<-ee> (B<-extractEmbedded>)
 

data/bin/lib/Image/ExifTool.pm

@@ -26,9 +26,9 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             $psAPP13hdr $psAPP13old @loadAllTables %UserDefined $evalWarning
             %noWriteFile %magicNumber @langs $defaultLang %langName %charsetName
             %mimeType $swapBytes $swapWords $currentByteOrder %unpackStd
-            %jpegMarker %specialTags %fileTypeLookup $testLen);
+            %jpegMarker %specialTags %fileTypeLookup $testLen $exePath);
 
-$VERSION = '11.90';
+$VERSION = '11.91';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -8519,7 +8519,8 @@ until ($Image::ExifTool::noConfig) {
         $file = $config;
     }
     # also check executable directory unless path is absolute
-    -r $file or $config =~ /^\// or $file = ($0 =~ /(.*[\\\/])/ ? $1 : './') . $config;
+    $exePath = $0 unless defined $exePath; # (undocumented $exePath setting)
+    -r $file or $config =~ /^\// or $file = ($exePath =~ /(.*[\\\/])/ ? $1 : './') . $config;
     unless (-r $file) {
         warn("Config file not found\n") if defined $Image::ExifTool::configFile;
         last;

data/bin/lib/Image/ExifTool.pod

@@ -977,8 +977,8 @@ user parameters (with lower-case names).
 
 =item Validate
 
-Flag to perform extra validation checks when reading, causing extra warnings
-to be generated if problems are found.  Default is undef.
+Flag to perform extra validation metadata checks when reading, causing extra
+warnings to be generated if problems are found.  Default is undef.
 
 =item Verbose
 

data/bin/lib/Image/ExifTool/Exif.pm

@@ -56,7 +56,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '4.28';
+$VERSION = '4.29';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -1655,7 +1655,7 @@ my %opcodeInfo = (
     0x82aa => 'MDPrepDate', #3
     0x82ab => 'MDPrepTime', #3
     0x82ac => 'MDFileUnits', #3
-    0x830e => { #30
+    0x830e => { #30 (GeoTiff)
         Name => 'PixelScale',
         Writable => 'double',
         WriteGroup => 'IFD0',
@@ -1687,14 +1687,14 @@ my %opcodeInfo = (
     },
     0x847e => 'IntergraphPacketData', #3
     0x847f => 'IntergraphFlagRegisters', #3
-    0x8480 => { #30 (obsolete)
+    0x8480 => { #30 (GeoTiff, obsolete)
         Name => 'IntergraphMatrix',
         Writable => 'double',
         WriteGroup => 'IFD0',
         Count => -1,
     },
     0x8481 => 'INGRReserved', #20
-    0x8482 => { #30
+    0x8482 => { #30 (GeoTiff)
         Name => 'ModelTiePoint',
         Groups => { 2 => 'Location' },
         Writable => 'double',
@@ -1762,7 +1762,7 @@ my %opcodeInfo = (
     },
     0x85b8 => 'PixelMagicJBIGOptions', #20
     0x85d7 => 'JPLCartoIFD', #exifprobe (NC)
-    0x85d8 => { #30
+    0x85d8 => { #30 (GeoTiff)
         Name => 'ModelTransform',
         Groups => { 2 => 'Location' },
         Writable => 'double',
@@ -6152,8 +6152,8 @@ sub ProcessExif($$$)
                           "Format: $fstr\nSize: $size bytes\n";
                 if ($size > 4) {
                     my $offPt = Get32u($dataPt,$entry+8);
-                    # (test this with ../pics/{CanonEOS-1DXMarkIII.hif,PanasonicDC-G9.rw2})
-                    my $actPt = $valuePtr + $valueDataPos + $base + $$et{BASE};
+                    # (test this with ../pics/{CanonEOS-1D_XMarkIII.hif,PanasonicDC-G9.rw2})
+                    my $actPt = $valuePtr + $valueDataPos + $base - ($$et{EXIF_POS} || 0) + ($$et{BASE_FUDGE} || 0);
                     $tip .= sprintf("Value offset: 0x%.4x\n", $offPt);
                     # highlight tag name (red for bad size)
                     my $style = ($bad or not defined $tval) ? 'V' : 'H';
@@ -6181,7 +6181,7 @@ sub ProcessExif($$$)
                     } elsif ($tagInfo and Image::ExifTool::IsInt($tval)) {
                         if ($$tagInfo{IsOffset} or $$tagInfo{SubIFD}) {
                             $tval = sprintf('0x%.4x', $tval);
-                            my $actPt = $val + $base + $$et{BASE};
+                            my $actPt = $val + $base - ($$et{EXIF_POS} || 0) + ($$et{BASE_FUDGE} || 0);
                             if ($actPt != $val) {
                                 $tval .= sprintf("\nActual offset: 0x%.4x", $actPt);
                                 my $sign = $actPt < $val ? '-' : '';

data/bin/lib/Image/ExifTool/MWG.pm

@@ -460,7 +460,8 @@ my %sKeywordStruct;
     NOTES => q{
         Image region metadata defined by the MWG 2.0 specification.  These tags
         may be accessed without the need to load the MWG Composite tags above.  See
-        L<http://www.metadataworkinggroup.org/> for the official specification.
+        L<https://web.archive.org/web/20181006115950/http://www.metadataworkinggroup.org/specs/>
+        for the official specification.
     },
     Regions => {
         Name => 'RegionInfo',
@@ -488,8 +489,9 @@ my %sKeywordStruct;
         Hierarchical keywords metadata defined by the MWG 2.0 specification. 
         ExifTool unrolls keyword structures to an arbitrary depth of 6 to allow
         individual levels to be accessed with different tag names, and to avoid
-        infinite recursion.  See L<http://www.metadataworkinggroup.org/> for the
-        official specification.
+        infinite recursion.  See
+        L<https://web.archive.org/web/20181006115950/http://www.metadataworkinggroup.org/specs/>
+        for the official specification.
     },
     # arbitrarily define only the first 6 levels of the keyword hierarchy
     Keywords => {
@@ -527,7 +529,8 @@ my %sKeywordStruct;
     NAMESPACE => 'mwg-coll',
     NOTES => q{
         Collections metadata defined by the MWG 2.0 specification.  See
-        L<http://www.metadataworkinggroup.org/> for the official specification.
+        L<https://web.archive.org/web/20181006115950/http://www.metadataworkinggroup.org/specs/>
+        for the official specification.
     },
     Collections => {
         FlatName => '',

data/bin/lib/Image/ExifTool/Panasonic.pm

@@ -36,7 +36,7 @@ use vars qw($VERSION %leicaLensTypes);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.07';
+$VERSION = '2.08';
 
 sub ProcessLeicaLEIC($$$);
 sub WhiteBalanceConv($;$$);
@@ -1270,6 +1270,25 @@ my %shootingMode = (
         Writable => 'int16u',
         PrintConv => { 0 => 'Off', 1 => 'Auto' },
     },
+    # Note: LensTypeMake and LensTypeModel are combined into a Composite LensType tag
+    # defined in Olympus.pm which has the same values as Olympus:LensType
+    0xc4 => { #PH
+        Name => 'LensTypeMake',
+        Condition => '$format eq "int16u"',
+        Writable => 'int16u',
+    },
+    0xc5 => { #PH
+        Name => 'LensTypeModel',
+        Condition => '$format eq "int16u"',
+        Writable => 'int16u',
+        RawConv => q{
+            return undef unless $val;
+            require Image::ExifTool::Olympus; # (to load Composite LensID)
+            return $val;
+        },
+        ValueConv => '$_=sprintf("%.4x",$val); s/(..)(..)/$2 $1/; $_',
+        ValueConvInv => '$val =~ s/(..) (..)/$2$1/; hex($val)',
+    },
     0xd1 => { #PH
         Name => 'ISO',
         RawConv => '$val > 0xfffffff0 ? undef : $val',

data/bin/lib/Image/ExifTool/PanasonicRaw.pm

@@ -21,7 +21,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.24';
+$VERSION = '1.25';
 
 sub ProcessJpgFromRaw($$$);
 sub WriteJpgFromRaw($$$);
@@ -818,7 +818,10 @@ sub ProcessJpgFromRaw($$$)
         $out = $et->Options('TextOut');
         print $out '--- DOC1:JpgFromRaw ',('-'x56),"\n";
     }
+    # fudge HtmlDump base offsets to show as a stand-alone JPEG
+    $$et{BASE_FUDGE} = $$et{BASE};
     my $rtnVal = $et->ProcessJPEG(\%dirInfo);
+    $$et{BASE_FUDGE} = 0;
     # restore necessary variables for continued RW2/RWL processing
     $$et{BASE} = 0;
     $$et{FILE_TYPE} = 'TIFF';

data/bin/lib/Image/ExifTool/TagLookup.pm

@@ -3466,6 +3466,8 @@ my %tagLookup = (
 	'lenstype' => { 7 => 0xe2, 8 => 0xd, 9 => 0x1a7, 10 => 0xc, 11 => 0x111, 12 => 0xc, 13 => 0x14f, 14 => 0xd6, 15 => 0xde, 16 => 0xf6, 17 => 0xea, 18 => 0xff, 19 => [0xc,0x97], 20 => 0xe6, 21 => 0x153, 22 => 0xea, 23 => 0xe8, 24 => 0x127, 25 => 0x161, 26 => 0x166, 27 => 0x184, 28 => 0x112, 29 => 0x189, 34 => 0x16, 181 => 0x10c, 182 => 0x49bd, 219 => 0x83, 284 => 0x201, 297 => 0x16, 301 => 0x310, 303 => 0x303, 304 => 0x303, 306 => 0x51, 308 => 0x3405, 333 => 0x0, 334 => 0x0, 335 => 0x1, 336 => 0x1, 337 => 0x1, 339 => 0x0, 380 => 0xa003, 383 => 0x27, 406 => 0xb027, 418 => 0x1896, 420 => 0x18c2, 421 => 0x18f2, 422 => 0x17f6, 424 => 0x109, 425 => 0x109, 434 => 0x608, 435 => 0x62 },
 	'lenstype2' => { 395 => 0x3f7, 418 => 0x1893, 420 => 0x18bf, 421 => 0x18ef, 422 => 0x17f3, 424 => 0x107, 425 => 0x107, 434 => 0x605, 435 => 0x60 },
 	'lenstype3' => { 438 => 0x9 },
+	'lenstypemake' => { 306 => 0xc4 },
+	'lenstypemodel' => { 306 => 0xc5 },
 	'lenszoomposition' => { 431 => 0x19, 432 => 0x1e, 435 => [0x342,0x34e,0x35a] },
 	'levelindicator' => { 314 => 0x15 },
 	'levelmeter' => { 366 => ['Lvlm','lvlm'] },
@@ -8643,8 +8645,6 @@ my %tagExists = (
 	'lensrec' => 1,
 	'lensshading' => 1,
 	'lenstableindex' => 1,
-	'lenstypemake' => 1,
-	'lenstypemodel' => 1,
 	'levelinfo' => 1,
 	'libraryid' => 1,
 	'libraryname' => 1,

data/bin/lib/Image/ExifTool/TagNames.pod

@@ -12,7 +12,7 @@ meta information extracted from or written to a file.
 =head1 TAG TABLES
 
 The tables listed below give the names of all tags recognized by ExifTool.
-They contain a total of 23351 tags, with 15303 unique tag names.
+They contain a total of 23353 tags, with 15303 unique tag names.
 
 B<Tag ID>, B<Index#> or B<Sequence> is given in the first column of each
 table.  A B<Tag ID> is the computer-readable equivalent of a tag name, and
@@ -14972,6 +14972,8 @@ These tags are used in Panasonic/Leica cameras.
   0x00b9   RedEyeRemoval                        int16u
   0x00bb   VideoBurstMode                       int32u
   0x00bc   DiffractionCorrection                int16u
+  0x00c4   LensTypeMake                         int16u
+  0x00c5   LensTypeModel                        int16u
   0x00d1   ISO                                  int32u
   0x00d6   NoiseReductionStrength               rational64s
   0x0e00   PrintIM                              PrintIM
@@ -34859,7 +34861,8 @@ implements this policy and changes EXIF:Artist to a list-type tag.
 
 Image region metadata defined by the MWG 2.0 specification.  These tags
 may be accessed without the need to load the MWG Composite tags above.  See
-L<http://www.metadataworkinggroup.org/> for the official specification.
+L<https://web.archive.org/web/20181006115950/http://www.metadataworkinggroup.org/specs/>
+for the official specification.
 
 These tags belong to the ExifTool XMP-mwg-rs family 1 group.
 
@@ -34927,8 +34930,9 @@ conversion).
 Hierarchical keywords metadata defined by the MWG 2.0 specification.
 ExifTool unrolls keyword structures to an arbitrary depth of 6 to allow
 individual levels to be accessed with different tag names, and to avoid
-infinite recursion.  See L<http://www.metadataworkinggroup.org/> for the
-official specification.
+infinite recursion.  See
+L<https://web.archive.org/web/20181006115950/http://www.metadataworkinggroup.org/specs/>
+for the official specification.
 
 These tags belong to the ExifTool XMP-mwg-kw family 1 group.
 
@@ -34971,7 +34975,8 @@ These tags belong to the ExifTool XMP-mwg-kw family 1 group.
 =head3 MWG Collections Tags
 
 Collections metadata defined by the MWG 2.0 specification.  See
-L<http://www.metadataworkinggroup.org/> for the official specification.
+L<https://web.archive.org/web/20181006115950/http://www.metadataworkinggroup.org/specs/>
+for the official specification.
 
 These tags belong to the ExifTool XMP-mwg-coll family 1 group.
 

data/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 11.90
+Version: 11.91
 Release: 1
 License: Artistic/GPL
 Group: Development/Libraries/Perl

data/lib/exiftool_vendored/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ExiftoolVendored
-  VERSION = Gem::Version.new('11.90.0')
+  VERSION = Gem::Version.new('11.91.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 11.90.0
+  version: 11.91.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool