exiftool-vendored.pl 12.84.0 → 12.89.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 27855 tags, with 17441 unique tag names.
+They contain a total of 27892 tags, with 17459 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
@@ -1390,6 +1390,7 @@ L<http://www.adobe.com/devnet/xmp/> for the official XMP specification.
   fpv                                           XMP fpv
   GAudio                                        XMP GAudio
   GCamera                                       XMP GCamera
+  GContainer                                    XMP GContainer
   GCreations                                    XMP GCreations
   GDepth                                        XMP GDepth
   getty                                         XMP GettyImages
@@ -4794,6 +4795,7 @@ These tags belong to the ExifTool XMP-GCamera family 1 group.
   BurstID                                       string
   BurstPrimary                                  string
   DisableAutoCreation                           string+
+  DisableSuggestedAction                        string+
   HDRPMakerNote                                 string
   HdrPlusMakernote                              string
   MicroVideo                                    integer
@@ -4809,6 +4811,42 @@ These tags belong to the ExifTool XMP-GCamera family 1 group.
   ShotLogData                                   string
   SpecialTypeID                                 string+
 
+=head3 XMP GContainer Tags
+
+Google Container namespace.  ExifTool uses the prefix 'GContainer' instead
+of 'Container' to avoid a conflict with the Google Device Container
+namespace.
+
+These tags belong to the ExifTool XMP-GContainer family 1 group.
+
+  Tag Name                                      Writable
+  --------                                      --------
+  ContainerDirectory                            Directory Struct+
+  DirectoryItem                                 Item Struct_+
+  DirectoryItemLabel                            string_+
+  DirectoryItemLength                           integer_+
+  DirectoryItemMime                             string_+
+  DirectoryItemPadding                          integer_+
+  DirectoryItemSemantic                         string_+
+  DirectoryItemURI                              string_+
+
+=head3 XMP Directory Struct
+
+  Field Name                                    Writable
+  ----------                                    --------
+  Item                                          Item Struct
+
+=head3 XMP Item Struct
+
+  Field Name                                    Writable
+  ----------                                    --------
+  Label                                         string
+  Length                                        integer
+  Mime                                          string
+  Padding                                       integer
+  Semantic                                      string
+  URI                                           string
+
 =head3 XMP GCreations Tags
 
 Google creations tags.
@@ -7746,7 +7784,8 @@ These tags are used in Pentax/Asahi cameras.
   0x0229   SerialNumber                         string
   0x022a   FilterInfo                           Pentax FilterInfo
                                                 Pentax FilterInfo
-  0x022b   LevelInfo                            Pentax LevelInfo
+  0x022b   LevelInfoK3III                       Pentax LevelInfoK3III
+           LevelInfo                            Pentax LevelInfo
   0x022d   WBLevels                             Pentax WBLevels
   0x022e   Artist                               string
   0x022f   Copyright                            string
@@ -7919,7 +7958,8 @@ Auto-exposure information for the K-01.
 
 =head3 Pentax AEInfo3 Tags
 
-Auto-exposure information for the K-3, K-30, K-50 and K-500.
+Auto-exposure information for the K-1mkII, K-3, K-30, K-50, K-70, K-500 and
+KP.
 
   Index1   Tag Name                             Writable
   ------   --------                             --------
@@ -8050,17 +8090,23 @@ Flash information tags for the K10D, K20D and K200D.
   Index1   Tag Name                             Writable
   ------   --------                             --------
     0.1    PowerSource                          int8u & 0x0f
+    0.2    PowerAvailable                       int8u & 0xf0
     1.1    BodyBatteryState                     int8u & 0xf0
     1.2    GripBatteryState                     int8u & 0x0f
-           GripBatteryState?                    int8u & 0x0f
       2    BodyBatteryADNoLoad                  int8u
            BodyBatteryVoltage1                  int16u
+           BodyBatteryState                     int8u
       3    BodyBatteryADLoad                    int8u
+           BodyBatteryPercent                   int8u
       4    GripBatteryADNoLoad                  int8u
            BodyBatteryVoltage2                  int16u
