exiftool_vendored 12.93.0 → 12.95.0

data/bin/lib/Image/ExifTool/TagNames.pod

@@ -12,7 +12,7 @@ meta information extracted from or written to a file.
 =head1 TAG TABLES
 
 The tables listed below give the names of all tags recognized by ExifTool.
-They contain a total of 27899 tags, with 17464 unique tag names.
+They contain a total of 27985 tags, with 17475 unique tag names.
 
 B<Tag ID>, B<Index#> or B<Sequence> is given in the first column of each
 table.  A B<Tag ID> is the computer-readable equivalent of a tag name, and
@@ -9331,6 +9331,7 @@ Unknown only to reduce the volume of the normal output.
            ColorData9                           Canon ColorData9
            ColorData10                          Canon ColorData10
            ColorData11                          Canon ColorData11
+           ColorData12                          Canon ColorData12
            ColorDataUnknown                     Canon ColorDataUnknown
   0x4002   CRWParam?                            no
   0x4003   ColorInfo                            Canon ColorInfo
@@ -11437,6 +11438,97 @@ These tags are used by the EOS R3, R7 and R6mkII
     641    SpecularWhiteLevel                   int16u
     642    LinearityUpperMargin                 int16u
 
+=head3 Canon ColorData12 Tags
+
+These tags are used by the EOS R1 and R5mkII
+
+  Index2   Tag Name                             Writable
+  ------   --------                             --------
+      0    ColorDataVersion                     int16s
+    105    WB_RGGBLevelsAsShot                  int16s[4]
+    109    ColorTempAsShot                      int16s
+    110    WB_RGGBLevelsDaylight                int16s[4]
+    114    ColorTempDaylight                    int16s
+    115    WB_RGGBLevelsShade                   int16s[4]
+    119    ColorTempShade                       int16s
+    120    WB_RGGBLevelsCloudy                  int16s[4]
+    124    ColorTempCloudy                      int16s
+    125    WB_RGGBLevelsTungsten                int16s[4]
+    129    ColorTempTungsten                    int16s
+    130    WB_RGGBLevelsFluorescent             int16s[4]
+    134    ColorTempFluorescent                 int16s
+    135    WB_RGGBLevelsFlash                   int16s[4]
+    139    ColorTempFlash                       int16s
+    140    WB_RGGBLevelsUnknown2?               int16s[4]
+    144    ColorTempUnknown2?                   int16s
+    145    WB_RGGBLevelsUnknown3?               int16s[4]
+    149    ColorTempUnknown3?                   int16s
+    150    WB_RGGBLevelsUnknown4?               int16s[4]
+    154    ColorTempUnknown4?                   int16s
+    155    WB_RGGBLevelsUnknown5?               int16s[4]
+    159    ColorTempUnknown5?                   int16s
+    160    WB_RGGBLevelsUnknown6?               int16s[4]
+    164    ColorTempUnknown6?                   int16s
+    165    WB_RGGBLevelsUnknown7?               int16s[4]
+    169    ColorTempUnknown7?                   int16s
+    170    WB_RGGBLevelsUnknown8?               int16s[4]
+    174    ColorTempUnknown8?                   int16s
+    175    WB_RGGBLevelsUnknown9?               int16s[4]
+    179    ColorTempUnknown9?                   int16s
+    180    WB_RGGBLevelsUnknown10?              int16s[4]
+    184    ColorTempUnknown10?                  int16s
+    185    WB_RGGBLevelsUnknown11?              int16s[4]
+    189    ColorTempUnknown11?                  int16s
+    190    WB_RGGBLevelsUnknown12?              int16s[4]
+    194    ColorTempUnknown12?                  int16s
+    195    WB_RGGBLevelsUnknown13?              int16s[4]
+    199    ColorTempUnknown13?                  int16s
+    200    WB_RGGBLevelsUnknown14?              int16s[4]
+    204    ColorTempUnknown14?                  int16s
+    205    WB_RGGBLevelsUnknown15?              int16s[4]
+    209    ColorTempUnknown15?                  int16s
+    210    WB_RGGBLevelsUnknown16?              int16s[4]
+    214    ColorTempUnknown16?                  int16s
+    215    WB_RGGBLevelsUnknown17?              int16s[4]
+    219    ColorTempUnknown17?                  int16s
+    220    WB_RGGBLevelsUnknown18?              int16s[4]
+    224    ColorTempUnknown18?                  int16s
+    225    WB_RGGBLevelsUnknown19?              int16s[4]
+    229    ColorTempUnknown19?                  int16s
+    230    WB_RGGBLevelsUnknown20?              int16s[4]
+    234    ColorTempUnknown20?                  int16s
+    235    WB_RGGBLevelsUnknown21?              int16s[4]
+    239    ColorTempUnknown21?                  int16s
+    240    WB_RGGBLevelsUnknown22?              int16s[4]
+    244    ColorTempUnknown22?                  int16s
+    245    WB_RGGBLevelsUnknown23?              int16s[4]
+    249    ColorTempUnknown23?                  int16s
+    250    WB_RGGBLevelsUnknown24?              int16s[4]
+    254    ColorTempUnknown24?                  int16s
+    255    WB_RGGBLevelsUnknown25?              int16s[4]
+    259    ColorTempUnknown25?                  int16s
+    260    WB_RGGBLevelsUnknown26?              int16s[4]
+    264    ColorTempUnknown26?                  int16s
+    265    WB_RGGBLevelsUnknown27?              int16s[4]
+    269    ColorTempUnknown27?                  int16s
+    270    WB_RGGBLevelsUnknown28?              int16s[4]
+    274    ColorTempUnknown28?                  int16s
+    275    WB_RGGBLevelsUnknown29?              int16s[4]
+    279    ColorTempUnknown29?                  int16s
+    280    WB_RGGBLevelsUnknown30?              int16s[4]
+    284    ColorTempUnknown30?                  int16s
+    285    WB_RGGBLevelsUnknown31?              int16s[4]
+    289    ColorTempUnknown31?                  int16s
+    290    WB_RGGBLevelsUnknown32?              int16s[4]
+    294    ColorTempUnknown32?                  int16s
+    295    WB_RGGBLevelsUnknown33?              int16s[4]
+    299    ColorTempUnknown33?                  int16s
+    320    ColorCalib?                          Canon ColorCalib
+    383    PerChannelBlackLevel                 int16u[4]
+    660    NormalWhiteLevel                     int16u
+    661    SpecularWhiteLevel                   int16u
+    662    LinearityUpperMargin                 int16u
+
 =head3 Canon ColorDataUnknown Tags
 
   Index2   Tag Name                             Writable
