exiftool_vendored 12.17.1 → 12.32.0

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

@@ -35,7 +35,7 @@ use Image::ExifTool::Sony;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.41';
+$VERSION = '3.45';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -68,6 +68,7 @@ my %tweakOrder = (
     IPTC    => 'Exif',  # put IPTC after EXIF,
     GPS     => 'XMP',   # etc...
     Composite => 'Extra',
+    CBOR    => 'JSON',
     GeoTiff => 'GPS',
     CanonVRD=> 'CanonCustom',
     DJI     => 'Casio',
@@ -141,6 +142,9 @@ my %formatOK = (
     signed      => 1,
     unsigned    => 1,
     utf8        => 1,
+    Unicode     => 1, # (Microsoft Xtra)
+    GUID        => 1, # (Microsoft Xtra)
+    vt_filetime => 1, # (Microsoft Xtra)
 );
 
 # Descriptions for the TagNames documentation
@@ -431,11 +435,13 @@ L<UserData|Image::ExifTool::TagNames/QuickTime UserData Tags>, and
 finally in L<Keys|Image::ExifTool::TagNames/QuickTime Keys Tags>,
 but this order may be changed by setting the PREFERRED level of the
 appropriate table in the config file (see
-L<example.config|../config.html#PREF> in the full distribution for
-an example).  ExifTool currently writes only top-level metadata in
-QuickTime-based files; it extracts other track-specific and timed
-metadata, but can not yet edit tags in these locations (with the
-exception of track-level date/time tags).
+L<example.config|../config.html#PREF> in the full distribution for an
+example).  Note that some tags with the same name but different ID's may
+exist in the same location, but the family 7 group names may be used to
+differentiate these.  ExifTool currently writes only top-level metadata in
+QuickTime-based files; it extracts other track-specific and timed metadata,
+but can not yet edit tags in these locations (with the exception of
+track-level date/time tags).
 
 Alternate language tags may be accessed for
 L<ItemList|Image::ExifTool::TagNames/QuickTime ItemList Tags> and
@@ -460,8 +466,8 @@ local time when extracting.
 
 When writing string-based date/time tags, the system time zone is added if
 the PrintConv option is enabled and no time zone is specified.  This is
-because Apple software may display a crazy values if the time zone is
-missing for some tags.
+because Apple software may display crazy values if the time zone is missing
+for some tags.
 
 See
 L<https://developer.apple.com/library/archive/documentation/QuickTime/QTFF/>
@@ -634,7 +640,7 @@ overlapping EXIF, IPTC and XMP tags to be reconciled when reading, and
 synchronized when writing.  The MWG Composite tags below are designed to aid
 in the implementation of these recommendations.  As well, the MWG defines
 new XMP tags which are listed in the subsequent tables below.  See
-L<https://web.archive.org/web/20181006115950/http://www.metadataworkinggroup.org/specs/>
+L<https://web.archive.org/web/20180919181934/http://www.metadataworkinggroup.org/pdf/mwg_guidance.pdf>
 for the official MWG specification.
 },
     MacOS => q{
@@ -699,10 +705,14 @@ my %shortcutNotes = (
         large binary data tags which may be excluded to reduce memory usage if
         memory limitations are a problem
     },
+   'ls-l' => q{
+        mimics columns shown by Unix "ls -l" command.  Includes some tags which are
+        extracted only if the API L<SystemTags|../ExifTool.html#SystemTags> option
+        is enabled
+    },
 );
 