+           BodyBatteryVoltage                   int32u
       5    GripBatteryADLoad                    int8u
       6    BodyBatteryVoltage3                  int16u
       8    BodyBatteryVoltage4                  int16u
+     16    GripBatteryState                     int8u
+     17    GripBatteryPercent                   int8u
+     18    GripBatteryVoltage                   int32u
 
 =head3 Pentax AFInfo Tags
 
@@ -8072,6 +8118,7 @@ Flash information tags for the K10D, K20D and K200D.
       6    AFDefocus                            int8u
       7    AFIntegrationTime                    int8u
      11    AFPointsInFocus                      int8u
+    506    LiveView                             int8u
     509    AFHold                               int8u
 
 =head3 Pentax KelvinWB Tags
@@ -8111,6 +8158,7 @@ White balance Blue/Red gains as a function of color temperature.
   ------   --------                             --------
       0    EVSteps                              int8u
       1    SensitivitySteps                     int8u
+      3    LiveView                             int8u
 
 =head3 Pentax ShotInfo Tags
 
@@ -8224,6 +8272,16 @@ used.
     311    DigitalFilter19                      undef[17]
     328    DigitalFilter20                      undef[17]
 
+=head3 Pentax LevelInfoK3III Tags
+
+Tags decoded from the electronic level information for the K-3 III.
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+      1    CameraOrientation                    int8s
+      3    RollAngle                            int16s
+      5    PitchAngle                           int16s
+
 =head3 Pentax LevelInfo Tags
 
 Tags decoded from the electronic level information for the K-5.  May not be
@@ -9296,6 +9354,7 @@ Unknown only to reduce the volume of the normal output.
   0x4026   LogInfo                              Canon LogInfo
   0x4028   AFConfig                             Canon AFConfig
   0x403f   RawBurstModeRoll                     Canon RawBurstInfo
+  0x4059   LevelInfo                            Canon LevelInfo
 
 =head3 Canon CameraSettings Tags
 
@@ -9338,6 +9397,7 @@ Unknown only to reduce the volume of the normal output.
      41    ManualFlashOutput                    int16s
      42    ColorTone                            int16s
      46    SRAWQuality                          int16s
+     51    Clarity                              int16s
 
 =head3 Canon FocalLength Tags
 
@@ -10181,7 +10241,7 @@ CameraInfo tags for the EOS 1000D.
 
 =head3 Canon CameraInfoR6 Tags
 
-CameraInfo tags for the EOS R6.
+CameraInfo tags for the EOS R5 and R6.
 
   Index1   Tag Name                             Writable
   ------   --------                             --------
@@ -10460,6 +10520,8 @@ WB tags for the Canon G9.
      11    DigitalGain                          int16s
      12    WBShiftAB                            int16s
      13    WBShiftGM                            int16s
+     14    UnsharpMaskFineness                  int16s
+     15    UnsharpMaskThreshold                 int16s
 
 =head3 Canon ColorBalance Tags
 
@@ -11521,6 +11583,8 @@ Information about creative filter settings.
      17    VFDisplayIllumination                int32s
      18    AFStatusViewfinder                   int32s
      19    InitialAFPointInServo                int32s
+     20    SubjectToDetect                      int32s
+     24    EyeDetection                         int32s
 
 =head3 Canon RawBurstInfo Tags
 
@@ -11529,6 +11593,16 @@ Information about creative filter settings.
       1    RawBurstImageNum                     int32u
       2    RawBurstImageCount                   int32u
 
+=head3 Canon LevelInfo Tags
+
+  Index4   Tag Name                             Writable
+  ------   --------                             --------
+      4    RollAngle                            int32s
+      5    PitchAngle                           int32s
+      7    FocalLength                          int32s
+      8    MinFocalLength                       int32s
+      9    MaxFocalLength                       int32s
+
 =head3 Canon CTMD Tags
 
 Canon Timed MetaData tags found in CR3 images.  The ExtractEmbedded option
@@ -13298,6 +13372,15 @@ Face recognition information.
   Face8Category                                 no
   Face8Name                                     no
 
