exiftool_vendored 12.95.0 → 12.97.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 27985 tags, with 17475 unique tag names.
+They contain a total of 28148 tags, with 17486 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
@@ -5878,7 +5878,7 @@ These tags belong to the ExifTool XMP-pmi family 1 group.
 
 Publishing Requirements for Industry Standard Metadata 3.0 namespace
 tags.  (see
-L<https://www.w3.org/Submission/2020/SUBM-prism-20200910/prism-basic.html/>)
+L<https://www.w3.org/Submission/2020/SUBM-prism-20200910/prism-basic.html>)
 
 These tags belong to the ExifTool XMP-prism family 1 group.
 
@@ -13487,6 +13487,9 @@ RAF-format information.
   0x0110  RawImageCropTopLeft                   no
   0x0111  RawImageCroppedSize                   no
   0x0115  RawImageAspectRatio                   no
+  0x0117  RawZoomActive                         no
+  0x0118  RawZoomTopLeft                        no
+  0x0119  RawZoomSize                           no
   0x0121  RawImageSize                          no
   0x0130  FujiLayout                            no
   0x0131  XTransLayout                          no
@@ -15745,6 +15748,7 @@ DiMAGE X and Xt.
            ShotInfoD500                         Nikon ShotInfoD500
            ShotInfoD6                           Nikon ShotInfoD6
            ShotInfoD610                         Nikon ShotInfoD610
+           ShotInfoZ6III                        Nikon ShotInfoZ6III
            ShotInfoZ7II                         Nikon ShotInfoZ7II
            ShotInfoZ8                           Nikon ShotInfoZ8
            ShotInfoZ9                           Nikon ShotInfoZ9
@@ -16571,6 +16575,86 @@ These tags are extracted from encrypted data in images from the D610.
       4    FirmwareVersion                      no
    1999    CustomSettingsD610                   NikonCustom SettingsD610
 
+=head3 Nikon ShotInfoZ6III Tags
+
+These tags are extracted from encrypted data in images from the Z6III.
+
+   Index   Tag Name                             Writable
+   -----   --------                             --------
+      0    ShotInfoVersion                      no
+      4    FirmwareVersion                      no
+    136    OrientationOffset                    Nikon OrientationInfo
+    144    MenuOffset                           Nikon MenuSettingsZ6III
+
+=head3 Nikon MenuSettingsZ6III Tags
+
+These tags are used by the Z6III.
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+    364    HighFrameRate                        int8u
+    444    MultipleExposureMode                 int8u
+    446    MultiExposureShots                   int8u
+    476    IntervalDurationHours                int32u
+    480    IntervalDurationMinutes              int32u
+    484    IntervalDurationSeconds              int32u
+    492    Intervals                            int32u
+    496    ShotsPerInterval                     int32u
+    500    IntervalExposureSmoothing            int8u
+    502    IntervalPriority                     int8u
+    536    FocusShiftNumberShots                int8u
+    540    FocusShiftStepWidth                  int8u
+    544    FocusShiftInterval                   int8u~
+    548    FocusShiftExposureLock               int8u
+    648    AutoISO                              int8u
+    650    ISOAutoHiLimit?                      int16u
+    718    DiffractionCompensation              int8u
+    719    AutoDistortionControl                int8u
+    720    FlickerReductionShooting             int8u
+    722    NikonMeteringMode                    int8u
+    724    FlashControlMode                     int8u
+    730    FlashGNDistance?                     no
+    734    FlashOutput?                         int8u
+    742    FlashWirelessOption?                 int8u
+    744    FlashRemoteControl?                  int8u
+    748    FlashMasterControlMode               int8u
+    750    FlashMasterCompensation?             int8s
+    754    FlashMasterOutput?                   int8u
+    832    AFAreaMode                           int8u
+    834    VRMode                               int8u
+    838    BracketSet                           int8u
+    840    BracketProgram                       int8u
+    842    BracketIncrement                     int8u
+    852    HDR                                  int8u
+    858    SecondarySlotFunction                int8u
+    864    HDRLevel                             int8u
+    868    Slot2JpgSize?                        int8u
+    878    SubjectDetection                     int8u
+    880    DynamicAFAreaSize                    int8u
+    884    ToneMap?                             int8u
+    888    PortraitImpressionBalance            int8u
+    902    HighFrequencyFlickerReduction?       int8u
+    904    PixelShiftShooting                   int8u
+    906    PixelShiftNumberShots                int8u
+    908    PixelShiftDelay                      int8u~
+    910    PixelShiftInterval                   int8u~
+   1002    SubjectDetectionAreaMF               int8u
+   1004    LinkVRToFocusPoint?                  int8u
+   1046    MovieSlowMotion?                     int8u
+   1050    MovieType                            int8u
+   1162    MovieFrameSize?                      int8u
+   1164    MovieFrameRate?                      int8u
+   1255    CustomSettingsZ6III                  NikonCustom SettingsZ6III
+   2300    Language?                            int8u
+   2302    TimeZone                             int8u
+   2308    MonitorBrightness?                   int8u
+   2444    EmptySlotRelease?                    int8u
+   2450    EnergySavingMode?                    int8u
+   2476    USBPowerDelivery?                    int8u
+   2480    SaveFocusPosition?                   int8u
+   2487    SilentPhotography?                   int8u
+   2496    AirplaneMode?                        int8u
+
 =head3 Nikon ShotInfoZ7II Tags
 
 These tags are extracted from encrypted data in images from the Z7II.
@@ -17445,7 +17529,7 @@ Tags found in the encrypted LensData from cameras such as the Z6 and Z7.
      20    EffectiveMaxAperture                 int8u
      47    NewLensData                          undef[17]
      48    LensID                               int16u
-     53    LensMountType                        int8u
+     52    LensFirmwareVersion                  int16u~
      54    MaxAperture                          int16u
      56    FNumber                              int16u
      60    FocalLength                          int16u
@@ -17454,6 +17538,7 @@ Tags found in the encrypted LensData from cameras such as the Z6 and Z7.
      86    LensDriveEnd?                        int8u
      88    FocusStepsFromInfinity?              int8u
      90    LensPositionAbsolute                 int32s
+     95    LensMountType                        int8u & 0x01
 
 =head3 Nikon LensDataUnknown Tags
 
@@ -19051,6 +19136,108 @@ Custom settings for the D610.
    21.2    ShootingInfoMonitorOffTime           int8u & 0x1c
    35.1    PlaybackMonitorOffTime               int8u & 0xe0
 
+=head3 NikonCustom SettingsZ6III Tags
+
+Custom settings for the Z6III.
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+      3    AF-CPrioritySelection                int8u
+      5    AF-SPrioritySelection                int8u
+      7    BlockShotAFResponse                  int8u
+     11    AFPointSel                           int8u
+     13    StoreByOrientation                   int8u
+     15    AFActivation                         int8u
+     16    AF-OnOutOfFocusRelease?              int8u
+     17    LimitAF-AreaModeSelPinpoint?         int8u
+     19    LimitAF-AreaModeSelWideAF_S?         int8u
+     20    LimitAF-AreaModeSelWideAF_L?         int8u
+     21    LimitAFAreaModeSelAuto?              int8u
+     22    FocusPointWrap?                      int8u
+     23    ManualFocusPointIllumination?        int8u
+     24    DynamicAreaAFAssist?                 int8u
+     26    AF-AssistIlluminator                 int8u
+     27    ManualFocusRingInAFMode              int8u
+     29    ExposureControlStepSize              int8u
+     31    EasyExposureCompensation             int8u
+     33    CenterWeightedAreaSize               int8u
+     35    FineTuneOptMatrixMetering            int8s
+     37    FineTuneOptCenterWeighted            int8s
+     39    FineTuneOptSpotMetering              int8s
+     41    FineTuneOptHighlightWeighted         int8s
+     43    ShutterReleaseButtonAE-L             int8u
+     45    SelfTimerTime                        int8u
+     49    SelfTimerShotCount                   int8u
+     53    SelfTimerShotInterval                int8u
+     55    PlaybackMonitorOffTime               int8u
+     57    MenuMonitorOffTime                   int8u
+     59    ImageReviewMonitorOffTime            int8u
+     61    ShootingInfoMonitorOffTime           int8u
+     63    CLModeShootingSpeed                  int8u
+     65    MaxContinuousRelease                 no
+     69    SyncReleaseMode?                     int8u
+     75    LimitSelectableImageAreaDX?          int8u
+     76    LimitSelectableImageArea1To1?        int8u
+     77    LimitSelectableImageArea16To9?       int8u
+     78    FileNumberSequence                   int8u
+     81    FocusPeakingLevel?                   int8u
+     83    FocusPeakingHighlightColor?          int8u
+     85    ContinuousModeDisplay                int8u
+     87    FlashSyncSpeed                       no
+     89    HighSpeedSync                        int8u
+     91    FlashShutterSpeed                    no
+     93    FlashExposureCompArea                int8u
+     95    AutoFlashISOSensitivity              int8u
+     97    ModelingFlash                        int8u
+     99    AutoBracketModeM                     int8u
+    101    AutoBracketOrder                     int8u
+    103    Func1Button                          int8u
+    119    Func2Button                          int8u
+    135    AFOnButton                           int8u
+    147    SubSelector?                         int8u
+    159    AssignMovieRecordButton?             int8u
+    163    LensFunc1Button                      int8u
+    171    LensFunc2Button                      int8u
+    177    LensControlRing                      int8u
+    179    MultiSelectorShootMode               int8u
+    183    MultiSelectorPlaybackMode            int8u
+    187    ShutterSpeedLock                     int8u
+    188    ApertureLock                         int8u
+    190    CmdDialsReverseRotation              int8u
+    195    UseDialWithoutHold?                  int8u
+    197    ReverseIndicators?                   int8u
+    199    MovieFunc1Button                     int8u
+    205    MovieFunc2Button                     int8u
+    211    MovieAF-OnButton                     int8u
+    223    MovieLensControlRing                 int8u
+    225    MovieMultiSelector?                  int8u
+    229    MovieAFSpeed                         int8u
+    231    MovieAFSpeedApply                    int8u
+    233    MovieAFTrackingSensitivity           int8u
+    241    LCDIllumination?                     int8u
+    242    ExtendedShutterSpeeds                int8u
+    245    FocusPointPersistence                int8u
+    257    FlashBurstPriority?                  int8u
+    319    LimitAF-AreaModeSelDynamic_S?        int8u
+    320    LimitAF-AreaModeSelDynamic_M?        int8u
+    321    LimitAF-AreaModeSelDynamic_L?        int8u
+    323    LimitAF-AreaModeSel3DTracking?       int8u
+    325    PlaybackFlickUp?                     int8u
+    329    PlaybackFlickDown?                   int8u
+    333    ISOStepSize                          int8u
+    340    TouchFn?                             int8u
+    341    TouchFnRole?                         int8u
+    345    TouchFnAreaWide?                     int8u
+    347    TouchFnAreaTall?                     int8u
+    350    EVFImageFrame?                       int8u
+    351    EVFGrid?                             int8u
+    353    VirtualHorizonStyle?                 int8u
+    415    Func1ButtonPlaybackMode?             int8u
+    417    Func2ButtonPlaybackMode?             int8u
+    431    MovieRecordButtonPlaybackMode?       int8u
+    463    ControlRingResponse                  int8u
+    559    FocusPeakingDisplay?                 int8u
+
 =head3 NikonCustom SettingsZ8 Tags
 
 Custom settings for the Z8.

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, $lastPos, $errStr, $copyTrailer, $buf2);
+    my ($tag, $lastTag, $lastPos, $errStr, $trailer, $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)
@@ -860,6 +860,16 @@ sub WriteQuickTime($$$)
     my $createKeys = 0;
     my ($rtnVal, $rtnErr) = $dataPt ? (undef, undef) : (1, 0);
 
+    # check for Insta360 trailer at top level
+    if ($raf) {
+        my $pos = $raf->Tell();
+        if ($raf->Seek(-40, 2) and $raf->Read($buf2, 40) == 40 and
+            substr($buf2, 8) eq '8db42d694ccc418790edff439fe026bf')
+        {
+            $trailer = [ 'Insta360', $raf->Tell() - unpack('V',$buf2) ];
+        }
+        $raf->Seek($pos, 0) or return 0;
+    }
     if ($dataPt) {
         $raf = File::RandomAccess->new($dataPt);
     } else {
@@ -924,6 +934,11 @@ sub WriteQuickTime($$$)
 
     for (;;) {      # loop through all atoms at this level
         $lastPos = $raf->Tell();
+        # stop processing if we reached a known trailer
+        if ($trailer and $lastPos >= $$trailer[1]) {
+            $errStr = "Corrupted $$trailer[0] trailer" if $lastPos != $$trailer[1];
+            last;
+        }
         $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
@@ -1524,38 +1539,18 @@ 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' or ($lastTag eq 'free' and @mdat)) 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') 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' ];
+            # identify other known trailers
+            $buf2 = '';
+            $raf->Seek($lastPos,0) and $raf->Read($buf2,8);
+            if ($buf2 eq 'CCCCCCCC') {
+                $trailer = [ 'Kenwood', $lastPos ];
+            } elsif ($buf2 =~ /^(gpsa|gps0|gsen|gsea)...\0/s) {
+                $trailer = [ 'RIFF', $lastPos ];
             } 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.*//;
-                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)
+                $trailer = [ 'Unknown', $lastPos ];
             }
         } else {
             $et->Error($errStr);
@@ -2011,16 +2006,20 @@ sub WriteQuickTime($$$)
     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);
+    if ($rtnVal and $trailer) {
+        # 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]))) {
+            $et->Warn("Deleted $$trailer[0] trailer", 1);
+        } elsif ($raf->Seek($$trailer[1])) {
+            $et->Warn(sprintf('Copying %s trailer from offset 0x%x', @$trailer), 1);
             while ($raf->Read($buf2, 65536)) {
                 Write($outfile, $buf2) or $rtnVal = 0, last;
             }
         } else {
-            $et->Error('Error copying Insta360 trailer');
             $rtnVal = 0;
         }
+        $rtnVal or $et->Error("Error copying $$trailer[0] trailer");
     }
     return $rtnVal;
 }

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

@@ -871,7 +871,7 @@ my %prismPublicationDate = (
     NOTES => q{
         Publishing Requirements for Industry Standard Metadata 3.0 namespace
         tags.  (see
-        L<https://www.w3.org/Submission/2020/SUBM-prism-20200910/prism-basic.html/>)
+        L<https://www.w3.org/Submission/2020/SUBM-prism-20200910/prism-basic.html>)
     },
     academicField   => { }, # (3.0)
     aggregateIssueNumber => { Writable => 'integer' }, # (3.0)

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.95';
+$VERSION = '12.97';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (

data/bin/perl-Image-ExifTool.spec

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

metadata

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