exiftool_vendored 12.22.0 → 12.34.0

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

@@ -0,0 +1,331 @@
+#------------------------------------------------------------------------------
+# 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.01';
+
+sub ProcessCBOR($$$);
+sub ReadCBORValue($$$$);
+
+# optional CBOR type code
+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 $dumpStart = $pos;
+    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 = '';
+    if (defined $$et{cbor_pre} and $fmt != 6) {
+        $pre = $$et{cbor_pre};
+        delete $$et{cbor_pre};
+    }
+    if ($fmt == 0) {            # positive integer
+        $val = $num;
+        $et->VPrint(1, "$$et{INDENT} ${pre}int+: $val\n");
+    } elsif ($fmt == 1) {       # negative integer
+        $val = -1 * $num;
+        $et->VPrint(1, "$$et{INDENT} ${pre}int-: $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 byte/text string
+        } else {
+            $val = substr($$dataPt, $pos, $num);
+        }
+        $pos += $num;
+        if ($fmt == 2) {    # (byte string)
+            $et->VPrint(1, "$$et{INDENT} ${pre}byte: <binary data ".length($val)." bytes>\n");
+            my $dat = $val;
+            $val = \$dat;   # use scalar reference for binary data
+        } else {            # (text string)
+            $val = $et->Decode($val, 'UTF8');
+            $et->VPrint(1, "$$et{INDENT} ${pre}text: '${val}'\n");
+        }
+    } elsif ($fmt == 4 or $fmt == 5) {  # list/hash
+        if ($fmt == 4) {
+            $et->VPrint(1, "$$et{INDENT} ${pre}list: <$num elements>\n");
+        } else {
+            $et->VPrint(1, "$$et{INDENT} ${pre}hash: <$num pairs>\n");
+            $num *= 2;
+        }
+        $$et{INDENT} .= '  ';
+        my $i = 0;
+        my @list;
+        Image::ExifTool::HexDump($dataPt, $pos - $dumpStart,
+            Start   => $dumpStart,
+            DataPos => $$et{cbor_datapos},
+            Prefix  => $$et{INDENT},
+        ) if $verbose > 2;
+        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;
+        }
+        $dumpStart = $pos;
+        $$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 tag
+        if ($verbose) {
+            my $str = "$num (" . ($cborType6{$num} || 'unknown') . ')';
+            my $spc = $$et{cbor_pre} ? (' ' x length $$et{cbor_pre}) : '';
+            $et->VPrint(1, "$$et{INDENT} $spc<CBOR optional type $str>\n");
+            Image::ExifTool::HexDump($dataPt, $pos - $dumpStart,
+                Start   => $dumpStart,
+                DataPos => $$et{cbor_datapos},
+                Prefix  => $$et{INDENT} . '  ',
+            ) if $verbose > 2;
+        }
+        # read next value (note: in the case of multiple tags,
+        # this nesting will apply the tags in the correct order)
+        ($val, $err, $pos) = ReadCBORValue($et, $dataPt, $pos, $end);
+        $dumpStart = $pos;
+        # convert some values according to the optional tag number (untested)
+        if ($num == 0 and not ref $val) {       # date/time string
+            require Image::ExifTool::XMP;
+            $val = Image::ExifTool::XMP::ConvertXMPDate($val);
+        } elsif ($num == 1 and not ref $val) {  # epoch-based date/time
+            if (Image::ExifTool::IsFloat($val)) {
+                my $dec = ($val == int($val)) ? undef : 6;
+                $val = Image::ExifTool::ConvertUnixTime($val, 1, $dec);
+            }
+        } elsif (($num == 2 or $num == 3) and ref($val) eq 'SCALAR') { # pos/neg bignum
+            my $big = 0;
+            $big = 256 * $big + Get8u($val,$_) foreach 0..(length($$val) - 1);
+            $val = $num==2 ? $big : -$big;
+        } elsif (($num == 4 or $num == 5) and # decimal fraction or bigfloat
+            ref($val) eq 'ARRAY' and @$val == 2 and
+            Image::ExifTool::IsInt($$val[0]) and Image::ExifTool::IsInt($$val[1]))
+        {
+            $val = $$val[1] * ($num == 4 ? 10 : 2) ** $$val[0];
+        }
+    } 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: ".(defined $val ? $val : '<break>')."\n");
+    } else {
+        return(undef, "Unknown CBOR format $fmt", $pos);
+    }
+    Image::ExifTool::HexDump($dataPt, $pos - $dumpStart,
+        Start   => $dumpStart,
+        DataPos => $$et{cbor_datapos},
+        Prefix  => $$et{INDENT} . '  ',
+        MaxLen  => $verbose < 5 ? ($verbose == 3 ? 96 : 2048) : undef,
+    ) if $verbose > 2;
+    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};
+    my ($val, $err, $tag, $i);
+
+    $et->VerboseDir('CBOR', undef, $$dirInfo{DirLen});
+
+    $$et{cbor_datapos} = $$dirInfo{DataPos} + $$dirInfo{Base};
+
+    while ($pos < $end) {
+        ($val, $err, $pos) = ReadCBORValue($et, $dataPt, $pos, $end);
+        $err and $et->Warn($err), last;
+        if (ref $val eq 'HASH') {
+            foreach $tag (@{$$val{_ordered_keys_}}) {
+                Image::ExifTool::JSON::ProcessTag($et, $tagTablePtr, $tag, $$val{$tag});
+            }
+        } elsif (ref $val eq 'ARRAY') {
+            for ($i=0; $i<@$val; ++$i) {
+                Image::ExifTool::JSON::ProcessTag($et, $tagTablePtr, "Item$i", $$val[$i]);
+            }
+        } elsif ($val eq '0') {
+            $et->VPrint(1, "$$et{INDENT} <CBOR end>\n");
+            last;   # (treat as padding)
+        } else {
+            $et->VPrint(1, "$$et{INDENT} Unknown value: $val\n");
+        }
+    }
+    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.46';
+$VERSION = '4.53';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -187,7 +187,7 @@ $VERSION = '4.46';
     37.2 => 'Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro (A20)', #38
     37.3 => 'Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical [IF]', #34
     37.4 => 'Tamron AF 18-270mm f/3.5-6.3 Di II VC LD Aspherical [IF] Macro', #forum2937