@@ -29818,16 +29910,18 @@ changed via the config file.
   'artist'      Artist                          yes
   'artwork'     Artwork                         yes
   'author'      Author                          yes
-  'camera.focal_length.35mm_equivalent'
-                FocalLengthIn35mmFormat         yes
   'camera.framereadouttimeinmicroseconds'
                 FrameReadoutTime                yes
   'camera.identifier' CameraIdentifier          yes
-  'camera.lens_model' LensModel                 yes
   'collection.user' UserCollection              yes
-  'com.android.capture.fps' AndroidCaptureFPS   yes
+  'com.android.capture.fps' AndroidCaptureFPS   float
+  'com.android.manufacturer' AndroidMake        yes
+  'com.android.model' AndroidModel              yes
   'com.android.version' AndroidVersion          yes
   'com.apple.photos.captureMode' CaptureMode    yes
+  'com.xiaomi.hdr10' XiaomiHDR10                int32s
+  'com.xiaomi.preview_video_cover'
+                XiaomiPreviewVideoCover         int32s
   'comment'     Comment                         yes
   'compatible_brands' CompatibleBrands          yes/
   'content.identifier' ContentIdentifier        yes
@@ -29887,6 +29981,7 @@ changed via the config file.
   'title'       Title                           yes
   'version'     Version                         yes
   'video-orientation' VideoOrientation          no