+=head3 FujiFilm RAFHeader Tags
+
+Tags extracted from the header of RAF images.
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+     60    RAFVersion                           no
+    108    RAFCompression                       no
+
 =head3 FujiFilm RAF Tags
 
 FujiFilm RAF images contain meta information stored in a proprietary
@@ -15930,7 +16013,7 @@ Tags written by some Nikon GPS-equipped cameras like the AW100.
   Index1   Tag Name                             Writable
   ------   --------                             --------
       0    FirmwareVersion51                    no
-     10    NEFCompression                       int16u[0.5]
+     10    NEFCompression                       int16u
 
 =head3 Nikon MakerNotes0x56 Tags
 
@@ -19821,23 +19904,23 @@ any information found here will be extracted, even if the tag is not listed.
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
   0x0000   ImageProcessingVersion               undef[4]
-  0x0100   WB_RBLevels                          int16u[2]
-  0x0102   WB_RBLevels3000K                     int16u[2]
-  0x0103   WB_RBLevels3300K                     int16u[2]
-  0x0104   WB_RBLevels3600K                     int16u[2]
-  0x0105   WB_RBLevels3900K                     int16u[2]
-  0x0106   WB_RBLevels4000K                     int16u[2]
-  0x0107   WB_RBLevels4300K                     int16u[2]
-  0x0108   WB_RBLevels4500K                     int16u[2]
-  0x0109   WB_RBLevels4800K                     int16u[2]
-  0x010a   WB_RBLevels5300K                     int16u[2]
-  0x010b   WB_RBLevels6000K                     int16u[2]
-  0x010c   WB_RBLevels6600K                     int16u[2]
-  0x010d   WB_RBLevels7500K                     int16u[2]
-  0x010e   WB_RBLevelsCWB1                      int16u[2]
-  0x010f   WB_RBLevelsCWB2                      int16u[2]
-  0x0110   WB_RBLevelsCWB3                      int16u[2]
-  0x0111   WB_RBLevelsCWB4                      int16u[2]
+  0x0100   WB_RBLevels                          int16u[n]
+  0x0102   WB_RBLevels3000K                     int16u[n]
+  0x0103   WB_RBLevels3300K                     int16u[n]
+  0x0104   WB_RBLevels3600K                     int16u[n]
+  0x0105   WB_RBLevels3900K                     int16u[n]
+  0x0106   WB_RBLevels4000K                     int16u[n]
+  0x0107   WB_RBLevels4300K                     int16u[n]
+  0x0108   WB_RBLevels4500K                     int16u[n]
+  0x0109   WB_RBLevels4800K                     int16u[n]
+  0x010a   WB_RBLevels5300K                     int16u[n]
+  0x010b   WB_RBLevels6000K                     int16u[n]
+  0x010c   WB_RBLevels6600K                     int16u[n]
+  0x010d   WB_RBLevels7500K                     int16u[n]
+  0x010e   WB_RBLevelsCWB1                      int16u[n]
+  0x010f   WB_RBLevelsCWB2                      int16u[n]
+  0x0110   WB_RBLevelsCWB3                      int16u[n]
+  0x0111   WB_RBLevelsCWB4                      int16u[n]
   0x0113   WB_GLevel3000K                       int16u
   0x0114   WB_GLevel3300K                       int16u
   0x0115   WB_GLevel3600K                       int16u
@@ -20210,6 +20293,7 @@ These tags are found in IFD0 of Panasonic/Leica RAW, RW2 and RWL images.
   0x0030   CropLeft                             int16u
   0x0031   CropBottom                           int16u
   0x0032   CropRight                            int16u
+  0x0037   ISO                                  int32u
   0x010f   Make                                 string
   0x0110   Model                                string
   0x0111   StripOffsets                         no
@@ -22872,7 +22956,7 @@ E-mount models.
 
 =head3 Sony Tag9416 Tags
 
