exiftool-vendored.pl 12.31.0 → 12.33.0

package/bin/Changes

@@ -7,11 +7,43 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 12.30. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Oct. 16, 2021 - Version 12.33
+
+  - Added support for DNG version 1.6.0.0
+  - Added two new Sony LensType values (thanks Jos Roost and LibRaw)
+  - Added some new elements to the XMP-crs:Look structure (thanks Herb)
+  - Added a few new IPTC XMP tags (thanks Michael Steidl)
+  - Added a new Canon RF lens (thanks Norbert Wasser)
+  - Decode Canon ShutterMode (thanks John Moyer)
+  - Extract LensModel from some Olympus MOV videos
+  - Generate MediaDataOffset/Size for MOV videos with zero-sized MDAT chunk
+  - Improvements to CBOR reader, including hex dump with -v3 option
+  - Recognize Final Cut Pro XML files
+  - Allow binary data of Protected tags to be extracted with the -X -j and -php
+    options with -b by setting the API RequestAll option to 3
+  - Changed name of "Canon EF 80-200mm f/4.5-5.6" lens with LensType 38 to add
+    "II" to the name (Exiv2 issue 1906)
+  - Fixed runtime warning when processing files with a .DIR extension
+
+Sept. 30, 2021 - Version 12.32
+
+  - Added support for CBOR-format metadata in JUMBF (note that JUMBF support is
+    still experimental)
+  - Added a new Nikon LensID
+  - Added a new Pentax LensType
+  - Decode timed GPS for two more dashcam formats
+  - Support reference direction columns in -geotag CSV input
+  - Removed generation of GPSSpeedRef and GPSTrackRef tags in timed metadata for
+    most dashcam formats when speed is km/h and track is relative to true north
+  - Patched to allow writing of console output to named pipes
+  - Fixed formatting of InternalSerialNumber for some Panasonic cameras
+  - Fixed bug in arg_files/xmp2exif.args support file
+
 Sept. 22, 2021 - Version 12.31
 
   - Added a new SonyModelID and a couple of new Sony lenses (thanks Jos Roost)
   - Added a new Canon LensType (thanks Chris Skopec)
-  - Added Composite GPSLatitude/Longitude tags for Sony videos which combine the
+  - Added Composite GPSLatitude/Longitude tags for Sony videos to combine the
     reference hemispheres as with the Composite tags for EXIF GPS
   - Decode DPX AspectRatio
   - Decode more GoPro MP4 tags
@@ -1470,8 +1502,8 @@ Oct. 9, 2018 - Version 11.13
   - Added a new Canon LensType (thanks LibRaw)
   - Minor improvements to verbose dump of streaming GPS metadata
   - Reverted change of version 10.71 which resulted in Windows not recognizing
-    PNG CreationTime as written by ExifTool (added this feature to the
-    StrictDate API option instead)
+    PNG CreationTime as written by ExifTool (added this feature to the API
+    StrictDate option instead)
   - Improved decoding of Nikon CropHiSpeed (thanks LibRaw)
   - Improved -fast option to reduce memory usage when reading JPG, PNG,
     QuickTime-based and RIFF-based files via a sequential stream
@@ -1585,7 +1617,7 @@ June 21, 2018 - Version 11.03
 June 13, 2018 - Version 11.02
 
   - Added support for a different format of Apple iWorks files
-  - Added undocumented FixCorruptedMOV API option to allow fixing MOV videos
+  - Added undocumented API FixCorruptedMOV option to allow fixing MOV videos
     with multiple 'mdat' atoms which were corrupted by ExifTool
   - Decode more QuickTime tags
   - Decode more PanasonicRaw tags (thanks Klaus Homeister)

package/bin/MANIFEST

@@ -48,6 +48,7 @@ html/TagNames/Apple.html
 html/TagNames/Audible.html
 html/TagNames/BMP.html
 html/TagNames/BPG.html
+html/TagNames/CBOR.html
 html/TagNames/Canon.html
 html/TagNames/CanonCustom.html
 html/TagNames/CanonRaw.html