-    38 => 'Canon EF 80-200mm f/4.5-5.6', #32
+    38 => 'Canon EF 80-200mm f/4.5-5.6 II', #32 (II added ref https://github.com/Exiv2/exiv2/issues/1906)
     39 => 'Canon EF 75-300mm f/4-5.6',
     40 => 'Canon EF 28-80mm f/3.5-5.6',
     41 => 'Canon EF 28-90mm f/4-5.6', #32
@@ -473,7 +473,8 @@ $VERSION = '4.46';
     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.46';
     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.46';
     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,19 +581,25 @@ $VERSION = '4.46';
     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.21 => 'Canon RF 70-200mm F4L IS USM', #42
-    61182.22 => 'Canon RF 50mm F1.8 STM', #42
+   '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.24' => 'Canon RF 100-400mm F5.6-8 IS USM', #42
+   '61182.25' => 'Canon RF 100-400mm F5.6-8 IS USM + RF1.4x', #42 (NC)
+   '61182.26' => 'Canon RF 100-400mm F5.6-8 IS USM + RF2x', #42 (NC)
+   '61182.27' => 'Canon RF 16mm F2.8 STM', #42
+  #'61182.xx' => 'Canon RF 100mm F2.8L MACRO IS USM',
     65535 => 'n/a',
 );
 
@@ -6726,7 +6735,17 @@ my %ciMaxFocal = (
         PrintConvInv => '$val =~ s/ ?m$//; IsFloat($val) ? $val : 655.35',
     },
     # 22 - values: 0, 1
-    # 23 - values: 0, 21, 22
+    23 => { #JohnMoyer (forum12925)
+        Name => 'ShutterMode',
+        PrintConv => {
+            0 => 'Mechanical',
+            1 => 'Electronic First Curtain',
+            2 => 'Electronic',
+            # 3 => ?
+            # 21 => ?
+            # 22 => ?
+        },
+    },
     25 => { #PH
         Name => 'FlashExposureLock',
         PrintConv => \%offOn,
@@ -6759,6 +6778,12 @@ my %ciMaxFocal = (
             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
+            283 => 'Canon RF 100-400mm F5.6-8 IS USM', #42
+            284 => 'Canon RF 100-400mm F5.6-8 IS USM + RF1.4x', #42 (NC)
+            285 => 'Canon RF 100-400mm F5.6-8 IS USM + RF2x', #42 (NC)
+            288 => 'Canon RF 16mm F2.8 STM', #42
+           #xxx => 'Canon RF 100mm F2.8L MACRO IS USM',
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },
     },
@@ -8733,6 +8758,7 @@ my %filterConv = (
     #        --> ignored when reading, but offsets are updated when writing
     CMT1 => { # (CR3 files)
         Name => 'IFD0',
+        PreservePadding => 1,
         SubDirectory => {
             TagTable => 'Image::ExifTool::Exif::Main',
             ProcessProc => \&Image::ExifTool::ProcessTIFF,
@@ -8741,6 +8767,7 @@ my %filterConv = (
     },
     CMT2 => { # (CR3 files)
         Name => 'ExifIFD',
+        PreservePadding => 1,
         SubDirectory => {
             TagTable => 'Image::ExifTool::Exif::Main',
             ProcessProc => \&Image::ExifTool::ProcessTIFF,
@@ -8749,6 +8776,7 @@ my %filterConv = (
     },
     CMT3 => { # (CR3 files)
         Name => 'MakerNoteCanon',
+        PreservePadding => 1,
         SubDirectory => {
             TagTable => 'Image::ExifTool::Canon::Main',
             ProcessProc => \&ProcessCMT3,
@@ -8757,6 +8785,7 @@ my %filterConv = (
     },
     CMT4 => { # (CR3 files)
         Name => 'GPSInfo',
+        PreservePadding => 1,
         SubDirectory => {
             TagTable => 'Image::ExifTool::GPS::Main',
             ProcessProc => \&Image::ExifTool::ProcessTIFF,
@@ -8767,6 +8796,7 @@ my %filterConv = (
     THMB => {
         Name => 'ThumbnailImage',
         Groups => { 2 => 'Preview' },
+        PreservePadding => 1,
         RawConv => 'substr($val, 16)',
         Binary => 1,
     },
@@ -8781,6 +8811,7 @@ my %filterConv = (
     WRITE_PROC => 'Image::ExifTool::QuickTime::WriteQuickTime',
     CNOP => {
         Name => 'CanonVRD',
+        PreservePadding => 1,
         SubDirectory => {
             TagTable => 'Image::ExifTool::CanonVRD::Main',
             WriteProc => 'Image::ExifTool::CanonVRD::WriteCanonDR4',
@@ -9252,8 +9283,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/Charset.pm

@@ -6,6 +6,8 @@
 # Revisions:    2009/08/28 - P. Harvey created
 #               2010/01/20 - P. Harvey complete re-write
 #               2010/07/16 - P. Harvey added UTF-16 support
+#
+# Notes:        Charset lookups are generated using my convertCharset script
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::Charset;

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