-Valid for the ILCE-1/6700/7CM2/7CR/7M4/7RM5/7SM3/9M3, ILME-FX3/FX30, ZV-E1.
+Valid for the ILCE-1/6700/7CM2/7CR/7M4/7RM5/7SM3/9M3, ILME-FX3/FX30, ZV-E1/E10M2.
 
   Index1   Tag Name                             Writable
   ------   --------                             --------
@@ -23170,7 +23254,8 @@ The following tags are decoded in unsupported maker notes.  Use the Unknown
 
 The main DNG tags are found in the EXIF table.  The tables below define only
 information found within structures of these main DNG tag values.  See
-L<http://www.adobe.com/products/dng/> for the official DNG specification.
+L<https://helpx.adobe.com/camera-raw/digital-negative.html> for the official
+DNG specification.
 
 =head3 DNG AdobeData Tags
 
@@ -23591,7 +23676,7 @@ These tags are used in Minolta RAW format (MRW) images.
       4    WBMode                               int8u~
       5    ProgramMode                          int8u
       6    ISOSetting                           int8u
-      7    ColorMode                            int32u[0.25]
+      7    ColorMode                            int8u
       8    WB_RBLevelsTungsten                  int16u[2]
      12    WB_RBLevelsDaylight                  int16u[2]
      16    WB_RBLevelsCloudy                    int16u[2]
@@ -25732,7 +25817,7 @@ the image undisplayable.
       2    ColorSpecApproximation               int8s!
       3    ICC_Profile                          ICC_Profile
            ColorSpace                           int32u!
-           ColorSpecData                        undef!
+           ColorSpecData                        undef[$size-3]!
 
 =head3 Jpeg2000 FileType Tags
 
@@ -29414,11 +29499,11 @@ parameters, as well as proprietary information written by many camera
 models.  Tags with a question mark after their name are not extracted unless
 the Unknown option is set.
 
-When writing, ExifTool creates both QuickTime and XMP tags by default, but
-the group may be specified to write one or the other separately.  If no
-location is specified, newly created QuickTime tags are added in the
-L<ItemList|Image::ExifTool::TagNames/QuickTime ItemList Tags> location if
-possible, otherwise in
+When writing video files, ExifTool creates both QuickTime and XMP tags by
+default, but the group may be specified to write one or the other
+separately.  If no location is specified, newly created QuickTime tags are
+added in the L<ItemList|Image::ExifTool::TagNames/QuickTime ItemList Tags>
+location if possible, otherwise in
 L<UserData|Image::ExifTool::TagNames/QuickTime UserData Tags>, and
 finally in L<Keys|Image::ExifTool::TagNames/QuickTime Keys Tags>,
 but this order may be changed by setting the PREFERRED level of the
@@ -29469,7 +29554,7 @@ the original size by padding with nulls if necessary.
 
 See
 L<https://developer.apple.com/library/archive/documentation/QuickTime/QTFF/>
-for the official specification.
+for the official QuickTime specification.
 
   Tag ID               Tag Name                 Writable
   ------               --------                 --------
@@ -29541,6 +29626,7 @@ currently reads 74 different formats of timed GPS metadata from video files.
   CameraModel                                   no
   Car                                           no
   DateTimeOriginal                              no
+  DateTimeStamp                                 no
   Distance                                      no
   ExposureCompensation                          no
   ExposureTime                                  no
@@ -30738,6 +30824,7 @@ the config file.
   'RDTC'       RicohRDTC                        Ricoh RDTC
   'RDTG'       RicohRDTG                        Ricoh RDTG
   'RDTL'       RicohRDTL                        Ricoh RDTL
+  'RICO'       RicohInfo                        JPEG
   'RMKN'       RicohRMKN                        EXIF
   'RTHU'       PreviewImage                     no
   'SDLN'       PlayMode                         string
@@ -32650,7 +32737,8 @@ Other tags are extracted with the Unknown option.
 
 The following tags are extracted from Matroska multimedia container files.
 This container format is used by file types such as MKA, MKV, MKS and WEBM.