@@ -217,6 +218,7 @@ lib/Image/ExifTool/BPG.pm
 lib/Image/ExifTool/BZZ.pm
 lib/Image/ExifTool/BigTIFF.pm
 lib/Image/ExifTool/BuildTagLookup.pm
+lib/Image/ExifTool/CBOR.pm
 lib/Image/ExifTool/Canon.pm
 lib/Image/ExifTool/CanonCustom.pm
 lib/Image/ExifTool/CanonRaw.pm

package/bin/META.json

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

package/bin/META.yml

@@ -28,5 +28,5 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 12.31
+version: 12.33
 x_serialization_backend: 'JSON::PP version 4.02'

package/bin/README

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

package/bin/arg_files/xmp2exif.args

@@ -13,6 +13,7 @@
 #               2015/01/12 - PH Avoid copying from non-standard namespaces
 #               2016/09/26 - PH Write Composite SubSec tags
 #               2018/05/07 - PH Added support for GPSDestXxxRef tags
+#               2021/09/30 - PH Removed erroneous "-" when copying CreatorTool
 #
 # References:   http://www.metadataworkinggroup.org/specs/
 #
@@ -34,7 +35,7 @@
 -Composite:SubSecDateTimeOriginal < XMP-photoshop:DateCreated
 -Composite:SubSecCreateDate < XMP-xmp:CreateDate
 -Composite:SubSecModifyDate < XMP-xmp:ModifyDate
--EXIF:Software < -XMP-xmp:CreatorTool
+-EXIF:Software < XMP-xmp:CreatorTool
 -EXIF:Copyright < XMP-dc:Rights
 -EXIF:Artist < XMP-dc:Creator
 # XMP flash information is translated by the Composite Flash tag

package/bin/exiftool

@@ -10,7 +10,7 @@
 use strict;
 require 5.004;
 
-my $version = '12.31';
+my $version = '12.33';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -1619,7 +1619,7 @@ if (@newValues) {
             next;
         }
         my %opts = ( Shift => 0 );  # shift values if possible instead of adding/deleting
-        # allow writing of 'unsafe' tags unless specified by wildcard
+        # allow writing of 'Unsafe' tags unless specified by wildcard
         $opts{Protected} = 1 unless $tag =~ /[?*]/;
 
         if ($tag =~ s/<// and defined $newVal) {
@@ -2285,7 +2285,7 @@ TAG:    foreach $tag (@foundTags) {
                     # avoid extracting Protected binary tags (eg. data blocks) [insider information]
                     my $lcTag = lc $tag;
                     $lcTag =~ s/ .*//;
-                    next unless $$et{REQ_TAG_LOOKUP}{$lcTag};
+                    next unless $$et{REQ_TAG_LOOKUP}{$lcTag} or ($$et{OPTIONS}{RequestAll} || 0) > 2;
                 }
                 $val = ConvertBinary($val); # convert SCALAR references
                 next unless defined $val;
@@ -3250,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>";
@@ -3327,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 );
@@ -4730,11 +4732,11 @@ I<TAG> may contain one or more leading family 0, 1, 2 or 7 group names,
 prefixed by optional family numbers, and separated colons.  If no group name
 is specified, the tag is created in the preferred group, and updated in any
 other location where a same-named tag already exists.  The preferred group
-is the first group in the following list where I<TAG> is valid: 1) EXIF, 2)
-IPTC, 3) XMP.
+in JPEG and TIFF-format images is the first group in the following list
+where I<TAG> is valid: 1) EXIF, 2) IPTC, 3) XMP.
 
 The wildcards C<*> and C<?> may be used in tag names to assign the same
-value to multiple tags.  When specified with wildcards, "unsafe" tags are
+value to multiple tags.  When specified with wildcards, "Unsafe" tags are
 not written.  A tag name of C<All> is equivalent to C<*> (except that it
 doesn't require quoting, while arguments with wildcards do on systems with
 shell globbing), and is often used when deleting all metadata (ie. C<-All=>)
