exiftool_vendored 13.30.0 → 13.31.0

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

@@ -111,7 +111,7 @@ my %insvLimit = (
         The tags below are extracted from timed metadata in QuickTime and other
         formats of video files when the ExtractEmbedded option is used.  Although
         most of these tags are combined into the single table below, ExifTool
-        currently reads 107 different types of timed GPS metadata from video files.
+        currently reads 110 different types of timed GPS metadata from video files.
     },
     GPSLatitude  => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")', RawConv => '$$self{FoundGPSLatitude} = 1; $val' },
     GPSLongitude => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")' },
@@ -210,8 +210,8 @@ my %insvLimit = (
             ProcessProc => \&ProcessFMAS,
         },
     },{
-        Name => 'gpmd_Wolfbox', # Wolfbox G900 Dashcam
-        Condition => '$$valPt =~ /^.{136}0{16}HYTH/s',
+        Name => 'gpmd_Wolfbox', # Wolfbox G900 Dashcam and Redtiger F9 4K
+        Condition => '$$valPt =~ /^.{136}0{16}(HYTH|XXXX)/s',
         SubDirectory => {
             TagTable => 'Image::ExifTool::QuickTime::Stream',
             ProcessProc => \&ProcessWolfbox,
@@ -317,6 +317,8 @@ my %insvLimit = (
             ByteOrder => 'Little-Endian',
         },
     }],
+    # (have also seen unknown mett from Google Pixel with MetaType 'application/meta'
+    #  and 'application/microvideo-image-meta')
     mett => { # Parrot drones and iPhone/Android using ARCore
         Name => 'mett',
         SubDirectory => { TagTable => 'Image::ExifTool::Parrot::mett' },
@@ -2288,6 +2290,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
                 $lon = ($lon - 2199.19873715495) / 2;
                 $ddd = 1;
             } elsif (Get32u($dataPt,0) == 0x400000 and abs($lat) <= 90 and abs($lon) <= 180) {
+                $debug and $et->FoundTag(GPSType => '17c');
                 # Transcend Drive Body Camera 70
                 #  0000: 00 00 40 00 66 72 65 65 47 50 53 20 4c 00 00 00 [..@.freeGPS L...]
                 #  0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [................]
@@ -3567,14 +3570,14 @@ sub ProcessFMAS($$$)
 }
 
 #------------------------------------------------------------------------------