-For speed, by default ExifTool extracts tags only up to the first Cluster.
+For speed, by default ExifTool extracts tags only up to the first Cluster
+unless a Seek element specifies the position of a Tags element after this.
 However, the Verbose (-v) and Unknown = 2 (-U) options force processing of
 Cluster data, and the ExtractEmbedded (-ee) option skips over Clusters to
 read subsequent tags.  See
@@ -40063,6 +40151,7 @@ FileName.
   GeolocationCountryCode     ExifTool           no
   GeolocationDistance        ExifTool           no
   GeolocationFeatureCode     ExifTool           no
+  GeolocationFeatureType     ExifTool           no
   GeolocationPopulation      ExifTool           no
   GeolocationPosition        ExifTool           no
   GeolocationRegion          ExifTool           no
@@ -40097,6 +40186,7 @@ FileName.
   PreviewTIFF                File               no
   PreviewWMF                 File               no
   ProcessingTime             ExifTool           no
+  RAFCompression             File               no
   RAFVersion                 File               no
   ResourceForkSize           System             no
   SphericalVideoXML          GSpherical         yes!

package/bin/lib/Image/ExifTool/WriteIPTC.pl

@@ -215,7 +215,7 @@ sub FormatIPTC($$$$$;$)
 sub IptcDate($)
 {
     my $val = shift;
-    unless ($val =~ s{^.*(\d{4})[-:/.]?(\d{2})[-:/.]?(\d{2}).*}{$1$2$3}s) {
+    unless ($val =~ s{^.*?(\d{4})[-:/.]?(\d{2})[-:/.]?(\d{2}).*}{$1$2$3}s) {
         warn "Invalid date format (use YYYY:mm:dd)\n";
         undef $val;
     }

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

@@ -507,10 +507,16 @@ sub WriteItemInfo($$$)
         my ($warn, $extent, $buff, @edit);
         $warn = 'Missing iloc box' unless $$boxPos{iloc};
         $warn = "No Extents for $type item" unless $$item{Extents} and @{$$item{Extents}};
-        $warn = "Can't currently decode encoded $type metadata" if $$item{ContentEncoding};
+        if ($$item{ContentEncoding}) {
+            if ($$item{ContentEncoding} ne 'deflate') {
+                $warn = "Can't currently decode $$item{ContentEncoding} encoded $type metadata";
+            } elsif (not eval { require Compress::Zlib }) {
+                $warn = "Install Compress::Zlib to decode deflated $type metadata";
+            }
+        }
         $warn = "Can't currently decode protected $type metadata" if $$item{ProtectionIndex};
         $warn = "Can't currently extract $type with construction method $$item{ConstructionMethod}" if $$item{ConstructionMethod};
-        $warn = "$type metadata is not this file" if $$item{DataReferenceIndex};
+        $warn = "$type metadata is not in this file" if $$item{DataReferenceIndex};
         $warn and $et->Warn($warn), next;
         my $base = $$item{BaseOffset} || 0;
         my $val = '';
@@ -527,6 +533,25 @@ sub WriteItemInfo($$$)
         }
         next unless defined $buff;
         $buff = $val . $buff if length $val;
+        my $comp = $et->Options('Compress');
+        if (defined $comp and ($comp xor $$item{ContentEncoding})) {
+            #TODO: add ability to edit infe entry in iinf to change encoding according to Compress option if set
+            $et->Warn("Can't currently change compression when rewriting $name in HEIC");
+        }
+        my $wasDeflated;
+        if ($$item{ContentEncoding}) {
+            my ($v2, $stat);
+            my $inflate = Compress::Zlib::inflateInit();
+            $inflate and ($v2, $stat) = $inflate->inflate($buff);
+            $et->VPrint(0, "  (Inflating stored $name metadata)\n");
+            if ($inflate and $stat == Compress::Zlib::Z_STREAM_END()) {
+                $buff = $v2;
+                $wasDeflated = 1;
+            } else {
+                $et->WarnOnce("Error inflating $name metadata");
+                next;
+            }
+        }
         my ($hdr, $subTable, $proc);
         if ($name eq 'EXIF') {
             if (not length $buff) {
@@ -560,6 +585,17 @@ sub WriteItemInfo($$$)
             ($dirInfo{DirLen} or length $newVal))
         {
             $newVal = $hdr . $newVal if length $hdr and length $newVal;
+            if ($wasDeflated) {
+                my $deflate = Compress::Zlib::deflateInit();
+                if ($deflate) {
+                    $et->VPrint(0, "  (Re-deflating new $name metadata)\n");
+                    $buff = $deflate->deflate($newVal);
+                    if (defined $buff) {
+                        $buff .= $deflate->flush();
+                        $newVal = $buff;
+                    }
+                }
+            }
             $edit[0][2] = \$newVal;     # replace the old chunk with the new data
             $edit[0][3] = $id;          # mark this chunk with the item ID
             push @mdatEdit, @edit;
@@ -640,21 +676,38 @@ sub WriteItemInfo($$$)
             # add new infe to iinf
             $add{iinf} = $add{iref} = $add{iloc} = '' unless defined $add{iinf};
             my ($type, $mime);
+            my $enc = '';
             if ($name eq 'XMP') {
                 $type = "mime\0";
                 $mime = "application/rdf+xml\0";
+                # write compressed XMP if Compress option is set
+                if ($et->Options('Compress') and length $newVal) {
+                    if (not eval { require Compress::Zlib }) {
+                        $et->WarnOnce('Install Compress::Zlib to write compressed metadata');
+                    } else {
+                        my $deflate = Compress::Zlib::deflateInit();
+                        if ($deflate) {
+                            $et->VPrint(0, "  (Deflating new $name metadata)\n");
+                            my $buff = $deflate->deflate($newVal);
+                            if (defined $buff) {
+                                $newVal = $buff . $deflate->flush();
+                                $enc = "deflate\0";
+                            }
+                        }
+                    }
+                }
             } else {
                 $type = "Exif\0";
                 $mime = '';
             }
             my $id = 1;
             ++$id while $$items{$id} or $usedID{$id};   # find next unused item ID
-            my $n = length($type) + length($mime) + 16;
+            my $n = length($type) + length($mime) + length($enc) + 16;
             if ($id < 0x10000) {
-                $add{iinf} .= pack('Na4CCCCnn', $n, 'infe', 2, 0, 0, 1, $id, 0) . $type . $mime;
+                $add{iinf} .= pack('Na4CCCCnn', $n, 'infe', 2, 0, 0, 1, $id, 0) . $type . $mime . $enc;
             } else {
                 $n += 2;
-                $add{iinf} .= pack('Na4CCCCNn', $n, 'infe', 3, 0, 0, 1, $id, 0) . $type . $mime;
+                $add{iinf} .= pack('Na4CCCCNn', $n, 'infe', 3, 0, 0, 1, $id, 0) . $type . $mime . $enc;
             }
             # add new cdsc to iref
             if ($irefVer) {
@@ -733,28 +786,36 @@ sub WriteItemInfo($$$)
                 $add{$tag} = Set32u(12 + length $add{$tag}) . $tag .
                              Set8u($$boxPos{$tag}[2]) . "\0\0\0" . $add{$tag};
             } elsif ($tag ne 'hdlr') {
-                my $n = Get32u($outfile, $pos);
-                Set32u($n + length($add{$tag}), $outfile, $pos);    # increase box size
+                my $n = Get32u($outfile, $pos) +  length($add{$tag});
+                Set32u($n, $outfile, $pos);    # increase box size
             }
             if ($tag eq 'iinf') {
                 my $iinfVer = Get8u($outfile, $pos + 8);
                 if ($iinfVer == 0) {
-                    my $n = Get16u($outfile, $pos + 12);
-                    Set16u($n + $countNew, $outfile, $pos + 12);    # incr count
+                    my $n = Get16u($outfile, $pos + 12) + $countNew;
+                    if ($n > 0xffff) {
+                        $et->Error("Can't currently handle rollover to long item count");
+                        return undef;
+                    }
+                    Set16u($n, $outfile, $pos + 12);    # incr count
                 } else {
-                    my $n = Get32u($outfile, $pos + 12);
-                    Set32u($n + $countNew, $outfile, $pos + 12);    # incr count
+                    my $n = Get32u($outfile, $pos + 12) + $countNew;
+                    Set32u($n, $outfile, $pos + 12);    # incr count
                 }
             } elsif ($tag eq 'iref') {
                 # nothing more to do
             } elsif ($tag eq 'iloc') {
                 my $ilocVer = Get8u($outfile, $pos + 8);
                 if ($ilocVer < 2) {
-                    my $n = Get16u($outfile, $pos + 14);
-                    Set16u($n + $countNew, $outfile, $pos + 14);    # incr count
+                    my $n = Get16u($outfile, $pos + 14) + $countNew;
+                    Set16u($n, $outfile, $pos + 14);    # incr count
+                    if ($n > 0xffff) {
+                        $et->Error("Can't currently handle rollover to long item count");
+                        return undef;
+                    }
                 } else {
-                    my $n = Get32u($outfile, $pos + 14);
-                    Set32u($n + $countNew, $outfile, $pos + 14);    # incr count
+                    my $n = Get32u($outfile, $pos + 14) + $countNew;
+                    Set32u($n, $outfile, $pos + 14);    # incr count
                 }
                 # must also update pointer locations in this box
                 if ($added) {
@@ -876,7 +937,8 @@ sub WriteQuickTime($$$)
                 # --> hold this terminator to the end
                 $term = $hdr;
             } elsif ($n != 0) {
-                $et->Error("Unknown $n bytes at end of file", 1);
+                # warn unless this is 1-3 pad bytes
+                $et->Error("Unknown $n bytes at end of file", 1) if $n > 3 or $hdr ne "\0" x $n;
             }
             last;
         }
@@ -894,6 +956,8 @@ sub WriteQuickTime($$$)
                 } elsif (not $et->Options('LargeFileSupport')) {
                     $et->Error('End of processing at large atom (LargeFileSupport not enabled)');
                     last;
+                } elsif ($et->Options('LargeFileSupport') eq '2') {
+                    $et->WarnOnce('Processing large atom (LargeFileSupport is 2)');
                 }
             }
             $size = $hi * 4294967296 + $lo - 16;
@@ -1446,7 +1510,13 @@ sub WriteQuickTime($$$)
             $writeLast = ($writeLast || '') . $hdr . $buff;
         } else {
             # save position of this box in the output buffer
+#TODO do this:
+#TODO            my $bp = $boxPos{$tag} || ($boxPos{$tag} = [ ]);
+#TODO            push @$bp, length($$outfile), length($hdr) + length($buff);
+#TODO instead of this:
             $boxPos{$tag} = [ length($$outfile), length($hdr) + length($buff) ];
+#TODO then we have the positions of all the infe boxes -- we then only need
+#TODO to know the index of the box to edit if the encoding changes for one of them
             # copy the existing atom
             Write($outfile, $hdr, $buff) or $rtnVal=$rtnErr, $err=1, last;
         }

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

