exiftool_vendored 12.25.0 → 12.32.0

data/bin/exiftool

@@ -10,7 +10,7 @@
 use strict;
 require 5.004;
 
-my $version = '12.25';
+my $version = '12.32';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -1954,10 +1954,19 @@ sub GetImageInfo($$)
     my $pipe = $file;
     if ($doUnzip) {
         # pipe through gzip or bzip2 if necessary
-        if ($file =~ /\.gz$/i) {
-            $pipe = qq{gzip -dc "$file" |};
-        } elsif ($file =~ /\.bz2$/i) {
-            $pipe = qq{bzip2 -dc "$file" |};
+        if ($file =~ /\.(gz|bz2)$/i) {
+            my $type = lc $1;
+            if ($file =~ /[^-_.'A-Za-z0-9\/\\]/) {
+                Warn "Error: Insecure zip file name. Skipped\n";
+                EFile($file);
+                ++$countBad;
+                return;
+            }
+            if ($type eq 'gz') {
+                $pipe = qq{gzip -dc "$file" |};
+            } else {
+                $pipe = qq{bzip2 -dc "$file" |};
+            }
         }
     }
     # evaluate -if expression for conditional processing
@@ -2218,7 +2227,7 @@ sub GetImageInfo($$)
                 my $f = $file;
                 CleanXML(\$f);
                 print $fp "\n<rdf:Description rdf:about='${f}'";
-                print $fp "\n  xmlns:et='http://ns.exiftool.ca/1.0/'";
+                print $fp "\n  xmlns:et='http://ns.exiftool.org/1.0/'";
                 print $fp " et:toolkit='Image::ExifTool $Image::ExifTool::VERSION'";
                 # define namespaces for all tag groups
                 my (%groups, @groups, $grp0, $grp1);
@@ -2240,7 +2249,7 @@ sub GetImageInfo($$)
                     unless ($grp eq $grp1 and $grp =~ /^(ExifTool|File|Composite|Unknown)$/) {
                         $grp .= "/$grp1";
                     }
-                    print $fp "\n  xmlns:$grp1='http://ns.exiftool.ca/$grp/1.0/'";
+                    print $fp "\n  xmlns:$grp1='http://ns.exiftool.org/$grp/1.0/'";
                 }
                 print $fp '>' if $outFormat < 1; # finish rdf:Description token unless short format
                 $ind = $outFormat >= 0 ? ' ' : '   ';
@@ -3241,7 +3250,8 @@ sub FormatXML($$$)
     } elsif (ref $val eq 'HASH') {
         $gt = " rdf:parseType='Resource'>";
         my $val2 = '';
-        foreach (sort keys %$val) {
+        my @keys = $$val{_ordered_keys_} ? @{$$val{_ordered_keys_}} : sort keys %$val;
+        foreach (@keys) {
             # (some variable-namespace XML structure fields may have a different group)
             my $tok = /:/ ? $_ : ($grp . ':' . $_);
             $val2 .= "\n$ind <$tok" . FormatXML($$val{$_}, "$ind ", $grp) . "</$tok>";
@@ -3318,7 +3328,8 @@ sub FormatJSON($$$)
     } elsif (ref $val eq 'HASH') {
         my ($bra, $ket, $sep) = $json == 1 ? ('{','}',':') : ('Array(',')',' =>');
         print $fp $bra;
-        foreach (sort keys %$val) {
+        my @keys = $$val{_ordered_keys_} ? @{$$val{_ordered_keys_}} : sort keys %$val;
+        foreach (@keys) {
             print $fp ',' if $comma;
             my $key = EscapeJSON($_, 1);
             print $fp qq(\n$ind  $key$sep );
@@ -4263,7 +4274,10 @@ sub FilterArgfileLine($)
         # escaped by an odd number of backslashes, and escape a single backslash
         # if it occurs at the end of the string
         $arg =~ s{\\(.)|(["\$\@]|\\$)}{'\\'.($2 || $1)}sge;
-        $arg = eval qq{"$arg"};     # un-escape characters in C string
+        # un-escape characters in C string
+        my %esc = ( a => "\a", b => "\b", f => "\f", n => "\n",
+                    r => "\r", t => "\t", '"' => '"', '\\' => '\\' );
+        $arg =~ s/\\(.)/$esc{$1}||'\\'.$1/egs;
     } else {
         $arg =~ s/^\s+//;           # remove leading white space
         $arg =~ s/[\x0d\x0a]+$//s;  # remove trailing newline
@@ -4469,47 +4483,48 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  360   r/w   | DPX   r     | ITC   r     | NUMBERS r   | RAM   r
-  3FR   r     | DR4   r/w/c | J2C   r     | O     r     | RAR   r
-  3G2   r/w   | DSS   r     | JNG   r/w   | ODP   r     | RAW   r/w
-  3GP   r/w   | DV    r     | JP2   r/w   | ODS   r     | RIFF  r
-  A     r     | DVB   r/w   | JPEG  r/w   | ODT   r     | RSRC  r
-  AA    r     | DVR-MS r    | JSON  r     | OFR   r     | RTF   r
-  AAE   r     | DYLIB r     | JXL   r     | OGG   r     | RW2   r/w
-  AAX   r/w   | EIP   r     | K25   r     | OGV   r     | RWL   r/w
-  ACR   r     | EPS   r/w   | KDC   r     | ONP   r     | RWZ   r
-  AFM   r     | EPUB  r     | KEY   r     | OPUS  r     | RM    r
-  AI    r/w   | ERF   r/w   | LA    r     | ORF   r/w   | SEQ   r
-  AIFF  r     | EXE   r     | LFP   r     | ORI   r/w   | SKETCH r
-  APE   r     | EXIF  r/w/c | LNK   r     | OTF   r     | SO    r
-  ARQ   r/w   | EXR   r     | LRV   r/w   | PAC   r     | SR2   r/w
-  ARW   r/w   | EXV   r/w/c | M2TS  r     | PAGES r     | SRF   r
-  ASF   r     | F4A/V r/w   | M4A/V r/w   | PBM   r/w   | SRW   r/w
-  AVI   r     | FFF   r/w   | MACOS r     | PCD   r     | SVG   r
-  AVIF  r/w   | FITS  r     | MAX   r     | PCX   r     | SWF   r
-  AZW   r     | FLA   r     | MEF   r/w   | PDB   r     | THM   r/w
-  BMP   r     | FLAC  r     | MIE   r/w/c | PDF   r/w   | TIFF  r/w
-  BPG   r     | FLIF  r/w   | MIFF  r     | PEF   r/w   | TORRENT r
-  BTF   r     | FLV   r     | MKA   r     | PFA   r     | TTC   r
-  CHM   r     | FPF   r     | MKS   r     | PFB   r     | TTF   r
-  COS   r     | FPX   r     | MKV   r     | PFM   r     | TXT   r
-  CR2   r/w   | GIF   r/w   | MNG   r/w   | PGF   r     | VCF   r
-  CR3   r/w   | GPR   r/w   | MOBI  r     | PGM   r/w   | VRD   r/w/c
-  CRM   r/w   | GZ    r     | MODD  r     | PLIST r     | VSD   r
-  CRW   r/w   | HDP   r/w   | MOI   r     | PICT  r     | WAV   r
-  CS1   r/w   | HDR   r     | MOS   r/w   | PMP   r     | WDP   r/w
-  CSV   r     | HEIC  r/w   | MOV   r/w   | PNG   r/w   | WEBP  r
-  CZI   r     | HEIF  r/w   | MP3   r     | PPM   r/w   | WEBM  r
-  DCM   r     | HTML  r     | MP4   r/w   | PPT   r     | WMA   r
-  DCP   r/w   | ICC   r/w/c | MPC   r     | PPTX  r     | WMV   r
-  DCR   r     | ICS   r     | MPG   r     | PS    r/w   | WTV   r
-  DFONT r     | IDML  r     | MPO   r/w   | PSB   r/w   | WV    r
-  DIVX  r     | IIQ   r/w   | MQV   r/w   | PSD   r/w   | X3F   r/w
-  DJVU  r     | IND   r/w   | MRC   r     | PSP   r     | XCF   r
-  DLL   r     | INSP  r/w   | MRW   r/w   | QTIF  r/w   | XLS   r
-  DNG   r/w   | INSV  r     | MXF   r     | R3D   r     | XLSX  r
-  DOC   r     | INX   r     | NEF   r/w   | RA    r     | XMP   r/w/c
-  DOCX  r     | ISO   r     | NRW   r/w   | RAF   r/w   | ZIP   r
+  360   r/w   | DR4   r/w/c | JNG   r/w   | ODP   r     | RIFF  r
+  3FR   r     | DSS   r     | JP2   r/w   | ODS   r     | RSRC  r
+  3G2   r/w   | DV    r     | JPEG  r/w   | ODT   r     | RTF   r
+  3GP   r/w   | DVB   r/w   | JSON  r     | OFR   r     | RW2   r/w
+  A     r     | DVR-MS r    | JXL   r     | OGG   r     | RWL   r/w
+  AA    r     | DYLIB r     | K25   r     | OGV   r     | RWZ   r
+  AAE   r     | EIP   r     | KDC   r     | ONP   r     | RM    r
+  AAX   r/w   | EPS   r/w   | KEY   r     | OPUS  r     | SEQ   r
+  ACR   r     | EPUB  r     | LA    r     | ORF   r/w   | SKETCH r
+  AFM   r     | ERF   r/w   | LFP   r     | ORI   r/w   | SO    r
+  AI    r/w   | EXE   r     | LIF   r     | OTF   r     | SR2   r/w
+  AIFF  r     | EXIF  r/w/c | LNK   r     | PAC   r     | SRF   r
+  APE   r     | EXR   r     | LRV   r/w   | PAGES r     | SRW   r/w
+  ARQ   r/w   | EXV   r/w/c | M2TS  r     | PBM   r/w   | SVG   r
+  ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PCD   r     | SWF   r
+  ASF   r     | FFF   r/w   | MACOS r     | PCX   r     | THM   r/w
+  AVI   r     | FITS  r     | MAX   r     | PDB   r     | TIFF  r/w
+  AVIF  r/w   | FLA   r     | MEF   r/w   | PDF   r/w   | TORRENT r
+  AZW   r     | FLAC  r     | MIE   r/w/  | PEF   r/w   | TTC   r
+  BMP   r     | FLIF  r/w   | MIFF  r   c | PFA   r     | TTF   r
+  BPG   r     | FLV   r     | MKA   r     | PFB   r     | TXT   r
+  BTF   r     | FPF   r     | MKS   r     | PFM   r     | VCF   r
+  CHM   r     | FPX   r     | MKV   r     | PGF   r     | VRD   r/w/c
+  COS   r     | GIF   r/w   | MNG   r/w   | PGM   r/w   | VSD   r
+  CR2   r/w   | GPR   r/w   | MOBI  r     | PLIST r     | WAV   r
+  CR3   r/w   | GZ    r     | MODD  r     | PICT  r     | WDP   r/w
+  CRM   r/w   | HDP   r/w   | MOI   r     | PMP   r     | WEBP  r
+  CRW   r/w   | HDR   r     | MOS   r/w   | PNG   r/w   | WEBM  r
+  CS1   r/w   | HEIC  r/w   | MOV   r/w   | PPM   r/w   | WMA   r
+  CSV   r     | HEIF  r/w   | MP3   r     | PPT   r     | WMV   r
+  CZI   r     | HTML  r     | MP4   r/w   | PPTX  r     | WTV   r
+  DCM   r     | ICC   r/w/c | MPC   r     | PS    r/w   | WV    r
+  DCP   r/w   | ICS   r     | MPG   r     | PSB   r/w   | X3F   r/w
+  DCR   r     | IDML  r     | MPO   r/w   | PSD   r/w   | XCF   r
+  DFONT r     | IIQ   r/w   | MQV   r/w   | PSP   r     | XLS   r
+  DIVX  r     | IND   r/w   | MRC   r     | QTIF  r/w   | XLSX  r
+  DJVU  r     | INSP  r/w   | MRW   r/w   | R3D   r     | XMP   r/w/c
+  DLL   r     | INSV  r     | MXF   r     | RA    r     | ZIP   r
+  DNG   r/w   | INX   r     | NEF   r/w   | RAF   r/w   |
+  DOC   r     | ISO   r     | NRW   r/w   | RAM   r     |
+  DOCX  r     | ITC   r     | NUMBERS r   | RAR   r     |
+  DPX   r     | J2C   r     | O     r     | RAW   r/w   |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -5393,7 +5408,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.25 --
+    -- Generated by ExifTool 12.32 --
     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
@@ -5709,9 +5724,10 @@ The B<-t> option adds tag table information to the output (see B<-t> for
 details).
 
 Note:  This output is NOT the same as XMP because it uses
-dynamically-generated property names corresponding to the ExifTool tag
-names, and not the standard XMP properties.  To write XMP instead, use the
-B<-o> option with an XMP extension for the output file.
+dynamically-generated property names corresponding to the ExifTool tag names
+with ExifTool family 1 group names as namespaces, and not the standard XMP
+properties and namespaces.  To write XMP instead, use the B<-o> option with
+an XMP extension for the output file.
 
 =back
 
@@ -6358,7 +6374,7 @@ exit status of the command (see L</EXIT STATUS>).
 
 Save the names of files giving errors (I<NUM> missing or 1), files that were
 unchanged (I<NUM> is 2), files that fail the B<-if> condition (I<NUM> is 4),
-or any combination thereof (by summing I<NUM>, eg. B<-efile3> is the same
+or any combination thereof by summing I<NUM> (eg. B<-efile3> is the same
 has having both B<-efile> and B<-efile2> options with the same I<ERRFILE>).
 By default, file names are appended to any existing I<ERRFILE>, but
 I<ERRFILE> is overwritten if an exclamation point is added to the option

data/bin/fmt_files/gpx.fmt

@@ -13,7 +13,7 @@
 #               2019/10/24 - PH Preserve sub-seconds in GPSDateTime value
 #
 # Notes:     1) Input file(s) must contain GPSLatitude and GPSLongitude.
-#            2) The -ee option is to extract the full track from video files.
+#            2) The -ee3 option is to extract the full track from video files.
 #            3) The -fileOrder option may be used to control the order of the
 #               generated track points when processing multiple files.
 #------------------------------------------------------------------------------

data/bin/fmt_files/gpx_wpt.fmt

@@ -14,7 +14,7 @@
 #               2019/10/24 - PH Preserve sub-seconds in GPSDateTime value
 #
 # Notes:     1) Input file(s) must contain GPSLatitude and GPSLongitude.
-#            2) The -ee option is to extract the full track from video files.
+#            2) The -ee3 option is to extract the full track from video files.
 #            3) The -fileOrder option may be used to control the order of the
 #               generated track points when processing multiple files.
 #------------------------------------------------------------------------------

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.44';
+$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',
@@ -2117,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;
@@ -2145,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.47';
+$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)
@@ -519,7 +519,8 @@ $VERSION = '4.47';
     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)
@@ -557,7 +558,8 @@ $VERSION = '4.47';
     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
@@ -579,19 +581,21 @@ $VERSION = '4.47';
     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.xx' => 'Canon RF 100mm F2.8L MACRO IS USM',
     65535 => 'n/a',
 );
 
@@ -6760,6 +6764,8 @@ 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
+           #xxx => 'Canon RF 100mm F2.8L MACRO IS USM',
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },
     },
@@ -9253,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/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]' },