-
-# same thing for RIFF INFO tags found in the EXIF spec
+# lookup for RIFF INFO tags which are found in the EXIF spec
 my %riffSpec = (
     IARL => 1,  ICRD => 1,  IGNR => 1,  IPLT => 1,  ISRC => 1,
     IART => 1,  ICRP => 1,  IKEY => 1,  IPRD => 1,  ISRF => 1,
@@ -1320,6 +1330,7 @@ TagID:  foreach $tagID (@keys) {
                         my $count = $$tagInfo{Count} || 1;
                         # adjust count to Writable size if different than Format
                         if ($writable and $format and $writable ne $format and
+                            $writable ne 'string' and $format ne 'string' and
                             $Image::ExifTool::Exif::formatNumber{$writable} and
                             $Image::ExifTool::Exif::formatNumber{$format})
                         {
@@ -2107,7 +2118,7 @@ sub WriteTagNames($$)
         $short = $$shortName{$tableName};
         my @names = split ' ', $short;
         my $class = shift @names;
-        if (@names) {
+        if (@names and $class ne 'Other') {
             # add heading for tables without a Main
             unless ($heading eq $class) {
                 $heading = $class;
@@ -2135,6 +2146,13 @@ sub WriteTagNames($$)
         $short = $$shortName{$tableName};
         $short = $tableName unless $short;
         $url = "$short.html";
+        # handle various tables in "Other.pm"
+        if ($short =~ /^Other (.*)/) {
+            $short = $1;
+            $url = 'Other.html#' . $1;
+        } else {
+            $url = "$short.html";
+        }
         print HTMLFILE "<a href='${url}'>$short</a>";
         ++$count;
     }

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

@@ -0,0 +1,277 @@
+#------------------------------------------------------------------------------
+# File:         CBOR.pm
+#
+# Description:  Read CBOR format metadata
+#
+# Revisions:    2021-09-30 - P. Harvey Created
+#
+# References:   1) https://c2pa.org/public-draft/
+#               2) https://datatracker.ietf.org/doc/html/rfc7049
+#------------------------------------------------------------------------------
+
+package Image::ExifTool::CBOR;
+use strict;
+use vars qw($VERSION);
+use Image::ExifTool qw(:DataAccess :Utils);
+use Image::ExifTool::JSON;
+
+$VERSION = '1.00';
+
+sub ProcessCBOR($$$);
+sub ReadCBORValue($$$$);
+
+# optional CBOR type codes
+my %cborType6 = (
+    0 => 'date/time string',
+    1 => 'epoch-based date/time',
+    2 => 'positive bignum',
+    3 => 'negative bignum',
+    4 => 'decimal fraction',
+    5 => 'bigfloat',
+    21 => 'expected base64url encoding',
+    22 => 'expected base64 encoding',
+    23 => 'expected base16 encoding',
+    24 => 'encoded CBOR data',
+    32 => 'URI',
+    33 => 'base64url',
+    34 => 'base64',
+    35 => 'regular expression',
+    36 => 'MIME message',
+    55799 => 'CBOR magic number',
+);
+
+my %cborType7 = (
+    20 => 'False',
+    21 => 'True',
+    22 => 'null',
+    23 => 'undef',
+);
+
+%Image::ExifTool::CBOR::Main = (
+    GROUPS => { 0 => 'JUMBF', 1 => 'CBOR', 2 => 'Other' },
+    VARS => { NO_ID => 1 },
+    PROCESS_PROC => \&ProcessCBOR,
+    NOTES => q{
+        The tags below are extracted from CBOR (Concise Binary Object
+        Representation) metadata.  The C2PA specification uses this format for some
+        metadata.  As well as these tags, ExifTool will read any existing tags.
+    },
+    'dc:title'      => 'Title',
+    'dc:format'     => 'Format',
+    # my sample file has the following 2 tags in CBOR, but they should be JSON
+    authorName      => { Name => 'AuthorName', Groups => { 2 => 'Author' } },
+    authorIdentifier=> { Name => 'AuthorIdentifier', Groups => { 2 => 'Author' } },
+    documentID      => { },
+    instanceID      => { },
+    thumbnailHash   => { List => 1 },
+    thumbnailUrl    => { Name => 'ThumbnailURL' },
+    relationship    => { }
+);
+
+#------------------------------------------------------------------------------
+# Read CBOR value
+# Inputs: 0) ExifTool ref, 1) data ref, 2) position in data, 3) data end
+# Returns: 0) value, 1) error string, 2) new data position
+sub ReadCBORValue($$$$)
+{
+    my ($et, $dataPt, $pos, $end) = @_;
+    return(undef, 'Truncated CBOR data', $pos) if $pos >= $end;
+    my $verbose = $$et{OPTIONS}{Verbose};
+    my $indent = $$et{INDENT};
+    my $fmt = Get8u($dataPt, $pos++);
+    my $dat = $fmt & 0x1f;
+    my ($num, $val, $err, $size);
+    $fmt >>= 5;
+    if ($dat < 24) {
+        $num = $dat;
+    } elsif ($dat == 31) {  # indefinite count (not used in C2PA)
+        $num = -1;  # (flag for indefinite count)
+        $et->VPrint(1, "$$et{INDENT} (indefinite count):\n");
+    } else {
+        my $format = { 24 => 'int8u', 25 => 'int16u', 26 => 'int32u', 27 => 'int64u' }->{$dat};
+        return(undef, "Invalid CBOR integer type $dat", $pos) unless $format;
+        $size = Image::ExifTool::FormatSize($format);
+        return(undef, 'Truncated CBOR integer value', $pos) if $pos + $size > $end;
+        $num = ReadValue($dataPt, $pos, $format, 1, $size);
+        $pos += $size;
+    }
+    my ($pre, $opt) = ('', ':');
+    if ($verbose and $fmt != 6) {
+        if (defined $$et{cbor_pre}) {
+            $pre = "$$et{cbor_pre}";
+            delete $$et{cbor_pre};
+        }
+        if (defined $$et{cbor_opt}) {
+            $opt = ", $$et{cbor_opt}:";
+            delete $$et{cbor_opt};
+        }
+    }
+    if ($fmt == 0) {            # positive integer
+        $val = $num;
+        $et->VPrint(1, "$$et{INDENT} ${pre}int+$opt $val\n");
+    } elsif ($fmt == 1) {       # negative integer
+        $val = -1 * $num;
+        $et->VPrint(1, "$$et{INDENT} ${pre}int-$opt $val\n");
+    } elsif ($fmt == 2 or $fmt == 3) {  # byte/UTF8 string
+        return(undef, 'Truncated CBOR string value', $pos) if $pos + $num > $end;
+        if ($num < 0) { # (should not happen in C2PA)
+            my $string = '';
+            $$et{INDENT} .= '   ';
+            for (;;) {
+                ($val, $err, $pos) = ReadCBORValue($et, $dataPt, $pos, $end);
+                return(undef, $err, $pos) if $err;
+                last if not defined $val;   # hit the break?
+                # (note: strictly we should be checking that this was a string we read)
+                $string .= $val;
+            }
+            $$et{INDENT} = $indent;
+            return($string, undef, $pos);   # return concatenated strings
+        } else {
+            $val = substr($$dataPt, $pos, $num);
+        }
+        $pos += $num;
+        if ($fmt == 2) {
+            $et->VPrint(1, "$$et{INDENT} ${pre}byte$opt <binary data ".length($val)." bytes>\n");
+            return(\$val, undef, $pos);    # (byte string)
+        }
+        $et->VPrint(1, "$$et{INDENT} ${pre}text$opt '${val}'\n");
+    } elsif ($fmt == 4 or $fmt == 5) {  # list/hash
+        if ($fmt == 4) {
+            $et->VPrint(1, "$$et{INDENT} ${pre}list$opt <$num elements>\n");
+        } else {
+            $et->VPrint(1, "$$et{INDENT} ${pre}hash$opt <$num pairs>\n");
+            $num *= 2;
+        }
+        $$et{INDENT} .= '   ';
+        my $i = 0;
+        my @list;
+        while ($num) {
+            $$et{cbor_pre} = "$i) ";
+            if ($fmt == 4) {
+                ++$i;
+            } elsif ($num & 0x01) {
+                $$et{cbor_pre} = ' ' x length($$et{cbor_pre});
+                ++$i;
+            }
+            ($val, $err, $pos) = ReadCBORValue($et, $dataPt, $pos, $end);
+            return(undef, $err, $pos) if $err;
+            if (not defined $val) {
+                return(undef, 'Unexpected list terminator', $pos) unless $num < 0;
+                last;
+            }
+            push @list, $val;
+            --$num;
+        }
+        $$et{INDENT} = $indent;
+        if ($fmt == 5) {
+            my ($i, @keys);
+            my %hash = ( _ordered_keys_ => \@keys );
+            for ($i=0; $i<@list-1; $i+=2) {
+                $hash{$list[$i]} = $list[$i+1];
+                push @keys, $list[$i];  # save ordered list of keys
+            }
+            $val = \%hash;
+        } else {
+            $val = \@list;
+        }
+    } elsif ($fmt == 6) {       # optional type
+        $$et{cbor_opt} = $cborType6{$num} || "<unknown type $num>";
+        ($val, $err, $pos) = ReadCBORValue($et, $dataPt, $pos, $end);
+    } elsif ($fmt == 7) {       
+        if ($dat == 31) {
+            undef $val; # "break" = end of indefinite array/hash (not used in C2PA)
+        } elsif ($dat < 24) {
+            $val = $cborType7{$num};
+            $val = "Unknown ($val)" unless defined $val;
+        } elsif ($dat == 25) {  # half-precision float
+            my $exp = ($num >> 10) & 0x1f;
+            my $mant = $num & 0x3ff;
+            if ($exp == 0) {
+                $val = $mant ** -24;
+                $val *= -1 if $num & 0x8000;
+            } elsif (exp != 31) {
+                $val = ($mant + 1024) ** ($exp - 25);
+                $val *= -1 if $num & 0x8000;
+            } else {
+                $val = $mant == 0 ? '<inf>' : '<nan>';
+            }
+        } elsif ($dat == 26) {  # float
+            $val = GetFloat($dataPt, $pos - $size);
+        } elsif ($dat == 27) {  # double
+            $val = GetDouble($dataPt, $pos - $size);
+        } else {
+            return(undef, "Invalid CBOR type 7 variant $num", $pos);
+        }
+        $et->VPrint(1, "$$et{INDENT} ${pre}typ7$opt ".(defined $val ? $val : '<break>')."\n");
+    } else {
+        return(undef, "Unknown CBOR format $fmt", $pos);
+    }
+    return($val, $err, $pos);
+}
+
+#------------------------------------------------------------------------------
+# Read CBOR box
+# Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
+# Returns: 1 on success
+sub ProcessCBOR($$$)
+{
+    my ($et, $dirInfo, $tagTablePtr) = @_;
+    my $dataPt = $$dirInfo{DataPt};
+    my $pos = $$dirInfo{DirStart};
+    my $end = $pos + $$dirInfo{DirLen};
+    $et->VerboseDir('CBOR', undef, $$dirInfo{DirLen});
+    my ($val, $err, $tag);
+    require Image::ExifTool::CBOR;
+    while ($pos < $end) {
+        ($val, $err, $pos) = ReadCBORValue($et, $dataPt, $pos, $end);
+        $err and $et->Warn($err), last;
+        ref $val eq 'HASH' or $et->VPrint(1, "$$et{INDENT} CBOR end: Non-hash encountered\n"), last;
+        foreach $tag (@{$$val{_ordered_keys_}}) {
+            Image::ExifTool::JSON::ProcessTag($et, $tagTablePtr, $tag, $$val{$tag});
+        }
+    }
+    return 1;
+}
+
+1;  # end
+
+__END__
+
+=head1 NAME
+
+Image::ExifTool::CBOR - Read CBOR format metadata
+
+=head1 SYNOPSIS
+
+This module is used by Image::ExifTool
+
+=head1 DESCRIPTION
+
+This module contains definitions required by Image::ExifTool read Concise
+Binary Object Representation (CBOR) formatted metadata, used by the C2PA
+specification.
+
+=head1 AUTHOR
+
+Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+
+This library is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
+
+=head1 REFERENCES
+
+=over 4
+
+=item L<https://c2pa.org/public-draft/>
+
+=item L<https://datatracker.ietf.org/doc/html/rfc7049>
+
+=back
+
+=head1 SEE ALSO
+
+L<Image::ExifTool::TagNames/CBOR Tags>,
+L<Image::ExifTool(3pm)|Image::ExifTool>
+
+=cut
+

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.43';
+$VERSION = '4.51';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -473,7 +473,8 @@ $VERSION = '4.43';
     253 => 'Canon EF 70-200mm f/2.8L IS II USM + 2x', #PH (NC)
     253.1 => 'Canon EF 70-200mm f/2.8L IS III USM + 2x', #PH (NC)
     # 253.2 => 'Tamron SP 70-200mm f/2.8 Di VC USD G2 (A025) + 2x', #forum9367
-    254 => 'Canon EF 100mm f/2.8L Macro IS USM', #42
+    254 => 'Canon EF 100mm f/2.8L Macro IS USM or Tamron Lens', #42
+    254.1 => 'Tamron SP 90mm f/2.8 Di VC USD 1:1 Macro (F017)', #PH
     255 => 'Sigma 24-105mm f/4 DG OS HSM | A or Other Lens', #50
     255.1 => 'Sigma 180mm f/2.8 EX DG OS HSM APO Macro', #50
     255.2 => 'Tamron SP 70-200mm f/2.8 Di VC USD', #exiv issue 1202 (A009)
@@ -518,7 +519,8 @@ $VERSION = '4.43';
     507 => 'Canon EF 16-35mm f/4L IS USM', #42
     508 => 'Canon EF 11-24mm f/4L USM or Tamron Lens', #PH
     508.1 => 'Tamron 10-24mm f/3.5-4.5 Di II VC HLD (B023)', #PH
-    624 => 'Sigma 70-200mm f/2.8 DG OS HSM | S', #IB (018)
+    624 => 'Sigma 70-200mm f/2.8 DG OS HSM | S or other Sigma Lens', #IB (018)
+    624.1 => 'Sigma 150-600mm f/5-6.3 | C', #ChrisSkopec
     747 => 'Canon EF 100-400mm f/4.5-5.6L IS II USM or Tamron Lens', #JR
     747.1 => 'Tamron SP 150-600mm f/5-6.3 Di VC USD G2', #50
     748 => 'Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x or Tamron Lens', #JR (1.4x Mk III)
@@ -556,7 +558,8 @@ $VERSION = '4.43';
     4158 => 'Canon EF-S 18-55mm f/4-5.6 IS STM', #PH
     4159 => 'Canon EF-M 32mm f/1.4 STM', #42
     4160 => 'Canon EF-S 35mm f/2.8 Macro IS STM', #42
-    4208 => 'Sigma 56mm f/1.4 DC DN | C', #forum10603
+    4208 => 'Sigma 56mm f/1.4 DC DN | C or other Sigma Lens', #forum10603
+    4208.1 => 'Sigma 30mm F1.4 DC DN | C', #git issue#83 (016)
     # (Nano USM lenses - 0x90xx)
     36910 => 'Canon EF 70-300mm f/4-5.6 IS II USM', #42
     36912 => 'Canon EF-S 18-135mm f/3.5-5.6 IS USM', #42
@@ -578,17 +581,21 @@ $VERSION = '4.43';
     61182.7 => 'Canon RF 15-35mm F2.8L IS USM',
     61182.8 => 'Canon RF 24-240mm F4-6.3 IS USM',
     61182.9 => 'Canon RF 70-200mm F2.8L IS USM',
-    61182.10 => 'Canon RF 85mm F2 MACRO IS STM',
-    61182.11 => 'Canon RF 600mm F11 IS STM',
-    61182.12 => 'Canon RF 600mm F11 IS STM + RF1.4x',
-    61182.13 => 'Canon RF 600mm F11 IS STM + RF2x',
-    61182.14 => 'Canon RF 800mm F11 IS STM',
-    61182.15 => 'Canon RF 800mm F11 IS STM + RF1.4x',
-    61182.16 => 'Canon RF 800mm F11 IS STM + RF2x',
-    61182.17 => 'Canon RF 24-105mm F4-7.1 IS STM',
-    61182.18 => 'Canon RF 100-500mm F4.5-7.1L IS USM',
-    61182.19 => 'Canon RF 100-500mm F4.5-7.1L IS USM + RF1.4x',
-    61182.20 => 'Canon RF 100-500mm F4.5-7.1L IS USM + RF2x',
+   '61182.10' => 'Canon RF 85mm F2 MACRO IS STM',
+   '61182.11' => 'Canon RF 600mm F11 IS STM',
+   '61182.12' => 'Canon RF 600mm F11 IS STM + RF1.4x',
+   '61182.13' => 'Canon RF 600mm F11 IS STM + RF2x',
+   '61182.14' => 'Canon RF 800mm F11 IS STM',
+   '61182.15' => 'Canon RF 800mm F11 IS STM + RF1.4x',
+   '61182.16' => 'Canon RF 800mm F11 IS STM + RF2x',
+   '61182.17' => 'Canon RF 24-105mm F4-7.1 IS STM',
+   '61182.18' => 'Canon RF 100-500mm F4.5-7.1L IS USM',
+   '61182.19' => 'Canon RF 100-500mm F4.5-7.1L IS USM + RF1.4x',
+   '61182.20' => 'Canon RF 100-500mm F4.5-7.1L IS USM + RF2x',
+   '61182.21' => 'Canon RF 70-200mm F4L IS USM', #42
+   '61182.22' => 'Canon RF 50mm F1.8 STM', #42
+   '61182.23' => 'Canon RF 14-35mm F4L IS USM', #IB
+  #'61182.xx' => 'Canon RF 100mm F2.8L MACRO IS USM',
     65535 => 'n/a',
 );
 
@@ -945,6 +952,7 @@ $VERSION = '4.43';
     0x80000437 => 'EOS 90D', #IB
     0x80000453 => 'EOS R6', #PH
     0x80000467 => 'PowerShot ZOOM',
+    0x80000468 => 'EOS M50 Mark II / Kiss M2', #IB
     0x80000520 => 'EOS D2000C', #IB
     0x80000560 => 'EOS D6000C', #PH (guess)
 );
@@ -4539,6 +4547,16 @@ my %ciMaxFocal = (
             2 => 'Rotate 270 CW',
         },
     },
+    0x3a => { #IB
+        Name => 'CameraOrientation',
+        Condition => '$$self{Model} =~ /\b(1200D|REBEL T5|Kiss X70)\b/',
+        Notes => '1200D only',
+        PrintConv => {
+            0 => 'Horizontal (normal)',
+            1 => 'Rotate 90 CW',
+            2 => 'Rotate 270 CW',
+        },
+    },
     0x55 => {
         Name => 'FocusDistanceUpper',
         Condition => '$$self{Model} =~ /EOS 60D$/',
@@ -4679,7 +4697,7 @@ my %ciMaxFocal = (
     FIRST_ENTRY => 0,
     PRIORITY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
-    NOTES => 'CameraInfo tags for the EOS 70D.',
+    NOTES => 'CameraInfo tags for the EOS 80D.',
     0x03 => { %ciFNumber },
     0x04 => { %ciExposureTime },
     0x06 => { %ciISO },
@@ -5255,6 +5273,14 @@ my %ciMaxFocal = (
     0x06 => { %ciISO },
     0x1b => { %ciCameraTemperature }, # (700D + 0)
     0x23 => { %ciFocalLength }, # (700D + 0)
+    0x96 => { #IB (700D + 0x19)
+        Name => 'CameraOrientation',
+        PrintConv => {
+            0 => 'Horizontal (normal)',
+            1 => 'Rotate 90 CW',
+            2 => 'Rotate 270 CW',
+        },
+    },
     0xa5 => { # (700D + 0x19)
         Name => 'FocusDistanceUpper',
         %focusDistanceByteSwap,
@@ -6736,6 +6762,10 @@ my %ciMaxFocal = (
             275 => 'Canon RF 100-500mm F4.5-7.1L IS USM',
             276 => 'Canon RF 100-500mm F4.5-7.1L IS USM + RF1.4x',
             277 => 'Canon RF 100-500mm F4.5-7.1L IS USM + RF2x',
+            278 => 'Canon RF 70-200mm F4L IS USM', #42
+            280 => 'Canon RF 50mm F1.8 STM', #42
+            281 => 'Canon RF 14-35mm F4L IS USM', #42/IB
+           #xxx => 'Canon RF 100mm F2.8L MACRO IS USM',
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },
     },
@@ -9229,8 +9259,9 @@ sub PrintLensID(@)
                 push @likely, $tclens;
                 if ($maxAperture) {
                     # (not 100% sure that TC affects MaxAperture, but it should!)
-                    next if $maxAperture < $sa * $tc - 0.15;
-                    next if $maxAperture > $la * $tc + 0.15;
+                    # (RF 24-105mm F4L IS USM shows a MaxAperture of 4.177)
+                    next if $maxAperture < $sa * $tc - 0.18;
+                    next if $maxAperture > $la * $tc + 0.18;
                 }
                 push @matches, $tclens;
             }

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

@@ -15,7 +15,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::XMP;
 use Image::ExifTool::GPS;
 
-$VERSION = '1.03';
+$VERSION = '1.04';
 
 my %convFloat2 = (
     PrintConv => 'sprintf("%+.2f", $val)',
@@ -90,20 +90,20 @@ my %convFloat2 = (
         Writable => 'real',
         Avoid => 1,
         PrintConv    => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")',
-        PrintConvInv => 'Image::ExifTool::GPS::ToDegrees($val, 1)',
+        PrintConvInv => 'Image::ExifTool::GPS::ToDegrees($val, 1, "lat")',
     },
     GpsLongtitude => { # (sic)
         Name => 'GPSLongtitude',
         Writable => 'real',
         PrintConv    => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")',
-        PrintConvInv => 'Image::ExifTool::GPS::ToDegrees($val, 1)',
+        PrintConvInv => 'Image::ExifTool::GPS::ToDegrees($val, 1, "lon")',
     },
     GpsLongitude => { #PH (NC)
         Name => 'GPSLongitude',
         Writable => 'real',
         Avoid => 1,
         PrintConv    => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")',
-        PrintConvInv => 'Image::ExifTool::GPS::ToDegrees($val, 1)',
+        PrintConvInv => 'Image::ExifTool::GPS::ToDegrees($val, 1, "lon")',
     },
     FlightXSpeed  => { Writable => 'real' },
     FlightYSpeed  => { Writable => 'real' },
@@ -124,13 +124,13 @@ my %convFloat2 = (
         Name => 'Latitude',
         Writable => 'real',
         PrintConv    => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")',
-        PrintConvInv => 'Image::ExifTool::GPS::ToDegrees($val, 1)',
+        PrintConvInv => 'Image::ExifTool::GPS::ToDegrees($val, 1, "lat")',
     },
     Longitude => {
         Name => 'Longitude',
         Writable => 'real',
         PrintConv    => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")',
-        PrintConvInv => 'Image::ExifTool::GPS::ToDegrees($val, 1)',
+        PrintConvInv => 'Image::ExifTool::GPS::ToDegrees($val, 1, "lon")',
     },
 );
 

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

@@ -15,7 +15,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.05';
+$VERSION = '1.06';
 
 # DPX tags
 %Image::ExifTool::DPX::Main = (
@@ -156,7 +156,18 @@ $VERSION = '1.05';
     1532=> { Name => 'SourceCreateDate',  Format => 'string[24]' },
     1556=> { Name => 'InputDeviceName',   Format => 'string[32]' },
     1588=> { Name => 'InputDeviceSerialNumber', Format => 'string[32]' },
-    # 1620=> { Name => 'AspectRatio',       Format => 'int32u' },
+    # 1620 => { Name => 'Border',           Format => 'int16u[4]' },
+    1628 => {
+        Name => 'AspectRatio',
+        Format => 'int32u[2]',
+        RawConv => '$val =~ /4294967295/ ? undef : $val', # ignore undefined values
+        PrintConv => q{
+            return 'undef' if $val eq '0 0';
+            return 'inf' if $val=~/ 0$/;
+            my @a=split(' ',$val);
+            return join(':', Rationalize($a[0]/$a[1]));
+        },
+    },
     1724 => { Name => 'OriginalFrameRate',Format => 'float' },
     1728 => { Name => 'ShutterAngle',     Format => 'float', RawConv => '($val =~ /\d/ and $val !~ /nan/i) ? $val : undef' }, #2
     1732 => { Name => 'FrameID',          Format => 'string[32]' },

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

@@ -18,7 +18,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.06';
+$VERSION = '1.07';
 
 sub ParseAnt($);
 sub ProcessAnt($$$);
@@ -227,10 +227,11 @@ Tok: for (;;) {
                 last unless $tok =~ /(\\+)$/ and length($1) & 0x01;
                 $tok .= '"';    # quote is part of the string
             }
-            # must protect unescaped "$" and "@" symbols, and "\" at end of string
-            $tok =~ s{\\(.)|([\$\@]|\\$)}{'\\'.($2 || $1)}sge;
-            # convert C escape sequences (allowed in quoted text)
-            $tok = eval qq{"$tok"};
+            # convert C escape sequences, allowed in quoted text
+            # (note: this only converts a few of them!)
+            my %esc = ( a => "\a", b => "\b", f => "\f", n => "\n",
+                        r => "\r", t => "\t", '"' => '"', '\\' => '\\' );
+            $tok =~ s/\\(.)/$esc{$1}||'\\'.$1/egs;
         } else {                # key name
             pos($$dataPt) = pos($$dataPt) - 1;
             # allow anything in key but whitespace, braces and double quotes