+  'xiaomi.exifInfo.videoinfo' XiaomiExifInfo    yes
   'year'        Year                            yes
 
 =head3 QuickTime FaceInfo Tags
@@ -39366,6 +39461,7 @@ AFM, ACFM and AMFM font files.
   Tag ID       Tag Name                         Writable
   ------       --------                         --------
   'AFM'        AFM                              Font AFM
+  'C2PA'       C2PA                             Jpeg2000
   'PFM'        PFMHeader                        Font PFM
   'PSInfo'     PSFontInfo                       Font PSInfo
   'fontname'   FontName                         no

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

@@ -847,7 +847,7 @@ sub WriteQuickTime($$$)
     $et or return 1;    # allow dummy access to autoload this package
     my ($mdat, @mdat, @mdatEdit, $edit, $track, $outBuff, $co, $term, $delCount);
     my (%langTags, $canCreate, $delGrp, %boxPos, %didDir, $writeLast, $err, $atomCount);
-    my ($tag, $lastTag, $errStr);
+    my ($tag, $lastTag, $lastPos, $errStr, $copyTrailer, $buf2);
     my $outfile = $$dirInfo{OutFile} || return 0;
     my $raf = $$dirInfo{RAF};       # (will be null for lower-level atoms)
     my $dataPt = $$dirInfo{DataPt}; # (will be null for top-level atoms)