@@ -4880,10 +4882,10 @@ See L</COPYING EXAMPLES> for examples using B<-tagsFromFile>.
 Notes:
 
 1) Some tags (generally tags which may affect the appearance of the image)
-are considered "unsafe" to write, and are only copied if specified
+are considered "Unsafe" to write, and are only copied if specified
 explicitly (ie. no wildcards).  See the
 L<tag name documentation|Image::ExifTool::TagNames> for more details about
-"unsafe" tags.
+"Unsafe" tags.
 
 2) Be aware of the difference between excluding a tag from being copied
 (--I<TAG>), and deleting a tag (-I<TAG>=).  Excluding a tag prevents it from
@@ -4981,7 +4983,7 @@ intermediate file (C<out.args> in this example):
     exiftool -@ out.args -sep ', ' dst.jpg
 
 Note:  Be careful when copying information with this technique since it is
-easy to write tags which are normally considered "unsafe".  For instance,
+easy to write tags which are normally considered "Unsafe".  For instance,
 the FileName and Directory tags are excluded in the example above to avoid
 renaming and moving the destination file.  Also note that the second command
 above will produce warning messages for any tags which are not writable.
@@ -5001,8 +5003,8 @@ are in the default output.  By default, list items are separated by a
 newline when extracted with the B<-b> option, but this may be changed (see
 the B<-sep> option for details).  May be combined with B<-j>, B<-php> or
 B<-X> to extract binary data in JSON, PHP or XML format, but note that
-"unsafe" tags must be specified explicitly to be extracted as binary in
-these formats.
+"Unsafe" tags are not extracted as binary unless they are specified explicitly or
+the API RequestAll option is set to 3 or higher.
 
 With a leading double dash (B<--b> or B<--binary>), tags which contain
 binary data are suppressed in the output when reading.
@@ -5203,7 +5205,7 @@ By default the resulting group name is simplified by removing any leading
 C<Main:> and collapsing adjacent identical group names, but this can be
 avoided by placing a colon before the first family number (eg. B<-g:3:1>).
 Use the B<-listg> option to list group names for a specified family.  The
-SavePath and SaveFormat API options are automatically enabled if the
+API SavePath and SaveFormat options are automatically enabled if the
 respective family 5 or 6 group names are requested.  See the
 L<API GetGroup documentation|Image::ExifTool/GetGroup> for more information.
 
@@ -5406,7 +5408,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.31 --
+    -- Generated by ExifTool 12.33 --
     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
@@ -5423,7 +5425,7 @@ are effectively processed as separate input files.
 If a specified tag does not exist, a minor warning is issued and the line
 with the missing tag is not printed.  However, the B<-f> option may be used
 to set the value of missing tags to '-' (but this may be configured via the
-MissingTagValue API option), or the B<-m> option may be used to ignore minor
+API MissingTagValue option), or the B<-m> option may be used to ignore minor
 warnings and leave the missing values empty.  Alternatively, B<-q -q> may be
 used to simply suppress the warning messages.
 

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

@@ -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',
@@ -459,7 +460,7 @@ According to the specification, integer-format QuickTime date/time tags
 should be stored as UTC.  Unfortunately, digital cameras often store local
 time values instead (presumably because they don't know the time zone).  For
 this reason, by default ExifTool does not assume a time zone for these
-values.  However, if the L<QuickTimeUTC|../ExifTool.html#QuickTimeUTC> API option is set, then ExifTool will
+values.  However, if the API L<QuickTimeUTC|../ExifTool.html#QuickTimeUTC> option is set, then ExifTool will
 assume these values are properly stored as UTC, and will convert them to
 local time when extracting.
 

package/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
+

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.51';
+$VERSION = '4.52';
 
 # 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.51';
     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
@@ -595,6 +595,7 @@ $VERSION = '4.51';
    '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 16mm F2.8 STM', #42
   #'61182.xx' => 'Canon RF 100mm F2.8L MACRO IS USM',
     65535 => 'n/a',
 );
@@ -6731,7 +6732,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,
@@ -6764,7 +6775,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', #IB
+            281 => 'Canon RF 14-35mm F4L IS USM', #42/IB
+            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
         },