@@ -29,7 +29,6 @@ sub ConvInv($$$$$;$$);
 sub PushValue($$$;$);
 
 my $loadedAllTables;    # flag indicating we loaded all tables
-my $advFmtSelf;         # ExifTool object during evaluation of advanced formatting expr
 
 # the following is a road map of where we write each directory
 # in the different types of files.
@@ -3380,7 +3379,7 @@ sub InsertTagValues($$;$$$$)
         if (defined $expr and defined $val) {
             local $SIG{'__WARN__'} = \&SetWarning;
             undef $evalWarning;
-            $advFmtSelf = $self;
+            $advFmtSelf = $self;    # set variable for access to $self in helper functions
             if ($asList) {
                 foreach (@val) {
                     #### eval advanced formatting expression ($_, $self, @val, $tag, $advFmtSelf)
@@ -3845,7 +3844,6 @@ sub GetGeolocateTags($$;$)
         'iptc'          => [ qw(City Province-State Country-PrimaryLocationCode Country-PrimaryLocationName) ],
         'gps'           => [ qw(GPSLatitude GPSLongitude GPSLatitudeRef GPSLongitudeRef) ],
         'xmp-exif'      => [ qw(GPSLatitude GPSLongitude) ],
-        'keys'          => [ 'GPSCoordinates', 'LocationName' ],
         'itemlist'      => [ 'GPSCoordinates' ],
         'userdata'      => [ 'GPSCoordinates' ],
         # more general groups not in this lookup: XMP and QuickTime 
@@ -3856,12 +3854,16 @@ sub GetGeolocateTags($$;$)
         $tagGroups{$grp} and push @tags, map("$grp:$_", @{$tagGroups{$grp}});
     }
     # set default XMP City tags if necessary
-    if (not $writeGPS and ($grps{xmp} or (not @tags and not $grps{quicktime}))) {
-        push @tags, qw(XMP:City XMP:State XMP:CountryCode XMP:Country Keys:LocationName);
+    if (not $writeGPS) {
+        push @tags, 'Keys:LocationName' if $grps{'keys'};
+        if  ($grps{xmp} or (not @tags and not $grps{quicktime})) {
+            push @tags, qw(XMP:City XMP:State XMP:CountryCode XMP:Country Keys:LocationName);
+        }
     }
     $writeGPS = 1 unless defined $writeGPS; # (delete both City and GPS)
+    push @tags, 'Keys:GPSCoordinates' if $writeGPS and $grps{'keys'};
     # set default QuickTime tag if necessary
-    my $didQT = grep /Coordinates$/, @tags;
+    my $didQT = grep /GPSCoordinates$/, @tags;
     if (($grps{quicktime} and not $didQT) or ($writeGPS and not @tags and not $grps{xmp})) {
         push @tags, 'QuickTime:GPSCoordinates';
     }

package/bin/lib/Image/ExifTool/XMP.pm

@@ -50,7 +50,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 require Exporter;
 
-$VERSION = '3.65';
+$VERSION = '3.66';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeXML UnescapeXML);
 
@@ -203,8 +203,9 @@ my %xmpNS = (
     hdr_metadata => 'http://ns.adobe.com/hdr-metadata/1.0/',
     hdrgm     => 'http://ns.adobe.com/hdr-gain-map/1.0/',
     xmpDSA    => 'http://leica-camera.com/digital-shift-assistant/1.0/',
-  # Note: Not included due to namespace prefix conflict with Device:Container
-  # Container => 'http://ns.google.com/photos/1.0/container/',
+    # Note: Google uses a prefix of 'Container', but this conflicts with the
+    # Device Container namespace, also by Google.  So call this one GContainer
+    GContainer=> 'http://ns.google.com/photos/1.0/container/',
 );
 
 # build reverse namespace lookup
@@ -932,11 +933,10 @@ my %sRangeMask = (
         Name => 'xmpDSA',
         SubDirectory => { TagTable => 'Image::ExifTool::Panasonic::DSA' },
     },
-  # Note: Note included due to namespace prefix conflict with Device:Container
-  # Container => {
-  #     Name => 'Container',
-  #     SubDirectory => { TagTable => 'Image::ExifTool::XMP::Container' },
-  # },
+    GContainer => {
+        Name => 'GContainer',
+        SubDirectory => { TagTable => 'Image::ExifTool::XMP::GContainer' },
+    },
 );
 
 # hack to allow XML containing Dublin Core metadata to be handled like XMP (eg. EPUB - see ZIP.pm)
@@ -3794,6 +3794,8 @@ sub ParseXMPElement($$$;$$$$)
                         if ($stdNS) {
                             $val = $try;
                             $et->WarnOnce("Fixed incorrect URI for xmlns:$ns", 1);
+                        } elsif ($val =~ m(^http://ns.nikon.com/BASIC_PARAM)) {
+                            $et->OverrideFileType('NXD','application/x-nikon-nxd');
                         } else {
                             # look for same namespace with different version number
                             $try = quotemeta $val; # (note: escapes slashes too)