exiftool_vendored 13.17.0 → 13.18.0

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

@@ -4797,6 +4797,7 @@ my %tagLookup = (
 	'mediamodifydate' => { 413 => 0x2 },
 	'mediasummarycode' => { 341 => 'MediaSummaryCode' },
 	'mediatype' => { 409 => 'stik' },
+	'mediauid' => { 417 => 'MUID' },
 	'memoaudioquality' => { 90 => 0x812 },
 	'memorycardconfiguration' => { 451 => 0x16 },
 	'memorycardnumber' => { 220 => 0x2 },
@@ -7872,6 +7873,8 @@ my %tagExists = (
 	'asin' => 1,
 	'asin2' => 1,
 	'aspectinfo' => 1,
+	'aspectratiounwarped' => 1,
+	'aspectratiowarped' => 1,
 	'aspectratiox' => 1,
 	'aspectratioy' => 1,
 	'assistantdirector' => 1,
@@ -7911,6 +7914,7 @@ my %tagExists = (
 	'audioavailablenumberchannels' => 1,
 	'audioavgbitrate' => 1,
 	'audiobitratecontrolmode' => 1,
+	'audiobluetooth' => 1,
 	'audiobytes' => 1,
 	'audiochannellayout' => 1,
 	'audiochanneltypes' => 1,
@@ -7949,6 +7953,7 @@ my %tagExists = (
 	'audiopacketframesize' => 1,
 	'audioprofile' => 1,
 	'audioprofileversion' => 1,
+	'audioprotuneoption' => 1,
 	'audioqualitysetting' => 1,
 	'audiorequirespacketdescription' => 1,
 	'audiosamplecount' => 1,
@@ -7975,12 +7980,14 @@ my %tagExists = (
 	'authorship' => 1,
 	'authorsortorder' => 1,
 	'autoareaafstartingpoint' => 1,
+	'autoboostscore' => 1,
 	'autocaptureoffset' => 1,
 	'autoisomin' => 1,
 	'autolowlightduration' => 1,
 	'automationanimation' => 1,
 	'automationflags' => 1,
 	'autopoweroff' => 1,
+	'autoprotune' => 1,
 	'autorotation' => 1,
 	'autosavefilepath' => 1,
 	'autosaveformat' => 1,
@@ -8069,6 +8076,7 @@ my %tagExists = (
 	'bitrate' => 1,
 	'bitrateinfo' => 1,
 	'bitratemutualexclusion' => 1,
+	'bitratesetting' => 1,
 	'bitsperextendedrunlength' => 1,
 	'bitsperpixel' => 1,
 	'bitsperrunlength' => 1,
@@ -8353,6 +8361,7 @@ my %tagExists = (
 	'captproftype' => 1,
 	'captprofversion' => 1,
 	'captureconditionspar' => 1,
+	'capturedelaytimer' => 1,
 	'capturedevicefid' => 1,
 	'captureheightresetblacksegnormal' => 1,
 	'captureheightresetblacksegtest' => 1,
@@ -8514,6 +8523,7 @@ my %tagExists = (
 	'class' => 1,
 	'classificationandmarkingsystem' => 1,
 	'classificationcomments' => 1,
+	'classificationdatapresent' => 1,
 	'classificationreason' => 1,
 	'classifiedby' => 1,
 	'classifyingcountry' => 1,
@@ -8733,6 +8743,7 @@ my %tagExists = (
 	'contrastadjustment' => 1,
 	'contrastinfo' => 1,
 	'controller' => 1,
+	'controllevel' => 1,
 	'conttake' => 1,
 	'convergenceangle' => 1,
 	'convergencebaseimage' => 1,
@@ -9032,6 +9043,7 @@ my %tagExists = (
 	'devicesettings' => 1,
 	'devicesounds' => 1,
 	'dex' => 1,
+	'diagonalfieldofview' => 1,
 	'dialect' => 1,
 	'dicom' => 1,
 	'dictionary' => 1,
@@ -9049,6 +9061,7 @@ my %tagExists = (
 	'digitalexposuregains' => 1,
 	'digitalimagebroker' => 1,
 	'digitalsignature' => 1,
+	'digitalzoomamount' => 1,
 	'dimensions' => 1,
 	'directionalatob0' => 1,
 	'directionalatob1' => 1,
@@ -9188,6 +9201,7 @@ my %tagExists = (
 	'duotonehalftoninginfo' => 1,
 	'duotoneimageinfo' => 1,
 	'duotonetransferfuncs' => 1,
+	'durationsetting' => 1,
 	'dustdeleteapplied' => 1,
 	'dustinfo' => 1,
 	'dvdid' => 1,
@@ -9217,6 +9231,7 @@ my %tagExists = (
 	'eighthlanguage' => 1,
 	'electricalextendermagnification' => 1,
 	'electronicimagestabilization' => 1,
+	'electronicstabilizationon' => 1,
 	'electronicvr' => 1,
 	'elementarystreamtrack' => 1,
 	'embeddedaudiofile' => 1,
@@ -9333,6 +9348,7 @@ my %tagExists = (
 	'exposurereferencegain' => 1,
 	'exposurereferenceoffset' => 1,
 	'exposuretimes' => 1,
+	'exposuretype' => 1,
 	'exposureunknown' => 1,
 	'expressionmedia' => 1,
 	'exrversion' => 1,
@@ -9888,6 +9904,7 @@ my %tagExists = (
 	'hdrinfoversion' => 1,
 	'hdrl' => 1,
 	'hdrtoninginfo' => 1,
+	'hdrvideo' => 1,
 	'header' => 1,
 	'header4' => 1,
 	'headerext' => 1,
@@ -9907,6 +9924,7 @@ my %tagExists = (
 	'highlightendpoints' => 1,
 	'highnote' => 1,
 	'highvelocity' => 1,
+	'hindsightsettings' => 1,
 	'hintformat' => 1,
 	'hintheader' => 1,
 	'hintinfo' => 1,
@@ -9931,6 +9949,7 @@ my %tagExists = (
 	'homepostalcode' => 1,
 	'homestateorprovince' => 1,
 	'homestreet' => 1,
+	'horizoncontrol' => 1,
 	'horizontalfieldofview' => 1,
 	'horizontalresolution' => 1,
 	'horizontalscale' => 1,
@@ -10452,6 +10471,7 @@ my %tagExists = (
 	'lensmaker' => 1,
 	'lensnumber' => 1,
 	'lenspartnumber' => 1,
+	'lensprojection' => 1,
 	'lensrec' => 1,
 	'lensshading' => 1,
 	'lenstableindex' => 1,
@@ -10581,6 +10601,10 @@ my %tagExists = (
 	'manufactureindex' => 1,
 	'manufacturername' => 1,
 	'mappingscheme' => 1,
+	'mappingxcoefficients' => 1,
+	'mappingxmode' => 1,
+	'mappingycoefficients' => 1,
+	'mappingymode' => 1,
 	'mapscale' => 1,
 	'mariahthresholds' => 1,
 	'mariahthresholdslow' => 1,
@@ -10613,7 +10637,6 @@ my %tagExists = (
 	'maximumimageindex' => 1,
 	'maximumobjectsize' => 1,
 	'maximumoperationindex' => 1,
-	'maximumshutterangle' => 1,
 	'maximumtransformindex' => 1,
 	'maxjpegtableindex' => 1,
 	'maxpacketsize' => 1,
@@ -10802,6 +10825,7 @@ my %tagExists = (
 	'mediaistape' => 1,
 	'mediajukebox' => 1,
 	'medialanguagecode' => 1,
+	'mediamode' => 1,
 	'medianetworkaffiliation' => 1,
 	'mediaoriginalbroadcastdatetime' => 1,
 	'mediaoriginalchannel' => 1,
@@ -11217,6 +11241,7 @@ my %tagExists = (
 	'orderingrestrictions' => 1,
 	'organizeraddress' => 1,
 	'organizername' => 1,
+	'orientationdatapresent' => 1,
 	'orientationinfo' => 1,
 	'orientationoffset' => 1,
 	'orientoffset' => 1,
@@ -11475,6 +11500,8 @@ my %tagExists = (
 	'podcastid' => 1,
 	'podcastkeywords' => 1,
 	'pointsize' => 1,
+	'polynomialcoefficients' => 1,
+	'polynomialpower' => 1,
 	'popularimeter' => 1,
 	'popupfillattributes' => 1,
 	'popupflash' => 1,
@@ -11491,6 +11518,7 @@ my %tagExists = (
 	'postscript2csa' => 1,
 	'postscriptfont' => 1,
 	'postscriptfontname' => 1,
+	'powerprofile' => 1,
 	'pragma' => 1,
 	'prediminanthue' => 1,
 	'preferredfamily' => 1,
@@ -11644,6 +11672,7 @@ my %tagExists = (
 	'protectiontype' => 1,
 	'protocol' => 1,
 	'protune' => 1,
+	'protuneisomode' => 1,
 	'providercopyright' => 1,
 	'providerlogourl' => 1,
 	'providerrating' => 1,
@@ -12069,6 +12098,8 @@ my %tagExists = (
 	'sceneclassification' => 1,
 	'scenecolorimetryestimates' => 1,
 	'sceneilluminance' => 1,
+	'schedulecapture' => 1,
+	'schedulecapturetime' => 1,
 	'scheduleitemid' => 1,
 	'schemeinfo' => 1,
 	'schemetype' => 1,
@@ -12334,6 +12365,7 @@ my %tagExists = (
 	'spectralviewingconditions' => 1,
 	'spectralwhitepoint' => 1,
 	'speed' => 1,
+	'speedrampsetting' => 1,
 	'speedstamp' => 1,
 	'speedunits' => 1,
 	'sphericalvideo' => 1,
@@ -12341,6 +12373,7 @@ my %tagExists = (
 	'spiffversion' => 1,
 	'spinstrength' => 1,
 	'spothalftone' => 1,
+	'spotmeter' => 1,
 	'spouse' => 1,
 	'sr2dataifd' => 1,
 	'sr2private' => 1,
@@ -12982,7 +13015,6 @@ my %tagExists = (
 	'videoorientation' => 1,
 	'videoprofile' => 1,
 	'videoprofileversion' => 1,
-	'videosampledesc' => 1,
 	'videoscantype' => 1,
 	'videosize' => 1,
 	'videostreamtype' => 1,
@@ -13012,6 +13044,7 @@ my %tagExists = (
 	'visibleoutputs' => 1,
 	'vistaidlistdata' => 1,
 	'visualflightruleshud' => 1,
+	'visualsampledesc' => 1,
 	'vivo' => 1,
 	'vmaphandling' => 1,
 	'vmcoldropthresh' => 1,
@@ -13233,6 +13266,7 @@ my %tagExists = (
 	'zoomedpreviewimage' => 1,
 	'zoompos' => 1,
 	'zoomposition' => 1,
+	'zoomscalenormalization' => 1,
 	'zoomstrength' => 1,
 	'zxif' => 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 28402 tags, with 17530 unique tag names.
+They contain a total of 28442 tags, with 17565 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
@@ -5566,6 +5566,8 @@ is to write ImageRegion as a structure with these tags as new fields.
 
 =head3 XMP LocationDetails Struct
 
+Note that the GPS elements of this structure are in the "exif" namespace.
+
   Field Name                                    Writable
   ----------                                    --------
   City                                          string
@@ -12307,24 +12309,40 @@ L<https://github.com/gopro/gpmf-parser> for details about this format.
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
   'AALP'   AudioLevel                           no
+  'ABSC'   AutoBoostScore                       no
   'ACCL'   Accelerometer                        no
   'ALLD'   AutoLowLightDuration                 no
+  'APTO'   AudioProtuneOption                   no
+  'ARUW'   AspectRatioUnwarped                  no
+  'ARWA'   AspectRatioWarped                    no
   'ATTD'   Attitude                             no
   'ATTR'   AttitudeTarget                       no
+  'AUBT'   AudioBlueTooth                       no
   'AUDO'   AudioSetting                         no
+  'AUPT'   AutoProtune                          no
+  'BITR'   BitrateSetting                       no
   'BPOS'   Controller?                          no
   'CASN'   CameraSerialNumber                   no
+  'CDAT'   CreationDate                         no
+  'CDTM'   CaptureDelayTimer                    no
+  'CLDP'   ClassificationDataPresent            no
   'CORI'   CameraOrientation                    no
+  'CPIN'   ChapterNumber                        no
   'CSEN'   CoyoteSense                          no
+  'CTRL'   ControlLevel                         no
   'CYTS'   CoyoteStatus                         no
   'DEVC'   DeviceContainer                      GoPro GPMF
+  'DUST'   DurationSetting                      no
   'DVID'   DeviceID?                            no
   'DVNM'   DeviceName                           no
-  'DZOM'   DigitalZoom                          no
+  'DZMX'   DigitalZoomAmount                    no
+  'DZOM'   DigitalZoomOn                        no
+  'DZST'   DigitalZoom                          no
   'EISA'   ElectronicImageStabilization         no
+  'EISE'   ElectronicStabilizationOn            no
   'EMPT'   Empty?                               no
   'ESCS'   EscapeStatus?                        no
-  'EXPT'   MaximumShutterAngle                  no
+  'EXPT'   ExposureType                         no
   'FACE'   FaceDetected                         no
   'FCNM'   FaceNumbers                          no
   'FMWR'   FirmwareVersion                      no
@@ -12339,6 +12357,9 @@ L<https://github.com/gopro/gpmf-parser> for details about this format.
   'GPSU'   GPSDateTime                          no
   'GRAV'   GravityVector                        no
   'GYRO'   Gyroscope                            no
+  'HCLT'   HorizonControl                       no
+  'HDRV'   HDRVideo                             no
+  'HSGT'   HindsightSettings                    no
   'HUES'   PrediminantHue                       no
   'IORI'   ImageOrientation                     no
   'ISOE'   ISOSpeeds                            no
@@ -12346,30 +12367,45 @@ L<https://github.com/gopro/gpmf-parser> for details about this format.
   'KBAT'   BatteryStatus                        GoPro KBAT
   'LNED'   LocalPositionNED                     no
   'MAGN'   Magnetometer                         no
+  'MAPX'   MappingXCoefficients                 no
+  'MAPY'   MappingYCoefficients                 no
   'MINF'   Model                                no
+  'MMOD'   MediaMode                            no
   'MTRX'   AccelerometerMatrix                  no
   'MUID'   MediaUniqueID                        no
   'MWET'   MicrophoneWet                        no
+  'MXCF'   MappingXMode                         no
+  'MYCF'   MappingYMode                         no
+  'ORDP'   OrientationDataPresent               no
   'OREN'   AutoRotation                         no
   'ORIN'   InputOrientation                     no
   'ORIO'   OutputOrientation                    no
   'PHDR'   HDRSetting                           no
+  'PIMD'   ProtuneISOMode                       no
   'PIMN'   AutoISOMin                           no
   'PIMX'   AutoISOMax                           no
+  'POLY'   PolynomialCoefficients               no
   'PRES'   PhotoResolution                      no
-  'PRTN'   ProTune                              no
+  'PRJT'   LensProjection                       no
+  'PRTN'   Protune                              no
   'PTCL'   ColorMode                            no
   'PTEV'   ExposureCompensation                 no
   'PTSH'   Sharpness                            no
   'PTWB'   WhiteBalance                         no
+  'PWPR'   PowerProfile                         no
+  'PYCF'   PolynomialPower                      no
+  'RAMP'   SpeedRampSetting                     no
   'RATE'   Rate                                 no
   'RMRK'   Comments                             no
   'SCAL'   ScaleFactor?                         no
+  'SCAP'   ScheduleCapture                      no
   'SCEN'   SceneClassification                  no
   'SCPR'   ScaledPressure                       no
+  'SCTM'   ScheduleCaptureTime                  no
   'SHUT'   ExposureTimes                        no
   'SIMU'   ScaledIMU                            no
   'SIUN'   SIUnits?                             no
+  'SMTR'   SpotMeter                            no
   'SROT'   SensorReadoutTime                    no
   'STMP'   TimeStamp                            no
   'STNM'   StreamName?                          no
@@ -12390,6 +12426,8 @@ L<https://github.com/gopro/gpmf-parser> for details about this format.
   'WNDM'   WindProcessing                       no
   'WRGB'   WhiteBalanceRGB                      no
   'YAVG'   LumaAverage                          no
+  'ZFOV'   DiagonalFieldOfView                  no
+  'ZMPL'   ZoomScaleNormalization               no
 
 =head3 GoPro GLPI Tags
 
@@ -16858,12 +16896,14 @@ These tags are written by Nikon DSLR's which have the live view feature.
      26    AFAreaHeight                         int16u
      28    ContrastDetectAFInFocus              int8u
            AFPointsSelected                     undef[20]
+           AFPointsSelected                     int16u
      42    AFImageWidth                         int16u
      44    AFImageHeight                        int16u
      46    AFAreaXPosition                      int16u
      47    FocusPositionHorizontal              int8u~
      48    AFAreaYPosition                      int16u
            AFPointsInFocus                      undef[20]
+           AFPointsInFocus                      undef[7]
      49    FocusPositionVertical                int8u~
      50    AFAreaWidth                          int16u
      52    AFAreaHeight                         int16u
@@ -31192,7 +31232,7 @@ MP4 sample table box.
   'stps'   PartialSyncSamples                   no
   'stsc'   SampleToChunk?                       no
   'stsd'   AudioSampleDesc                      QuickTime AudioSampleDesc
-           VideoSampleDesc                      QuickTime ImageDesc
+           VisualSampleDesc                     QuickTime VisualSampleDesc
            HintSampleDesc                       QuickTime HintSampleDesc
            MetaSampleDesc                       QuickTime MetaSampleDesc
            OtherSampleDesc                      QuickTime OtherSampleDesc
@@ -31338,7 +31378,7 @@ Child atoms found in "sinf" and/or "pinf" atoms.
   'enda'   Endianness                           no
   'frma'   PurchaseFileFormat                   no
 
-=head3 QuickTime ImageDesc Tags
+=head3 QuickTime VisualSampleDesc Tags
 
   ID/Index Tag Name                             Writable
   -------- --------                             --------
@@ -31533,6 +31573,7 @@ the config file.
   'Lvlm'       LevelMeter?                      rational64s
   'MMA0'       MinoltaMMA0                      Minolta MMA
   'MMA1'       MinoltaMMA1                      Minolta MMA
+  'MUID'       MediaUID                         no
   'MVTG'       FujiFilmMVTG                     EXIF
   'NCDT'       NikonNCDT                        Nikon NCDT
   'PANA'       PanasonicPANA                    Panasonic PANA
@@ -32021,7 +32062,7 @@ Tags used in QTIF QuickTime Image Files.
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
   'idat'   ImageData                            no
-  'idsc'   ImageDescription                     QuickTime ImageDesc
+  'idsc'   ImageDescription                     QuickTime VisualSampleDesc
   'iicc'   ICC_Profile                          ICC_Profile
 
 =head2 RIFF Tags

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

@@ -214,7 +214,7 @@ sub ProcessGoogle($$)
 
     delete $$et{ProcessGoogleTrailer};  # reset flag to process the Google trailer
 
-    return -1 if $$dirInfo{OutFile};
+    return -1 if $$dirInfo{OutFile};    # let caller handle the writing
 
     # sometimes DirectoryItemLength is missing the Primary entry
     $len = [ $len ] unless ref $len eq 'ARRAY';

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

@@ -566,7 +566,7 @@ sub WriteCRW($$)
     my $trailPt;
     while ($success) {
         # check to see if trailer(s) exist(s)
-        my $trailInfo = Image::ExifTool::IdentifyTrailer($raf) or last;
+        my $trailInfo = $et->IdentifyTrailer($raf) or last;
         # rewrite the trailer(s)
         $buff = '';
         $$trailInfo{OutFile} = \$buff;

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

@@ -1225,6 +1225,7 @@ sub WriteQuickTime($$$)
                     OutFile  => $outfile,
                     NoRefTest=> 1,     # don't check directory references
                     WriteGroup => $$tagInfo{WriteGroup},
+                    Permanent => $$tagInfo{Permanent},
                     # initialize array to hold details about chunk offset table
                     # (each entry has 3-5 items: 0=atom type, 1=table offset, 2=table size,
                     #  3=optional base offset, 4=optional item ID)
@@ -1564,7 +1565,9 @@ sub WriteQuickTime($$$)
             }
             if ($msg) {
                 # (allow empty sample description for non-audio/video handler types, eg. 'url ', 'meta')
-                if ($$et{MediaType}) {
+                # (also, incorrectly written 'mett' SampleEntry by Google phones,
+                #  see https://exiftool.org/forum/index.php?msg=91158)
+                if ($avType{$$et{MediaType}}) {
                     my $grp = $$et{CUR_WRITE_GROUP} || $parent;
                     $et->Error("$msg for $grp");
                     return $rtnErr;

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

@@ -4262,9 +4262,11 @@ sub WriteDirectory($$$;$)
         if ($permanentDir{$grp0} and not ($$dirInfo{TagInfo} and $$dirInfo{TagInfo}{Deletable})) {
             undef $delFlag;
         }
-        # (never delete an entire QuickTime group)
         if ($delFlag) {
-            if (($grp0 =~ /^(MakerNotes)$/ or $grp1 =~ /^(IFD0|ExifIFD|MakerNotes)$/) and
+            if ($$dirInfo{Permanent}) {
+                $self->Warn("Not deleting permanent $dirName directory");
+                undef $grp1;
+            } elsif (($grp0 =~ /^(MakerNotes)$/ or $grp1 =~ /^(IFD0|ExifIFD|MakerNotes)$/) and
                 $self->IsRawType() and
                 # allow non-permanent MakerNote directories to be deleted (ie. NikonCapture)
                 (not $$dirInfo{TagInfo} or not defined $$dirInfo{TagInfo}{Permanent} or
@@ -6027,7 +6029,7 @@ sub WriteJPEG($$)
             Write($outfile, $hdr, $s, $segData) or $err = 1;
             my ($buff, $endPos, $trailInfo);
             my $delPreview = $$self{DEL_PREVIEW};
-            $trailInfo = IdentifyTrailer($raf) unless $$delGroup{Trailer};
+            $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})

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

@@ -402,6 +402,7 @@ my %sLocationDetails = (
     STRUCT_NAME => 'LocationDetails',
     NAMESPACE   => 'Iptc4xmpExt',
     GROUPS      => { 2 => 'Location' },
+    NOTES => 'Note that the GPS elements of this structure are in the "exif" namespace.',
     Identifier  => { List => 'Bag', Namespace => 'xmp' },
     City        => { },
     CountryCode => { },
@@ -420,6 +421,7 @@ my %sLocationDetails = (
         PrintConvInv => '$val=~s/\s*m$//;$val',
     },
     GPSAltitudeRef  => {
+        Namespace => 'exif',
         Writable => 'integer',
         PrintConv => {
             OTHER => sub {

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 = '13.17';
+$VERSION = '13.18';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -6868,10 +6868,10 @@ sub HDump($$$$;$$$)
 # Returns: Trailer info hash (with RAF and DirName set),
 #          or undef if no recognized trailer was found
 # Notes: leaves file position unchanged
-sub IdentifyTrailer($;$)
+sub IdentifyTrailer($$;$)
 {
-    my $raf = shift;
-    my $offset = shift || 0;
+    my ($self, $raf, $offset) = @_;
+    $offset or $offset = 0;
     my $pos = $raf->Tell();
     my ($buff, $type, $len);
     while ($raf->Seek(-$offset, 2) and ($len = $raf->Tell()) > 0) {
@@ -6900,6 +6900,9 @@ sub IdentifyTrailer($;$)
             $type = 'Vivo';
         } elsif ($buff =~ /jxrs...\0$/s) {
             $type = 'OnePlus';
+        } elsif ($$self{ProcessGoogleTrailer}) {
+            # check for Google trailer information if specific XMP tags exist
+            $type = 'Google';
         }
         last;
     }
@@ -7052,7 +7055,7 @@ sub ProcessTrailers($$)
         $offset += $dirLen;
         last if $dataPos and $$self{TrailerStart} and $dataPos <= $$self{TrailerStart};
         # look for next trailer
-        my $nextTrail = IdentifyTrailer($raf, $offset);
+        my $nextTrail = $self->IdentifyTrailer($raf, $offset);
         # process Google trailer after all others if necessary and not done already
         unless ($nextTrail) {
             last unless $$self{ProcessGoogleTrailer};
@@ -7504,11 +7507,7 @@ sub ProcessJPEG($$;$)
                 }
             }
             unless ($fast) {
-                $trailInfo = IdentifyTrailer($raf);
-                # check for Google trailer information if specific XMP tags exist
-                if (not $trailInfo and $$self{ProcessGoogleTrailer}) {
-                    $trailInfo = { DirName => 'Google', RAF => $raf };
-                }
+                $trailInfo = $self->IdentifyTrailer($raf);
                 # process trailer now unless we are doing verbose dump
                 if ($trailInfo and $verbose < 3 and not $htmlDump) {
                     # process trailers (keep trailInfo to finish processing later
@@ -8619,7 +8618,7 @@ sub DoProcessTIFF($$;$)
         }
         # process information in recognized trailers
         if ($raf) {
-            my $trailInfo = IdentifyTrailer($raf);
+            my $trailInfo = $self->IdentifyTrailer($raf);
             if ($trailInfo) {
                 # scan to find AFCP if necessary (Note: we are scanning
                 # from a random file position in the TIFF)
@@ -8724,7 +8723,7 @@ sub DoProcessTIFF($$;$)
         for (;;) {
             last unless $extra > 12;
             $raf->Seek($tiffEnd);  # seek back to end of image
-            $trailInfo = IdentifyTrailer($raf);
+            $trailInfo = $self->IdentifyTrailer($raf);
             last unless $trailInfo;
             my $tbuf = '';
             $$trailInfo{OutFile} = \$tbuf;  # rewrite trailer(s)

data/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 13.17
+Version: 13.18
 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('13.17.0')
+  VERSION = Gem::Version.new('13.18.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 13.17.0
+  version: 13.18.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-29 00:00:00.000000000 Z
+date: 2025-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool