exiftool-vendored.pl 12.91.0 → 12.97.0

package/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 27895 tags, with 17462 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.
 
@@ -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
@@ -11601,8 +11693,8 @@ Information about creative filter settings.
       4    RollAngle                            int32s
       5    PitchAngle                           int32s
       7    FocalLength                          int32s
-      8    MinFocalLength                       int32s
-      9    MaxFocalLength                       int32s
+      8    MinFocalLength2                      int32s
+      9    MaxFocalLength2                      int32s
 
 =head3 Canon CTMD Tags
 
@@ -13395,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
@@ -15653,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
@@ -16479,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.
@@ -17353,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
@@ -17362,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
 
@@ -18959,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.
@@ -29618,7 +29897,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 76 different formats of timed GPS metadata from video files.
+currently reads 77 different formats of timed GPS metadata from video files.
 
   Tag Name                                      Writable
   --------                                      --------
@@ -29822,9 +30101,14 @@ changed via the config file.
                 FrameReadoutTime                yes
   'camera.identifier' CameraIdentifier          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
@@ -29884,6 +30168,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
@@ -39363,6 +39648,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

package/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, $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 {
@@ -923,6 +933,12 @@ sub WriteQuickTime($$$)
     $tag = $lastTag = '';
 
     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
@@ -1526,13 +1542,15 @@ sub WriteQuickTime($$$)
         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}))
         {
-            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));
+            # 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 {
-                $et->Warn('Unknown trailer with ' . lcfirst($errStr));
-                $et->Error('Use "-trailer=" to delete unknown trailer');
+                $trailer = [ 'Unknown', $lastPos ];
             }
         } else {
             $et->Error($errStr);
@@ -1645,27 +1663,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 +1995,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 +2005,22 @@ sub WriteQuickTime($$$)
     # write the stuff that must come last
     Write($outfile, $writeLast) or $rtnVal = 0 if $writeLast;
 
+    # copy trailer if necessary
+    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 {
+            $rtnVal = 0;
+        }
+        $rtnVal or $et->Error("Error copying $$trailer[0] trailer");
+    }
     return $rtnVal;
 }
 

package/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;
         }
@@ -2835,7 +2835,10 @@ sub GetAllGroups($;$)
     $family == 3 and return('Doc#', 'Main');
     $family == 4 and return('Copy#');
     $family == 5 and return('[too many possibilities to list]');
-    $family == 6 and return(@Image::ExifTool::Exif::formatName[1..$#Image::ExifTool::Exif::formatName]);
+    if ($family == 6) {
+        my $fn = \%Image::ExifTool::Exif::formatNumber;
+        return(sort { $$fn{$a} <=> $$fn{$b} } keys %$fn);
+    }
     $family == 8 and return('File#');
 
     LoadAllTables();    # first load all our tables
@@ -3551,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

package/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)