-# Process GPS from Wolfbox G900 Dashcam
+# Process GPS from Wolfbox G900 Dashcam and Redtiger F9 4K
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
 # Returns: 1 on success
 sub ProcessWolfbox($$$)
 {
     my ($et, $dirInfo, $tagTbl) = @_;
     my $dataPt = $$dirInfo{DataPt};
-    return 0 if length($$dataPt) < 0xc8;
+    return 0 if length($$dataPt) < 0xf8;
     $et->VerboseDir('Wolfbox', undef, length($$dataPt));
     # 0000: 65 00 00 00 00 00 00 00 31 01 01 00 e3 ff 00 00 [e.......1.......]
     # 0010: 04 00 00 00 10 00 00 00 2a 00 00 00 00 00 00 00 [........*.......]
@@ -3593,22 +3596,43 @@ sub ProcessWolfbox($$$)
     # 00e0: 0a 00 00 00 00 00 00 00 e8 03 00 00 00 00 00 00 [................]
     # 00f0: 0a 00 00 00 00 00 00 00 4d 00 00 00 00 00 00 00 [........M.......]
     # lat/lon at 0xb0/0xc0 and 0x128/0x138
-    # h/m/s at 0x10 and 0xa0 and 0x148 (the first imprinted on the video, the latter 2 presumed UTC)
+    # h/m/s at 0x10 and 0xa0 and 0x148 (the first imprinted on the video, and
+    # the latter 2 presumed UTC, but there is a 1 second offset for the Redtiger)
     # spd at 0x48, dir at 0x58, alt at 0xe8
+    # Redtiger F9 4K Dual Front and Rear Mini Dash Cam
+    # 0000: 01 00 00 00 00 00 00 00 f4 ff 5d fe 24 00 00 00 [..........].$...]
+    # 0010: 10 00 00 00 2d 00 00 00 25 00 00 00 00 00 00 00 [....-...%.......]
+    # 0020: 01 00 00 00 00 00 00 00 44 eb 8f 00 00 00 00 00 [........D.......]
+    # 0030: 10 27 00 00 00 00 00 00 1b 94 8a 04 00 00 00 00 [.'..............]
+    # 0040: 10 27 00 00 00 00 00 00 8c 69 00 00 00 00 00 00 [.'.......i......]
+    # 0050: e8 03 00 00 00 00 00 00 ba 47 00 00 00 00 00 00 [.........G......]
+    # 0060: 64 00 00 00 00 00 00 00 19 00 00 00 05 00 00 00 [d...............]
+    # 0070: e9 07 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [................]
+    # 0080: 00 00 00 00 00 00 00 00 30 30 30 30 30 30 30 30 [........00000000]
+    # 0090: 30 30 30 30 30 30 30 30 58 58 58 58 00 00 00 00 [00000000XXXX....]
+    # 00a0: 08 00 00 00 2d 00 00 00 24 00 00 00 00 00 00 00 [....-...$.......]
+    # 00b0: 90 eb 8f 00 00 00 00 00 10 27 00 00 00 00 00 00 [.........'......]
+    # 00c0: 20 94 8a 04 00 00 00 00 10 27 00 00 00 00 00 00 [ ........'......]
+    # 00d0: 01 00 00 00 11 00 00 00 40 00 00 00 00 00 00 00 [........@.......]
+    # 00e0: 64 00 00 00 00 00 00 00 8a 00 00 00 00 00 00 00 [d...............]
+    # 00f0: 0a 00 00 00 00 00 00 00 4d 00 00 00 00 00 00 00 [........M.......]
     SetByteOrder('II');
-    my ($spd,$dir,$d,$mo,$yr,$h,$m,$s) = unpack('x72Vx12Vx12V3x44V3',$$dataPt);
-    # offset 0xa0 also stores hh mm ss, but is out by 8 hours!
+    my ($d,$mo,$yr,$h,$m,$s) = unpack('x104V3x44V3',$$dataPt);
     my $time = sprintf '%.4d:%.2d:%.2d %.2d:%.2d:%.2dZ', $yr, $mo, $d, $h, $m, $s;
-    my ($lat, $lon) = (Get32s($dataPt, 0xb0) / 1e5, Get32s($dataPt, 0xc0) / 1e5);
-    my $alt = Get32s($dataPt, 0xe8);
-    ConvertLatLon($lat, $lon);
+    my ($pos, @a);
+    #             0=spd 1=dir 2=lat 3=lon 4=alt
+    foreach $pos (0x48, 0x58, 0xb0, 0xc0, 0xe8) {
+        my $val = Get64s($dataPt, $pos);
+        my $scl = Get64s($dataPt, $pos + 8);
+        push @a, $val / ($scl || 1);
+    }
+    ConvertLatLon($a[2], $a[3]);
     $et->HandleTag($tagTbl, GPSDateTime  => $time);
-    $et->HandleTag($tagTbl, GPSLatitude  => $lat);
-    $et->HandleTag($tagTbl, GPSLongitude => $lon);
-    $et->HandleTag($tagTbl, GPSSpeed     => $spd * $knotsToKph / 100);
-    $et->HandleTag($tagTbl, GPSTrack     => $dir / 100);
-    $et->HandleTag($tagTbl, GPSAltitude  => $alt / 10); # (NC)
-    SetByteOrder('MM');
+    $et->HandleTag($tagTbl, GPSLatitude  => $a[2]);
+    $et->HandleTag($tagTbl, GPSLongitude => $a[3]);
+    $et->HandleTag($tagTbl, GPSSpeed     => $a[0] * $knotsToKph);
+    $et->HandleTag($tagTbl, GPSTrack     => $a[1]);
+    $et->HandleTag($tagTbl, GPSAltitude  => $a[4]);
     return 1;
 }
 

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

@@ -19,7 +19,7 @@ use strict;
 use vars qw($VERSION %sigmaLensTypes);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.35';
+$VERSION = '1.36';
 
 # sigma LensType lookup (ref IB)
 %sigmaLensTypes = (
@@ -704,6 +704,12 @@ $VERSION = '1.35';
         Name => 'PictureMode',
         Notes => 'same as ColorMode, but "Standard" when ColorMode is Sepia or B&W',
     },
+    0x0047 => { #forum17338
+        Name => 'ExposureCompensation',
+        Writable => 'rational64s',
+        PrintConv => '$val and $val =~ s/^(\d)/\+$1/; $val',
+        PrintConvInv => '$val',
+    },
     0x0048 => { #PH
         Name => 'LensApertureRange',
         Condition => '$$self{MakerNoteSigmaVer} >= 3',
@@ -797,6 +803,10 @@ $VERSION = '1.35';
     0x0087 => 'ResolutionMode', #PH (Quattro models)
     0x0088 => 'WhiteBalance', #PH (Quattro models)
     0x008c => 'Firmware', #PH (Quattro models)
+    0x0113 => { #forum17338
+        Name => 'PictureModeStrength',
+        Writable => 'int32s',
+    },
     0x011f => { #IB (FP DNG images)
         Name => 'CameraCalibration',
         Writable => 'float',
@@ -810,6 +820,14 @@ $VERSION = '1.35';
         Name => 'WBSettings2',
         SubDirectory => { TagTable => 'Image::ExifTool::Sigma::WBSettings2' },
     },
+    0x0138 => { #forum17338
+        Name => 'Fade',
+        Writable => 'rational64u',
+    },
+    0x0139 => { #forum17338
+        Name => 'Vignette',
+        Writable => 'rational64u',
+    },
 );
 
 # WB settings (ref IB)

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

@@ -2822,7 +2822,7 @@ my %tagLookup = (
 	'exposurebracketstepsize' => { 375 => 0x8 },
 	'exposurebracketvalue' => { 246 => 0x19 },
 	'exposurecompautocancel' => { 90 => 0x113 },
-	'exposurecompensation' => { 82 => 0x6, 99 => 0x0, 125 => 0x9204, 147 => 0x24, 163 => 'ExposureComp', 183 => 'ExposureCompensation', 188 => 0xd, 189 => 0x53, 190 => 0x1e, 194 => 0x49c0, 339 => 0x1006, 395 => 0x16, 404 => 0x402, 436 => 0xa013, 439 => [0xc,0x35,0x4d], 472 => 0x114c, 473 => 0x114c, 474 => 0x1128, 476 => 0x1180, 477 => 0x1038, 478 => 0x230, 479 => 0x230, 480 => 0x223, 534 => 'ExposureBiasValue' },
+	'exposurecompensation' => { 82 => 0x6, 99 => 0x0, 125 => 0x9204, 147 => 0x24, 163 => 'ExposureComp', 183 => 'ExposureCompensation', 188 => 0xd, 189 => 0x53, 190 => 0x1e, 194 => 0x49c0, 339 => 0x1006, 395 => 0x16, 404 => 0x402, 436 => 0xa013, 439 => [0xc,0x35,0x47,0x4d], 472 => 0x114c, 473 => 0x114c, 474 => 0x1128, 476 => 0x1180, 477 => 0x1038, 478 => 0x230, 479 => 0x230, 480 => 0x223, 534 => 'ExposureBiasValue' },
 	'exposurecompensation2' => { 468 => [0x24,0x26,0x2a] },
 	'exposurecompensationbutton' => { 257 => 0x794 },
 	'exposurecompensationmode' => { 191 => 0x47, 194 => 0x2a },
@@ -2978,7 +2978,7 @@ my %tagLookup = (
 	'facesdetected' => { 58 => 0x2, 59 => 0x2, 60 => 0x3, 116 => 0x0, 117 => 0x2, 119 => 0x211c, 133 => 0x4100, 222 => 0x3, 338 => 0x1200, 358 => 0x3f, 378 => 0x0, 426 => 0xb5, 437 => 0x0, 456 => 0x0, 459 => 0x3, 471 => 0x30 },
 	'facesrecognized' => { 351 => 0x0 },
 	'facewidth' => { 59 => 0x1 },
-	'fade' => { 463 => 0x2034 },
+	'fade' => { 439 => 0x138, 463 => 0x2034 },
 	'faithfuloutputhighlightpoint' => { 115 => 0x38 },
 	'faithfuloutputshadowpoint' => { 115 => 0x39 },
 	'faithfulrawcolortone' => { 115 => 0x31 },
@@ -5667,6 +5667,7 @@ my %tagLookup = (
 	'picturemodehue' => { 334 => 0x522 },
 	'picturemodesaturation' => { 334 => 0x521 },
 	'picturemodesharpness' => { 334 => 0x524 },
+	'picturemodestrength' => { 439 => 0x113 },
 	'picturemodetone' => { 334 => 0x526 },
 	'pictureprofile' => { 472 => [0x115e,0x115f], 473 => [0x1162,0x1163], 474 => [0x113e,0x113f], 475 => [0x11ba,0x11bb], 476 => [0x1196,0x1197], 477 => [0x104e,0x104f], 478 => [0x246,0x247], 479 => [0x246,0x247], 480 => [0x237,0x238] },
 	'picturestyle' => { 8 => [0x4b,0x51], 9 => 0xf4, 10 => 0x6c, 11 => 0x86, 12 => 0x73, 16 => 0xab, 17 => 0xa7, 18 => 0xb0, 19 => 0x6c, 20 => 0xa7, 21 => 0xf4, 22 => 0xb3, 24 => 0xf4, 25 => 0xfa, 27 => 0x169, 79 => 0xa, 109 => 0x20301, 115 => 0x2 },
@@ -7302,6 +7303,7 @@ my %tagLookup = (
 	'viewingmode2' => { 451 => [0x85,0x285] },
 	'viewmodeshoweffectsofsettings' => { 257 => 0x7d2, 330 => 0x2a9 },
 	'viewpoint' => { 547 => 'viewpoint' },
+	'vignette' => { 439 => 0x139 },
 	'vignetteamount' => { 528 => 'VignetteAmount', 530 => 'VignetteAmount' },
 	'vignettecoefficient1' => { 297 => 0x24 },
 	'vignettecoefficient2' => { 297 => 0x34 },
@@ -10858,6 +10860,7 @@ my %tagExists = (
 	'mebx' => 1,
 	'media' => 1,
 	'mediablackpoint' => 1,
+	'mediabox' => 1,
 	'mediacolor' => 1,
 	'mediacontenttypes' => 1,
 	'mediacreated' => 1,

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 28450 tags, with 17673 unique tag names.
+They contain a total of 28455 tags, with 17676 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
@@ -21811,6 +21811,7 @@ are less than consistent about their metadata formats.
   0x003b   Firmware                             string
   0x003c   WhiteBalance                         string
   0x003d   PictureMode                          string
+  0x0047   ExposureCompensation                 rational64s
   0x0048   LensApertureRange                    string
   0x0049   FNumber                              rational64u
   0x004a   ExposureTime                         rational64u
@@ -21826,9 +21827,12 @@ are less than consistent about their metadata formats.
   0x0087   ResolutionMode                       string
   0x0088   WhiteBalance                         string
   0x008c   Firmware                             string
+  0x0113   PictureModeStrength                  int32s
   0x011f   CameraCalibration                    float[9]
   0x0120   WBSettings                           Sigma WBSettings
   0x0121   WBSettings2                          Sigma WBSettings2
+  0x0138   Fade                                 rational64u
+  0x0139   Vignette                             rational64u
 
 =head3 Sigma WBSettings Tags
 
@@ -29664,10 +29668,11 @@ C2PA JUMBF metadata extracted from "/C2PA_Manifest" file.
 
 =head3 PDF Pages Tags
 
-  Tag ID   Tag Name                             Writable
-  ------   --------                             --------
-  'Count'  PageCount                            no
-  'Kids'   Kids                                 PDF Kids
+  Tag ID       Tag Name                         Writable
+  ------       --------                         --------
+  'Count'      PageCount                        no
+  'Kids'       Kids                             PDF Kids
+  'MediaBox'   MediaBox                         no+
 
 =head3 PDF Kids Tags
 
@@ -30380,7 +30385,7 @@ for the official QuickTime specification.
 The tags below are extracted from timed metadata in QuickTime and other
 formats of video files when the ExtractEmbedded option is used.  Although
 most of these tags are combined into the single table below, ExifTool
-currently reads 107 different types of timed GPS metadata from video files.
+currently reads 110 different types of timed GPS metadata from video files.
 
   Tag ID                 Tag Name               Writable
   ------                 --------               --------

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

@@ -81,6 +81,7 @@ sub WritePDFValue($$$)
         EncodeString(\$val);
     } elsif ($format eq 'date') {
         # convert date to "D:YYYYmmddHHMMSS+-HH'MM'" format
+        $val =~ s/(:\d{2})\.\d*/$1/;              # remove sub-seconds
         $val =~ s/([-+]\d{2}):(\d{2})/${1}'${2}'/;  # change timezone delimiters if necessary
         $val =~ tr/ ://d;                       # remove spaces and colons
         $val =  "D:$val";                       # add leading "D:"

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

@@ -4741,10 +4741,11 @@ sub DumpUnknownTrailer($$)
     my $pos = $$dirInfo{DataPos};
     my $endPos = $pos + $$dirInfo{DirLen};
     # account for preview/MPF image trailer
-    my $prePos = $$self{VALUE}{PreviewImageStart} || $$self{PreviewImageStart};
-    my $preLen = $$self{VALUE}{PreviewImageLength} || $$self{PreviewImageLength};
-    my $hidPos = $$self{VALUE}{HiddenDataOffset};
-    my $hidLen = $$self{VALUE}{HiddenDataLength};
+    my $value = $$self{VALUE};
+    my $prePos = $$value{PreviewImageStart} || $$self{PreviewImageStart};
+    my $preLen = $$value{PreviewImageLength} || $$self{PreviewImageLength};
+    my $hidPos = $$value{HiddenDataOffset};
+    my $hidLen = $$value{HiddenDataLength};
     my $tag = 'PreviewImage';
     my $mpImageNum = 0;
     my (%image, $lastOne);
@@ -4761,12 +4762,12 @@ sub DumpUnknownTrailer($$)
         last if $lastOne;   # checked all images
         # look for MPF images (in the proper order)
         ++$mpImageNum;
-        $prePos = $$self{VALUE}{"MPImageStart ($mpImageNum)"};
+        $prePos = $$value{"MPImageStart ($mpImageNum)"};
         if (defined $prePos) {
-            $preLen = $$self{VALUE}{"MPImageLength ($mpImageNum)"};
+            $preLen = $$value{"MPImageLength ($mpImageNum)"};
         } else {
-            $prePos = $$self{VALUE}{'MPImageStart'};
-            $preLen = $$self{VALUE}{'MPImageLength'};
+            $prePos = $$value{MPImageStart};
+            $preLen = $$value{MPImageLength};
             $lastOne = 1;
         }
         $tag = "MPImage$mpImageNum";
@@ -5887,10 +5888,10 @@ sub WriteJPEG($$)
                         $writeBuffer = '';
                         $oldOutfile = $outfile;
                         $outfile = \$writeBuffer;
-                        # account for segment, EXIF and TIFF headers
-                        $$self{PREVIEW_INFO}{Fixup}{Start} += 18 if $$self{PREVIEW_INFO};
-                        $$self{LeicaTrailer}{Fixup}{Start} += 18 if $$self{LeicaTrailer};
-                        $$self{HiddenData}{Fixup}{Start} += 18 if $$self{HiddenData};
+                        # must account for segment, EXIF and TIFF headers
+                        foreach (qw(PREVIEW_INFO LeicaTrailer HiddenData)) {
+                            $$self{$_}{Fixup}{Start} += 18 if $$self{$_};
+                        }
                     }
                     # write as multi-segment
                     my $n = WriteMultiSegment($outfile, 0xe1, $exifAPP1hdr, \$buff, 'EXIF');
@@ -6036,8 +6037,8 @@ sub WriteJPEG($$)
             my $delPreview = $$self{DEL_PREVIEW};
             $trailInfo = $self->IdentifyTrailer($raf) unless $$delGroup{Trailer};
             my $nvTrail = $self->GetNewValueHash($Image::ExifTool::Extra{Trailer});
-            unless ($oldOutfile or $delPreview or $trailInfo or $$delGroup{Trailer} or $nvTrail or
-                $$self{HiddenData})
+            unless ($oldOutfile or $delPreview or $trailInfo or $$delGroup{Trailer} or
+                $nvTrail or $$self{HiddenData})
             {
                 # blindly copy the rest of the file
                 while ($raf->Read($buff, 65536)) {
@@ -6082,35 +6083,7 @@ sub WriteJPEG($$)
                 }
                 last;   # all done
             }
-            # copy HiddenData if necessary
-            if ($$self{HiddenData}) {
-                my $pad;
-                my $hd = $$self{HiddenData};
-                my $hdOff = $$hd{Offset} + $$hd{Base};
-                require Image::ExifTool::Sony;
-                # read HiddenData, updating $hdOff with actual offset if necessary
-                my $dataPt = Image::ExifTool::Sony::ReadHiddenData($self, $hdOff, $$hd{Size});
-                if ($dataPt) {
-                    # preserve padding to avoid invalidating MPF pointers (yuk!)
-                    my $padLen = $hdOff - $endPos;
-                    unless ($padLen >= 0 and $raf->Seek($endPos,0) and $raf->Read($pad,$padLen)==$padLen) {
-                        $self->Error('Error reading HiddenData padding',1);
-                        $pad = '';
-                    }
-                    $endPos += length($pad) + length($$dataPt); # update end position
-                } else {
-                    $$dataPt = $pad = '';
-                }
-                my $fixup = $$self{HiddenData}{Fixup};
-                # set MakerNote pointer and size (subtract 10 for segment and EXIF headers)
-                $fixup->SetMarkerPointers($outfile, 'HiddenData', length($$outfile) + length($pad) - 10);
-                # clean up and write the buffered data
-                $outfile = $oldOutfile;
-                undef $oldOutfile;
-                Write($outfile, $writeBuffer, $pad, $$dataPt) or $err = 1;
-                undef $writeBuffer;
-            }
-            # rewrite existing trailers
+            # rewrite existing trailers into buffer
             if ($trailInfo) {
                 my $tbuf = '';
                 $raf->Seek(-length($buff), 1);  # seek back to just after EOI
@@ -6118,100 +6091,126 @@ sub WriteJPEG($$)
                 $$trailInfo{ScanForTrailer} = 1;# scan if necessary
                 $self->ProcessTrailers($trailInfo) or undef $trailInfo;
             }
-            if (not $oldOutfile) {
-                # do nothing special
-            } elsif ($$self{LeicaTrailer}) {
-                my $trailLen;
-                if ($trailInfo) {
-                    $trailLen = $$trailInfo{DataPos} - $endPos;
-                } else {
-                    $raf->Seek(0, 2) or $err = 1;
-                    $trailLen = $raf->Tell() - $endPos;
-                }
-                my $fixup = $$self{LeicaTrailer}{Fixup};
-                $$self{LeicaTrailer}{TrailPos} = $endPos;
-                $$self{LeicaTrailer}{TrailLen} = $trailLen;
-                # get _absolute_ position of new Leica trailer
-                my $absPos = Tell($oldOutfile) + length($$outfile);
-                require Image::ExifTool::Panasonic;
-                my $dat = Image::ExifTool::Panasonic::ProcessLeicaTrailer($self, $absPos);
-                # allow some junk before Leica trailer (just in case)
-                my $junk = $$self{LeicaTrailerPos} - $endPos;
-                # set MakerNote pointer and size (subtract 10 for segment and EXIF headers)
-                $fixup->SetMarkerPointers($outfile, 'LeicaTrailer', length($$outfile) - 10 + $junk);
-                # use this fixup to set the size too (sneaky)
-                my $trailSize = defined($dat) ? length($dat) - $junk : $$self{LeicaTrailer}{Size};
-                $$fixup{Start} -= 4;  $$fixup{Shift} += 4;
-                $fixup->SetMarkerPointers($outfile, 'LeicaTrailer', $trailSize) if defined $trailSize;
-                $$fixup{Start} += 4;  $$fixup{Shift} -= 4;
-                # clean up and write the buffered data
-                $outfile = $oldOutfile;
-                undef $oldOutfile;
-                Write($outfile, $writeBuffer) or $err = 1;
-                undef $writeBuffer;
-                if (defined $dat) {
-                    Write($outfile, $dat) or $err = 1;  # write new Leica trailer
-                    $delPreview = 1;                    # delete existing Leica trailer
+            if ($oldOutfile) {
+                my $previewInfo;
+                # copy HiddenData if necessary
+                if ($$self{HiddenData}) {
+                    my $pad;
+                    my $hd = $$self{HiddenData};
+                    my $hdOff = $$hd{Offset} + $$hd{Base};
+                    require Image::ExifTool::Sony;
+                    # read HiddenData, updating $hdOff with actual offset if necessary
+                    my $dataPt = Image::ExifTool::Sony::ReadHiddenData($self, $hdOff, $$hd{Size});
+                    if ($dataPt) {
+                        # preserve padding to avoid invalidating MPF pointers (yuk!)
+                        my $padLen = $hdOff - $endPos;
+                        unless ($padLen >= 0 and $raf->Seek($endPos,0) and $raf->Read($pad,$padLen)==$padLen) {
+                            $self->Error('Error reading HiddenData padding',1);
+                            $pad = '';
+                        }
+                        $endPos += length($pad) + length($$dataPt); # update end position
+                    } else {
+                        $$dataPt = $pad = '';
+                    }
+                    my $fixup = $$self{HiddenData}{Fixup};
+                    # set MakerNote pointer and size (subtract 10 for segment and EXIF headers)
+                    $fixup->SetMarkerPointers($outfile, 'HiddenData', length($$outfile) + length($pad) - 10);
+                    $writeBuffer .= $pad . $$dataPt;    # keep padding for now
                 }
-            } else {
-                # locate preview image and fix up preview offsets
-                my $scanLen = $$self{Make} =~ /^SONY/i ? 65536 : 1024;
-                if (length($buff) < $scanLen) { # make sure we have enough trailer to scan
-                    my $buf2;
-                    $buff .= $buf2 if $raf->Read($buf2, $scanLen - length($buff));
+                if ($$self{LeicaTrailer}) {
+                    my $trailLen;
+                    if ($trailInfo) {
+                        $trailLen = $$trailInfo{DataPos} - $endPos;
+                    } else {
+                        $raf->Seek(0, 2) or $err = 1;
+                        $trailLen = $raf->Tell() - $endPos;
+                    }
+                    my $fixup = $$self{LeicaTrailer}{Fixup};
+                    $$self{LeicaTrailer}{TrailPos} = $endPos;
+                    $$self{LeicaTrailer}{TrailLen} = $trailLen;
+                    # get _absolute_ position of new Leica trailer
+                    my $absPos = Tell($oldOutfile) + length($$outfile);
+                    require Image::ExifTool::Panasonic;
+                    my $dat = Image::ExifTool::Panasonic::ProcessLeicaTrailer($self, $absPos);
+                    # allow some junk before Leica trailer (just in case)
+                    my $junk = $$self{LeicaTrailerPos} - $endPos;
+                    # set MakerNote pointer and size (subtract 10 for segment and EXIF headers)
+                    $fixup->SetMarkerPointers($outfile, 'LeicaTrailer', length($$outfile) - 10 + $junk);
+                    # use this fixup to set the size too (sneaky)
+                    my $trailSize = defined($dat) ? length($dat) - $junk : $$self{LeicaTrailer}{Size};
+                    $$fixup{Start} -= 4;  $$fixup{Shift} += 4;
+                    $fixup->SetMarkerPointers($outfile, 'LeicaTrailer', $trailSize) if defined $trailSize;
+                    $$fixup{Start} += 4;  $$fixup{Shift} -= 4;
+                    if (defined $dat) {
+                        Write($outfile, $dat) or $err = 1;  # write new Leica trailer
+                        $delPreview = 1;                    # delete existing Leica trailer
+                    }
                 }
-                # get new preview image position, relative to EXIF base
-                my $newPos = length($$outfile) - 10; # (subtract 10 for segment and EXIF headers)
-                my $junkLen;
-                # adjust position if image isn't at the start (eg. Olympus E-1/E-300)
-                if ($buff =~ /(\xff\xd8\xff.|.\xd8\xff\xdb)(..)/sg) {
-                    my ($jpegHdr, $segLen) = ($1, $2);
-                    $junkLen = pos($buff) - 6;
-                    # Sony previewimage trailer has a 32 byte header
-                    if ($$self{Make} =~ /^SONY/i and $junkLen > 32) {
-                        # with some newer Sony models, the makernotes preview pointer
-                        # points to JPEG at end of EXIF inside MPImage preview (what a pain!)
-                        if ($jpegHdr eq "\xff\xd8\xff\xe1") {   # is the first segment EXIF?
-                            $segLen = unpack('n', $segLen);     # the EXIF segment length
-                            # Sony PreviewImage starts with last 2 bytes of EXIF segment
-                            # (and first byte is usually "\0", not "\xff", so don't check this)
-                            if (length($buff) > $junkLen + $segLen + 6 and
-                                substr($buff, $junkLen + $segLen + 3, 3) eq "\xd8\xff\xdb")
-                            {
-                                $junkLen += $segLen + 2;
-                                # (note: this will not copy the trailer after PreviewImage,
-                                #  which is a 14kB block full of zeros for the A77)
+                # handle preview image last
+                if ($$self{PREVIEW_INFO}) {
+                    # locate preview image and fix up preview offsets
+                    my $scanLen = $$self{Make} =~ /^SONY/i ? 65536 : 1024;
+                    if (length($buff) < $scanLen) { # make sure we have enough trailer to scan
+                        my $buf2;
+                        $buff .= $buf2 if $raf->Read($buf2, $scanLen - length($buff));
+                    }
+                    # get new preview image position, relative to EXIF base
+                    my $newPos = length($$outfile) - 10; # (subtract 10 for segment and EXIF headers)
+                    my $junkLen;
+                    # adjust position if image isn't at the start (eg. Olympus E-1/E-300)
+                    if ($buff =~ /(\xff\xd8\xff.|.\xd8\xff\xdb)(..)/sg) {
+                        my ($jpegHdr, $segLen) = ($1, $2);
+                        $junkLen = pos($buff) - 6;
+                        # Sony previewimage trailer has a 32 byte header
+                        if ($$self{Make} =~ /^SONY/i and $junkLen > 32) {
+                            # with some newer Sony models, the makernotes preview pointer
+                            # points to JPEG at end of EXIF inside MPImage preview (what a pain!)
+                            if ($jpegHdr eq "\xff\xd8\xff\xe1") {   # is the first segment EXIF?
+                                $segLen = unpack('n', $segLen);     # the EXIF segment length
+                                # Sony PreviewImage starts with last 2 bytes of EXIF segment
+                                # (and first byte is usually "\0", not "\xff", so don't check this)
+                                if (length($buff) > $junkLen + $segLen + 6 and
+                                    substr($buff, $junkLen + $segLen + 3, 3) eq "\xd8\xff\xdb")
+                                {
+                                    $junkLen += $segLen + 2;
+                                    # (note: this will not copy the trailer after PreviewImage,
+                                    #  which is a 14kB block full of zeros for the A77)
+                                }
                             }
+                            $junkLen -= 32;
                         }
-                        $junkLen -= 32;
+                        $newPos += $junkLen;
+                    }
+                    # fix up the preview offsets to point to the start of the new image
+                    $previewInfo = $$self{PREVIEW_INFO};
+                    delete $$self{PREVIEW_INFO};
+                    my $fixup = $$previewInfo{Fixup};
+                    $newPos += ($$previewInfo{BaseShift} || 0);
+                    # adjust to absolute file offset if necessary (Samsung STMN)
+                    $newPos += Tell($oldOutfile) + 10 if $$previewInfo{Absolute};
+                    if ($$previewInfo{Relative}) {
+                        # adjust for our base by looking at how far the pointer got shifted
+                        $newPos -= ($fixup->GetMarkerPointers($outfile, 'PreviewImage') || 0);
+                    } elsif ($$previewInfo{ChangeBase}) {
+                        # Leica S2 uses relative offsets for the preview only (leica sucks)
+                        my $makerOffset = $fixup->GetMarkerPointers($outfile, 'LeicaTrailer');
+                        $newPos -= $makerOffset if $makerOffset;
+                    }
+                    $fixup->SetMarkerPointers($outfile, 'PreviewImage', $newPos);
+                    if ($$previewInfo{Data} ne 'LOAD_PREVIEW') {
+                        # write any junk that existed before the preview image
+                        $$previewInfo{Junk} = substr($buff,0,$junkLen) if $junkLen;
                     }
-                    $newPos += $junkLen;
-                }
-                # fix up the preview offsets to point to the start of the new image
-                my $previewInfo = $$self{PREVIEW_INFO};
-                delete $$self{PREVIEW_INFO};
-                my $fixup = $$previewInfo{Fixup};
-                $newPos += ($$previewInfo{BaseShift} || 0);
-                # adjust to absolute file offset if necessary (Samsung STMN)
-                $newPos += Tell($oldOutfile) + 10 if $$previewInfo{Absolute};
-                if ($$previewInfo{Relative}) {
-                    # adjust for our base by looking at how far the pointer got shifted
-                    $newPos -= ($fixup->GetMarkerPointers($outfile, 'PreviewImage') || 0);
-                } elsif ($$previewInfo{ChangeBase}) {
-                    # Leica S2 uses relative offsets for the preview only (leica sucks)
-                    my $makerOffset = $fixup->GetMarkerPointers($outfile, 'LeicaTrailer');
-                    $newPos -= $makerOffset if $makerOffset;
                 }
-                $fixup->SetMarkerPointers($outfile, 'PreviewImage', $newPos);
                 # clean up and write the buffered data
                 $outfile = $oldOutfile;
                 undef $oldOutfile;
                 Write($outfile, $writeBuffer) or $err = 1;
                 undef $writeBuffer;
                 # write preview image
-                if ($$previewInfo{Data} ne 'LOAD_PREVIEW') {
+                if ($previewInfo and $$previewInfo{Data} ne 'LOAD_PREVIEW') {
                     # write any junk that existed before the preview image
-                    Write($outfile, substr($buff,0,$junkLen)) or $err = 1 if $junkLen;
+                    Write($outfile, $$previewInfo{Junk}) or $err = 1 if defined $$previewInfo{Junk};
                     # write the saved preview image
                     Write($outfile, $$previewInfo{Data}) or $err = 1;
                     delete $$previewInfo{Data};
@@ -6224,7 +6223,7 @@ sub WriteJPEG($$)
                 my $extra;
                 if ($trailInfo) {
                     # copy everything up to start of first processed trailer
-                    $extra = $$trailInfo{DataPos} - $endPos;
+                    $extra = defined $$trailInfo{DataPos} ? ($$trailInfo{DataPos} - $endPos) : 0;
                 } else {
                     # copy everything up to end of file
                     $raf->Seek(0, 2) or $err = 1;
@@ -6393,9 +6392,9 @@ sub WriteJPEG($$)
                         $oldOutfile = $outfile;
                         $outfile = \$writeBuffer;
                         # must account for segment, EXIF and TIFF headers
-                        $$self{PREVIEW_INFO}{Fixup}{Start} += 18 if $$self{PREVIEW_INFO};
-                        $$self{LeicaTrailer}{Fixup}{Start} += 18 if $$self{LeicaTrailer};
-                        $$self{HiddenData}{Fixup}{Start} += 18 if $$self{HiddenData};
+                        foreach (qw(PREVIEW_INFO LeicaTrailer HiddenData)) {
+                            $$self{$_}{Fixup}{Start} += 18 if $$self{$_};
+                        }
                     }
                     # write as multi-segment
                     my $n = WriteMultiSegment($outfile, $marker, $exifAPP1hdr, $segDataPt, 'EXIF');

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 $configFile @configFiles $noConfig);
 
-$VERSION = '13.30';
+$VERSION = '13.31';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -42,7 +42,7 @@ $RELEASE = '';
     # exports not part of the public API, but used by ExifTool modules:
     DataAccess => [qw(
         ReadValue GetByteOrder SetByteOrder ToggleByteOrder Get8u Get8s Get16u
-        Get16s Get32u Get32s Get64u GetFloat GetDouble GetFixed32s Write
+        Get16s Get32u Get32s Get64u Get64s GetFloat GetDouble GetFixed32s Write
         WriteValue Tell Set8u Set8s Set16u Set32u Set64u Set64s
     )],
     Utils => [qw(GetTagTable TagTableKeys GetTagInfoList AddTagToTable HexDump)],
@@ -9719,8 +9719,10 @@ sub ExtractBinary($$$;$)
             $isPreview = 1;
         }
         my $lcTag = lc $tag;
-        if ((not $$self{OPTIONS}{Binary} or $$self{EXCL_TAG_LOOKUP}{$lcTag}) and
-             not $$self{OPTIONS}{Verbose} and not $$self{REQ_TAG_LOOKUP}{$lcTag})
+        my $options = $$self{OPTIONS};
+        if ((not $$options{Binary} or $$self{EXCL_TAG_LOOKUP}{$lcTag}) and
+             not $$options{Verbose} and not $$options{Validate} and
+             not $$self{REQ_TAG_LOOKUP}{$lcTag})
         {
             return "Binary data $length bytes";
         }

data/bin/perl-Image-ExifTool.spec

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