@@ -923,6 +923,7 @@ sub WriteQuickTime($$$)
     $tag = $lastTag = '';
 
     for (;;) {      # loop through all atoms at this level
+        $lastPos = $raf->Tell();
         $lastTag = $tag if $$tagTablePtr{$tag};    # keep track of last known tag
         if (defined $atomCount and --$atomCount < 0 and $dataPt) {
             # stop processing now and just copy the rest of the atom
@@ -1523,16 +1524,38 @@ sub WriteQuickTime($$$)
     }
     # ($errStr is set if there was an error that could possibly be due to an unknown trailer)
     if ($errStr) {
-        if (($lastTag eq 'mdat' or $lastTag eq 'moov') and not $dataPt and (not $$tagTablePtr{$tag} or
-            ref $$tagTablePtr{$tag} eq 'HASH' and $$tagTablePtr{$tag}{Unknown}))
+        if (($lastTag eq 'mdat' or $lastTag eq 'moov' or ($lastTag eq 'free' and @mdat)) and not $dataPt and
+            (not $$tagTablePtr{$tag} or ref $$tagTablePtr{$tag} eq 'HASH' and $$tagTablePtr{$tag}{Unknown}))
         {
+            # identify known trailers
+            if ($raf->Seek(-40,2) and $raf->Read($buf2,40)==40 and
+                substr($buf2, 8) eq '8db42d694ccc418790edff439fe026bf' and
+                $lastPos == $raf->Tell() - unpack('V',$buf2))
+            {
+                $copyTrailer = [ $lastPos, 'Insta360' ];
+            } else {
+                $buf2 = '';
+                $raf->Seek($lastPos,0) and $raf->Read($buf2,8);
+                if ($buf2 eq 'CCCCCCCC') {
+                    $copyTrailer = [ $lastPos, 'Kenwood' ];
+                } elsif ($buf2 =~ /^(gpsa|gps0|gsen|gsea)...\0/s) {
+                    $copyTrailer = [ $lastPos, 'RIFF' ];
+                }
+            }
+            # are we deleting the trailer?
             my $nvTrail = $et->GetNewValueHash($Image::ExifTool::Extra{Trailer});
             if ($$et{DEL_GROUP}{Trailer} or ($nvTrail and not ($$nvTrail{Value} and $$nvTrail{Value}[0]))) {
                 $errStr =~ s/ is too large.*//;
-                $et->Warn('Deleted unknown trailer with ' . lcfirst($errStr));
-            } else {
+                if ($copyTrailer) {
+                    $et->Warn("Deleted $$copyTrailer[1] trailer", 1);
+                    undef $copyTrailer;
+                } else {
+                    $et->Warn('Deleted unknown trailer with ' . lcfirst($errStr), 1);
+                }
+            } elsif (not $copyTrailer) {
                 $et->Warn('Unknown trailer with ' . lcfirst($errStr));
                 $et->Error('Use "-trailer=" to delete unknown trailer');
+                # (we don't currently copy an unknown trailer due to the chance it could be corrupted data)
             }
         } else {
             $et->Error($errStr);
@@ -1645,27 +1668,26 @@ sub WriteQuickTime($$$)
             }
             my $subName = $$subdir{DirName} || $$tagInfo{Name};
             # QuickTime hierarchy is complex, so check full directory path before adding
-            my $buff;
             if ($createKeys and $curPath eq 'MOV-Movie' and $subName eq 'Meta') {
                 $et->VPrint(0, "  Creating Meta with mdta Handler and Keys\n");
                 # init Meta box for Keys tags with mdta Handler and empty Keys+ItemList
-                $buff = "\0\0\0\x20hdlr\0\0\0\0\0\0\0\0mdta\0\0\0\0\0\0\0\0\0\0\0\0" .
+                $buf2 = "\0\0\0\x20hdlr\0\0\0\0\0\0\0\0mdta\0\0\0\0\0\0\0\0\0\0\0\0" .
                         "\0\0\0\x10keys\0\0\0\0\0\0\0\0" .
                         "\0\0\0\x08ilst";
             } elsif ($createKeys and $curPath eq 'MOV-Movie-Meta') {
-                $buff = ($subName eq 'Keys' ? "\0\0\0\0\0\0\0\0" : '');
+                $buf2 = ($subName eq 'Keys' ? "\0\0\0\0\0\0\0\0" : '');
             } elsif ($subName eq 'Meta' and $$et{OPTIONS}{QuickTimeHandler}) {
                 $et->VPrint(0, "  Creating Meta with mdir Handler\n");
                 # init Meta box for ItemList tags with mdir Handler
-                $buff = "\0\0\0\x20hdlr\0\0\0\0\0\0\0\0mdir\0\0\0\0\0\0\0\0\0\0\0\0";
+                $buf2 = "\0\0\0\x20hdlr\0\0\0\0\0\0\0\0mdir\0\0\0\0\0\0\0\0\0\0\0\0";
             } else {
                 next unless $curPath eq $writePath and $$addDirs{$subName} and $$addDirs{$subName} eq $dirName;
-                $buff = '';  # write from scratch
+                $buf2 = '';  # write from scratch
             }
             my %subdirInfo = (
                 Parent   => $dirName,
                 DirName  => $subName,
-                DataPt   => \$buff,
+                DataPt   => \$buf2,
                 DirStart => 0,
                 HasData  => $$subdir{HasData},
                 OutFile  => $outfile,
@@ -1978,9 +2000,8 @@ sub WriteQuickTime($$$)
                 $result or $et->Error("Truncated mdat atom"), last;
             } else {
                 # mdat continues to end of file
-                my $buff;
-                while ($raf->Read($buff, 65536)) {
-                    Write($outfile, $buff) or $rtnVal = 0, last;
+                while ($raf->Read($buf2, 65536)) {
+                    Write($outfile, $buf2) or $rtnVal = 0, last;
                 }
             }
         }
@@ -1989,6 +2010,18 @@ sub WriteQuickTime($$$)
     # write the stuff that must come last
     Write($outfile, $writeLast) or $rtnVal = 0 if $writeLast;
 
+    # copy trailer if necessary
+    if ($copyTrailer) {
+        if ($raf->Seek($$copyTrailer[0])) {
+            $et->Warn(sprintf('Copying %s trailer from offset 0x%x', $$copyTrailer[1], $lastPos), 1);
+            while ($raf->Read($buf2, 65536)) {
+                Write($outfile, $buf2) or $rtnVal = 0, last;
+            }
+        } else {
+            $et->Error('Error copying Insta360 trailer');
+            $rtnVal = 0;
+        }
+    }
     return $rtnVal;
 }
 

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

@@ -19,7 +19,6 @@ use Image::ExifTool::Fixup;
 
 sub AssembleRational($$@);
 sub LastInList($);
-sub CreateDirectory($$);
 sub NextFreeTagKey($$);
 sub RemoveNewValueHash($$$);
 sub RemoveNewValuesForGroup($$);
@@ -2085,9 +2084,10 @@ sub SetFileName($$;$$$)
         return 1;
     }
     # create directory for new file if necessary
