exiftool_vendored 13.36.0 → 13.38.0

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

@@ -5,9 +5,12 @@
 #
 # Revisions:    2024-12-04 - P. Harvey Created
 #
-# Notes:        Tag definitions for Protobuf tags support additional 'signed',
-#               'unsigned' and 'int64s' formats for varInt (type 0) values,
-#               and 'rational' for byte (type 2) values
+# Notes:        Tag definitions for Protobuf tags support 'signed', 'unsigned',
+#               and 'int64s' formats for VARINT (type 0) values, 'int64u',
+#               'int64s', 'rational64u', 'rational64s' and 'double' for I64
+#               (type 1), 'undef', 'string' and 'rational' for LEN (type 2),
+#               and 'int32u', 'int32s', 'rational32u', 'rational32s', 
+#               'fixed32u', 'fixed32s' and 'float' for I32 (type 5) values.
 #
 # References:   1) https://protobuf.dev/programming-guides/encoding/
 #------------------------------------------------------------------------------
@@ -18,7 +21,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.04';
+$VERSION = '1.05';
 
 sub ProcessProtobuf($$$;$);
 
@@ -128,6 +131,9 @@ sub ProcessProtobuf($$$;$)
         $$et{ProtoPrefix}{$dirName} = '' unless defined $$et{ProtoPrefix}{$dirName};
         SetByteOrder('II');
     }
+    # prefix for unknown tags
+    my $unkPre = $$tagTbl{TAG_PREFIX} ? $$tagTbl{TAG_PREFIX} . '_' : 'Protobuf ';
+    
     # loop through protobuf records
     for (;;) {
         my $pos = $$dirInfo{Pos};
@@ -195,7 +201,7 @@ sub ProcessProtobuf($$$;$)
                 # (fall through to process known SubDirectory)
             } elsif ($$tagInfo{IsProtobuf}) {
                 # process Unknown protobuf directories
-                $et->VPrint(1, "$$et{INDENT}Protobuf $tag (" . length($buff) . " bytes) -->\n");
+                $et->VPrint(1, "$$et{INDENT}${unkPre}$tag (" . length($buff) . " bytes) -->\n");
                 my $addr = $dataPos + $$dirInfo{Pos} - length($buff);
                 $et->VerboseDump(\$buff, Addr => $addr, Prefix => $$et{INDENT});
                 my %subdir = ( DataPt => \$buff, DataPos => $addr, DirName => $dirName );
@@ -212,7 +218,7 @@ sub ProcessProtobuf($$$;$)
                     my $denom = VarInt(\%dir);
                     $rat = " (rational $num/$denom)" if $denom and $dir{Pos} == length($buff);
                 }
-                if ($buff !~ /[^\x20-\x7e]/) {
+                if ($buff !~ /[^\r\n\t\x20-\x7e]/) {
                     $val = $buff;   # assume this is an ASCII string
                 } elsif (length($buff) % 4) {
                     $val = '0x' . unpack('H*', $buff);

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

@@ -28,7 +28,7 @@ my @qualcommFormat = (
 %Image::ExifTool::Qualcomm::Main = (
     PROCESS_PROC => \&ProcessQualcomm,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
-    VARS => { NO_ID => 1, NO_LOOKUP => 1 }, # too long, too many, and too obscure
+    VARS => { ID_FMT => 'none', NO_LOOKUP => 1 }, # too long, too many, and too obscure
     NOTES => q{
         The tags below have been observed in the JPEG APP7 "Qualcomm Camera
         Attributes" segment written by some cameras such as the HP iPAQ Voice
@@ -1228,7 +1228,7 @@ my @qualcommFormat = (
 %Image::ExifTool::Qualcomm::DualCamera = (
     PROCESS_PROC => \&ProcessDualCamera,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
-    VARS => { NO_ID => 1, NO_LOOKUP => 1 }, # too long, too many, and too obscure
+    VARS => { ID_FMT => 'none', NO_LOOKUP => 1 }, # too long, too many, and too obscure
     NOTES => q{
         Found in JPEG APP4 "Qualcomm Dual Camera Attributes" written by some Nokia
         phones.

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

@@ -49,7 +49,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.19';
+$VERSION = '3.21';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -2269,6 +2269,27 @@ my %userDefined = (
             Base => '$start - 10',
             ByteOrder => 'LittleEndian',
         },
+    },{
+        Name => 'MakerNoteRicohPentax2',
+        # used by cameras such as the Ricoh GR III
+        Condition => '$$valPt=~/^RICOH\0II/',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Pentax::Main',
+            ProcessProc => \&Image::ExifTool::Exif::ProcessExif, # (because ProcessMOV is default)
+            Start => 8,
+            Base => '$start - 8',
+            ByteOrder => 'LittleEndian',
+        },
+    },{
+        Name => 'MakerNoteRicohPentax3',
+        Condition => '$$valPt=~/^RICOH\0MM/', # (just in case)
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Pentax::Main',
+            ProcessProc => \&Image::ExifTool::Exif::ProcessExif, # (because ProcessMOV is default)
+            Start => 8,
+            Base => '$start - 8',
+            ByteOrder => 'BigEndian',
+        },
     },{
         Name => 'MakerNotePentaxUnknown',
         Binary => 1,
@@ -7301,6 +7322,7 @@ my %userDefined = (
         },
         {
             Name => 'TimeToSampleTable',
+            Format => 'undef',
             Flags => ['Binary','Unknown'],
         },
     ],
@@ -10063,14 +10085,14 @@ sub ProcessMOV($$;$)
                 ProcessKenwoodTrailer($et, { RAF => $raf }, $tbl);
                 last;
             }
-            $ignore = 1;
-            if ($tagInfo and not $$tagInfo{Unknown} and not $eeTag) {
+            if (not $tagInfo or $$tagInfo{Unknown}) {
+                $ignore = 1;
+            } elsif ($size > 0x8000000) {
                 my $t = PrintableTagID($tag,2);
-                if ($size > 0x8000000) {
-                    $et->Warn("Skipping '${t}' atom > 128 MiB", 1);
-                } else {
-                    $et->Warn("Skipping '${t}' atom > 32 MiB", 2) or $ignore = 0;
-                }
+                $et->Warn("Skipping '${t}' atom > 128 MiB", $eeTag ? 2 : 1) and $ignore = 1;
+            } elsif (not $eeTag) {
+                my $t = PrintableTagID($tag,2);
+                $et->Warn("Skipping '${t}' atom > 32 MiB", 2) and $ignore = 1;
             }
         }
         if (defined $tagInfo and not $ignore and not ($tagInfo and $$tagInfo{DontRead})) {

data/bin/lib/Image/ExifTool/QuickTimeStream.pl

@@ -984,7 +984,9 @@ sub SetGPSDateTime($$$;$)
             }
             $sampleTime -= $tzOff;  # shift from local time to UTC
         }
+        $$et{SET_GROUP0} = 'Composite';
         $et->HandleTag($tagTbl, GPSDateTime => Image::ExifTool::ConvertUnixTime($sampleTime,0,3) . 'Z');
+        delete $$et{SET_GROUP0};
     }
 }
 

data/bin/lib/Image/ExifTool/README

@@ -211,12 +211,13 @@ key:
                   an ID_LABEL of "Index" is assumed for tables which use
                   ProcessBinaryData or set the IS_BINARY flag.
 
-    NO_ID         Avoid printing "Tag ID" column in tag name documentation.
-
-    HEX_ID        Print tag ID in hexadecimal (with 4 hex digits or more).  Set
-                  to 0 for string ID's that look like hex numbers to prevent
-                  them from being converted when importing an XML file for
-                  language translations in BuildLangModules().
+    ID_FMT        Format for tag ID's in the documentation.  Setting is 'hex' to
+                  print tag ID in hexadecimal (with 4 hex digits or more), 'dec'
+                  to leave as decimal, 'str' to use a quoted string, or 'none'
+                  to drop the "Tag ID" column entirely.  Any setting other than
+                  'hex' prevents hex-looking strings from being converted when
+                  importing an XML file for language translations in
+                  BuildLangModules().
 
     NO_LOOKUP     Do not add tags to TagLookup.pm lookup tables.
 

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

@@ -22,7 +22,7 @@ my $implementedRawzorVersion = 199; # (up to version 1.99)
 # Rawzor-specific tags
 %Image::ExifTool::Rawzor::Main = (
     GROUPS => { 2 => 'Other' },
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => q{
         Rawzor files store compressed images of other formats. As well as the
         information listed below, exiftool uncompresses and extracts the meta