-    my $result;
-    if (($result = $self->CreateDirectory($newName)) != 0) {
-        if ($result < 0) {
+    my $err = $self->CreateDirectory($newName);
+    if (defined $err) {
+        if ($err) {
+            $self->Warn($err) unless $err =~ /^Error creating/;
             $self->Warn("Error creating directory for '${newName}'");
             return -1;
         }
@@ -3554,55 +3554,6 @@ sub IsRawType($)
     return $rawType{$$self{FileType}};
 }
 
-#------------------------------------------------------------------------------
-# Create directory for specified file
-# Inputs: 0) ExifTool ref, 1) complete file name including path
-# Returns: 1 = directory created, 0 = nothing done, -1 = error
-my $k32CreateDir;
-sub CreateDirectory($$)
-{
-    local $_;
-    my ($self, $file) = @_;
-    my $rtnVal = 0;
-    my $enc = $$self{OPTIONS}{CharsetFileName};
-    my $dir;
-    ($dir = $file) =~ s/[^\/]*$//;  # remove filename from path specification
-    # recode as UTF-8 if necessary
-    if ($dir and not $self->IsDirectory($dir)) {
-        my @parts = split /\//, $dir;
-        $dir = '';
-        foreach (@parts) {
-            $dir .= $_;
-            if (length $dir and not $self->IsDirectory($dir)) {
-                # create directory since it doesn't exist
-                my $d2 = $dir; # (must make a copy in case EncodeFileName recodes it)
-                if ($self->EncodeFileName($d2)) {
-                    # handle Windows Unicode directory names
-                    unless (eval { require Win32::API }) {
-                        $self->Warn('Install Win32::API to create directories with Unicode names');
-                        return -1;
-                    }
-                    unless ($k32CreateDir) {
-                        return -1 if defined $k32CreateDir;
-                        $k32CreateDir = Win32::API->new('KERNEL32', 'CreateDirectoryW', 'PP', 'I');
-                        unless ($k32CreateDir) {
-                            $self->Warn('Error calling Win32::API::CreateDirectoryW');
-                            $k32CreateDir = 0;
-                            return -1;
-                        }
-                    }
-                    $k32CreateDir->Call($d2, 0) or return -1;
-                } else {
-                    mkdir($d2, 0777) or return -1;
-                }
-                $rtnVal = 1;
-            }
-            $dir .= '/';
-        }
-    }
-    return $rtnVal;
-}
-
 #------------------------------------------------------------------------------
 # Copy file attributes from one file to another
 # Inputs: 0) ExifTool ref, 1) source file name, 2) destination file name

data/bin/lib/Image/ExifTool.pm

@@ -29,7 +29,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %jpegMarker %specialTags %fileTypeLookup $testLen $exeDir
             %static_vars $advFmtSelf);
 
-$VERSION = '12.93';
+$VERSION = '12.95';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -1873,9 +1873,10 @@ my %systemTagsNotes = (
             this write-only tag is used to define the GPS track log data or track log
             file name.  Currently supported track log formats are GPX, NMEA RMC/GGA/GLL,
             KML, IGC, Garmin XML and TCX, Magellan PMGNTRK, Honeywell PTNTHPR, Winplus
-            Beacon text, and Bramor gEO log files.  May be set to the special value of
-            "DATETIMEONLY" (all caps) to set GPS date/time tags if no input track points
-            are available.  See L<geotag.html|../geotag.html> for details
+            Beacon text, Bramor gEO, Google Takeout JSON, and CSV log files.  May be set
+            to the special value of "DATETIMEONLY" (all caps) to set GPS date/time tags
+            if no input track points are available.  See L<geotag.html|../geotag.html>
+            for details
         },
         DelCheck => q{
             require Image::ExifTool::Geotag;
@@ -4734,6 +4735,56 @@ sub IsDirectory($$)
     return 0;
 }
 
+#------------------------------------------------------------------------------
+# Create directory for specified file
+# Inputs: 0) ExifTool ref, 1) complete file name including path
+# Returns: '' = directory created, undef = nothing done, otherwise error string
+my $k32CreateDir;
+sub CreateDirectory($$)
+{
+    local $_;
+    my ($self, $file) = @_;
+    my ($err, $dir);
+    ($dir = $file) =~ s/[^\/]*$//;  # remove filename from path specification
+    if ($dir and not $self->IsDirectory($dir)) {
+        my @parts = split /\//, $dir;
+        $dir = '';
+        foreach (@parts) {
+            $dir .= $_;
+            if (length and not $self->IsDirectory($dir) and
+                # don't try to create a network drive root directory
+                not (IsPC() and $dir =~ m{^//[^/]*$}))
+            {
+                my $success;
+                # create directory since it doesn't exist
+                my $d2 = $dir; # (must make a copy in case EncodeFileName recodes it)
+                if ($self->EncodeFileName($d2)) {
+                    # handle Windows Unicode directory names
+                    unless (eval { require Win32::API }) {
+                        $err = 'Install Win32::API to create directories with Unicode names';
+                        last;
+                    }
+                    unless (defined $k32CreateDir) {
+                        $k32CreateDir = Win32::API->new('KERNEL32', 'CreateDirectoryW', 'PP', 'I');
+                        unless ($k32CreateDir) {
+                            $k32CreateDir = 0;
+                            # give this error once, then just "Error creating" for subsequent attempts
+                            return 'Error accessing Win32::API::CreateDirectoryW';
+                        }
+                    }
+                    $success = $k32CreateDir->Call($d2, 0) if $k32CreateDir;
+                } else {
+                    $success = mkdir($d2, 0777);
+                }
+                $success or $err = "Error creating directory $dir", last;
+                $err = '';
+            }
+            $dir .= '/';
+        }
+    }
+    return $err;
+}
+
 #------------------------------------------------------------------------------
 # Get file times (Unix seconds since the epoch)
 # Inputs: 0) ExifTool ref, 1) file name or ref
@@ -5648,6 +5699,17 @@ sub SetupTagTable($)
     }
 }
 
+#------------------------------------------------------------------------------
+# Is this a PC system?
+# Returns: true for PC systems
+# uses lookup for O/S names which may use a backslash as a directory separator
+# (ref File::Spec of PathTools-3.2701)
+my %isPC = (MSWin32 => 1, os2 => 1, dos => 1, NetWare => 1, symbian => 1, cygwin => 1);
+sub IsPC()
+{
+    return $isPC{$^O};
+}
+
 #------------------------------------------------------------------------------
 # Utilities to check for numerical types
 # Inputs: 0) value;  Returns: true if value is a numerical type

data/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 12.93
+Version: 12.95
 Release: 1
 License: Artistic/GPL
 Group: Development/Libraries/Perl

data/lib/exiftool_vendored/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ExiftoolVendored
-  VERSION = Gem::Version.new('12.93.0')
+  VERSION = Gem::Version.new('12.95.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 12.93.0
+  version: 12.95.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-27 00:00:00.000000000 Z
+date: 2024-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool