exiftool_vendored 12.97.0 → 12.99.0

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

@@ -12,7 +12,7 @@ require Exporter;
 
 use vars qw($VERSION @ISA @EXPORT_OK);
 
-$VERSION = '1.12';
+$VERSION = '1.13';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(ReadCSV ReadJSON);
 
@@ -87,6 +87,7 @@ sub ReadCSV($$;$$)
                 $fileInfo{$tags[$i]} =
                     (defined $missingValue and $vals[$i] eq $missingValue) ? undef : $vals[$i];
             }
+            $fileInfo{_ordered_keys_} = \@tags;
             # figure out the file name to use
             if ($fileInfo{SourceFile}) {
                 $$database{$fileInfo{SourceFile}} = \%fileInfo;
@@ -173,7 +174,7 @@ Tok: for (;;) {
         }
         # see what type of object this is
         if ($tok eq '{') {      # object (hash)
-            $rtnVal = { } unless defined $rtnVal;
+            $rtnVal = { _ordered_keys_ => [ ] } unless defined $rtnVal;
             for (;;) {
                 # read "KEY":"VALUE" pairs
                 unless (defined $key) {
@@ -189,6 +190,7 @@ Tok: for (;;) {
                     $pos = pos $$buffPt;
                     return undef unless defined $val;
                     $$rtnVal{$key} = $val;
+                    push @{$$rtnVal{_ordered_keys_}}, $key;
                     undef $key;
                 }
                 # scan to delimiting ',' or bounding '}'
@@ -345,7 +347,9 @@ option for a list of valid character sets.
 These functions return an error string, or undef on success and populate the
 database hash with entries from the CSV or JSON file.  Entries are keyed
 based on the SourceFile column of the CSV or JSON information, and are
-stored as hash lookups of tag name/value for each SourceFile.
+stored as hash lookups of tag name/value for each SourceFile.  The order
+of the keys (CSV column order or order in a JSON object) is stored as an
+ARRAY reference in a special "_ordered_keys_" element of this hash.
 
 =back
 

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

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.08';
+$VERSION = '1.09';
 
 # map for writing metadata to InDesign files (currently only write XMP)
 my %indMap = (
@@ -104,9 +104,10 @@ sub ProcessIND($$)
             # this must be null padding or we have a possible error
             last if $hdr =~ /^\0+$/;
             # (could be up to 4095 bytes of non-null garbage plus 4095 null bytes from ExifTool)
-            $raf->Read($buff, 8196) and $hdr .= $buff;
+            $raf->Read($buff, 8192) and $hdr .= $buff;
+            my $n = length $hdr;
             $hdr =~ s/\0+$//;   # remove trailing nulls
-            if (length($hdr) > 4095) {
+            if ($n > 8190 or length($hdr) > 4095) {
                 $err = 'Corrupt file or unsupported InDesign version';
                 last;
             }

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

@@ -14,7 +14,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Import;
 
-$VERSION = '1.08';
+$VERSION = '1.09';
 
 sub ProcessJSON($$);
 sub ProcessTag($$$$%);
@@ -92,8 +92,7 @@ sub ProcessTag($$$$%)
             return unless $et->Options('Struct') > 1;
         }
         # support hashes with ordered keys
-        my @keys = $$val{_ordered_keys_} ? @{$$val{_ordered_keys_}} : sort keys %$val;
-        foreach (@keys) {
+        foreach (Image::ExifTool::OrderedKeys($val)) {
             my $tg = $tag . ((/^\d/ and $tag =~ /\d$/) ? '_' : '') . ucfirst;
             $tg =~ s/([^a-zA-Z])([a-z])/$1\U$2/g;
             ProcessTag($et, $tagTablePtr, $tg, $$val{$_}, %flags, Flat => 1);
@@ -155,7 +154,7 @@ sub ProcessJSON($$)
 
     # extract tags from JSON database
     foreach $key (sort keys %database) {
-        foreach $tag (sort keys %{$database{$key}}) {
+        foreach $tag (Image::ExifTool::OrderedKeys($database{$key})) {
             my $val = $database{$key}{$tag};
             # (ignore SourceFile if generated automatically by ReadJSON)
             next if $tag eq 'SourceFile' and defined $val and $val eq '*';

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

@@ -16,7 +16,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.40';
+$VERSION = '1.41';
 
 sub ProcessJpeg2000Box($$$);
 sub ProcessJUMD($$$);
@@ -574,6 +574,7 @@ my %j2cMarker = (
     2 => {
         Name => 'CompatibleBrands',
         Format => 'undef[$size-8]',
+        List => 1, # (for documentation only)
         # ignore any entry with a null, and return others as a list
         ValueConv => 'my @a=($val=~/.{4}/sg); @a=grep(!/\0/,@a); \@a',
     },

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

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Import;
 
-$VERSION = '1.03';
+$VERSION = '1.04';
 
 sub ExtractTags($$$);
 
@@ -106,7 +106,7 @@ sub ExtractTags($$$)
     my ($et, $meta, $parent) = @_;
     ref $meta eq 'HASH' or $et->Warn('Invalid LFP metadata'), return;
     my ($key, $val, $name, $tagTablePtr);
-    foreach $key (sort keys %$meta) {
+    foreach $key (Image::ExifTool::OrderedKeys($meta)) {
         my $tag = $parent . ucfirst($key);
         foreach $val (ref $$meta{$key} eq 'ARRAY' ? @{$$meta{$key}} : $$meta{$key}) {
             ref $val eq 'HASH' and ExtractTags($et, $val, $tag), next;

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

@@ -328,6 +328,14 @@ sub ParsePID($$$$$)
                 $more = 1;  # read past unknown 0x15 packets if ExtractEmbedded > 2
             }
         }
+# still have a lot of questions about how to decode this...
+# (see https://exiftool.org/forum/index.php?topic=16486 and ../testpics/gps_video/forum16486.ts)
+#    } elsif ($type == 6) {
+#        my @a = unpack('x17x2NNx2nx2nx2nx2Cx2a4x2a5x2Nx2Nx2nx2Nx2Nx2Nx2nx2nx2Nx2nx2n', $$dataPt . "        ");
+#        my $hi = shift @a;
+#        $a[0] = Image::ExifTool::ConvertUnixTime(($a[0] + $hi * 4294967296) * 1e-6, undef, 6);
+#        print "@a\n";
+#        $more = 1;
     } elsif ($type < 0) {
         if ($$dataPt =~ /^(.{164})?(.{24})A[NS][EW]/s) {
             # (Blueskysea B4K, Novatek NT96670)

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

@@ -48,7 +48,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.02';
+$VERSION = '3.04';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -901,6 +901,7 @@ my %userDefined = (
         Writable => 1,
     },
     # '35AX'? - seen "AT" (Yada RoadCam Pro 4K dashcam)
+    cust => 'CustomInfo', # 70mai A810
 );
 
 # stuff seen in 'skip' atom (70mai Pro Plus+ MP4 videos)
@@ -935,6 +936,7 @@ my %userDefined = (
     2 => {
         Name => 'CompatibleBrands',
         Format => 'undef[$size-8]',
+        List => 1, # (for documentation only)
         # ignore any entry with a null, and return others as a list
         ValueConv => 'my @a=($val=~/.{4}/sg); @a=grep(!/\0/,@a); \@a',
     },
@@ -2551,7 +2553,7 @@ my %userDefined = (
     TTID => { Name => 'TomTomID', ValueConv => 'unpack("x4H*",$val)' },
     TTVI => { Name => 'TomTomVI', Format => 'int32u', Unknown => 1 }, # seen: "0 1 61 508 508"
     # TTVD seen: "normal 720p 60fps 60fps 16/9 wide 1x"
-    TTVD => { Name => 'TomTomVD', ValueConv => 'my @a = ($val =~ /[\x20-\x7f]+/g); "@a"' },
+    TTVD => { Name => 'TomTomVD', ValueConv => 'my @a = ($val =~ /[\x20-\x7f]+/g); "@a"', List => 1 },
 );
 
 # User-specific media data atoms (ref 11)
@@ -3350,6 +3352,7 @@ my %userDefined = (
         PrintConv => '"Track $val"',
     },
     # cdep (Structural Dependency QT tag?)
+    # fall - ? int32u, seen: 2
 );
 
 # track aperture mode dimensions atoms
@@ -6743,6 +6746,13 @@ my %userDefined = (
         Avoid => 1,
         %iso8601Date,
     },
+    # (mdta)com.apple.quicktime.scene-illuminance
+    'scene-illuminance' => {
+        Name => 'SceneIlluminance',
+        Notes => 'milli-lux',
+        ValueConv => 'unpack("N", $val)',
+        Writable => 0, # (don't make this writable because it is found in timed metadata)
+    },
 #
 # seen in Apple ProRes RAW file
 #
@@ -7392,6 +7402,7 @@ my %userDefined = (
     # alac - 28 bytes
     # adrm - AAX DRM atom? 148 bytes
     # aabd - AAX unknown 17kB (contains 'aavd' strings)
+    # dapa - ? 203 bytes
 );
 
 # AMR decode config box (ref 3)
@@ -9151,7 +9162,7 @@ sub HandleItemInfo($)
             $et->ProcessDirectory(\%dirInfo, $subTable, $proc);
             delete $$et{DOC_NUM};
         }
-        $raf->Seek($curPos, 0);     # seek back to original position
+        $raf->Seek($curPos, 0) or $et->Warn('Seek error'), last;     # seek back to original position
         pop @{$$et{PATH}};
     }
     # process the item properties now that we should know their associations and document numbers
@@ -9577,7 +9588,7 @@ sub ProcessMOV($$;$)
         if ($tag eq 'ftyp' and $size >= 12) {
             # read ftyp atom to see what type of file this is
             if ($raf->Read($buff, $size-8) == $size-8) {
-                $raf->Seek(-($size-8), 1);
+                $raf->Seek(-($size-8), 1) or $et->Warn('Seek error'), return 0;
                 my $type = substr($buff, 0, 4);
                 $$et{save_ftyp} = $type;
                 # see if we know the extension for this file type
@@ -9629,7 +9640,7 @@ sub ProcessMOV($$;$)
                     # a zero size isn't legal for contained atoms, but Canon uses it to
                     # terminate the CNTH atom (eg. CanonEOS100D.mov), so tolerate it here
                     my $pos = $raf->Tell() - 4;
-                    $raf->Seek(0,2);
+                    $raf->Seek(0,2) or $et->Warn('Seek error'), return 0;
                     my $str = $$dirInfo{DirName} . ' with ' . ($raf->Tell() - $pos) . ' bytes';
                     $et->VPrint(0,"$$et{INDENT}\[Terminator found in $str remaining]");
                 } else {
@@ -9638,7 +9649,7 @@ sub ProcessMOV($$;$)
                     if ($$tagTablePtr{"$tag-size"}) {
                         my $pos = $raf->Tell();
                         unless ($fast) {
-                            $raf->Seek(0, 2);
+                            $raf->Seek(0, 2) or $et->Warn('Seek error'), return 0;
                             $et->HandleTag($tagTablePtr, "$tag-size", $raf->Tell() - $pos);
                         }
                         $et->HandleTag($tagTablePtr, "$tag-offset", $pos) if $$tagTablePtr{"$tag-offset"};

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

@@ -109,7 +109,7 @@ my %insvLimit = (
         The tags below are extracted from timed metadata in QuickTime and other
         formats of video files when the ExtractEmbedded option is used.  Although
         most of these tags are combined into the single table below, ExifTool
-        currently reads 77 different formats of timed GPS metadata from video files.
+        currently reads 78 different formats of timed GPS metadata from video files.
     },
     VARS => { NO_ID => 1 },
     GPSLatitude  => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")', RawConv => '$$self{FoundGPSLatitude} = 1; $val' },
@@ -2163,9 +2163,26 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
             push(@xtra, $1 => $2), next;
         }
 
+    } elsif ($$dataPt =~ m/^.{30}A.{20}VV/) {
+    
+        $debug and $et->FoundTag(GPSType => 17);
+        # 70mai A810 dashcam (note: no timestamps in the samples I have)
+        #  0000: 00 00 40 00 66 72 65 65 47 50 53 20 ed 01 00 00 [..@.freeGPS ....]
+        #  0010: 03 00 ed 01 00 00 00 0f 00 00 70 08 00 00 41 66 [..........p...Af]
+        #  0020: 13 7d 1e 3c 11 dc 03 5d 01 00 00 01 00 00 00 23 [.}.<...].......#]
+        #  0030: 00 00 00 56 56 00 00 00 00 00 00 00 00 00 00 00 [...VV...........]
+        #  0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [................]
+        SetByteOrder('II');
+        SetGPSDateTime($et, $tagTbl, $$dirInfo{SampleTime});
+        $lat = Get32s($dataPt, 31) / 1e5;
+        $lon = Get32s($dataPt, 35) / 1e5;
+        $spd = Get32s($dataPt, 43);  # (seems to be km/h but not confirmed)
+        # offset 475 - int16u=N string[N] - some sort of settings?:
+        # eg. "\x15\x00{pA:V,rA:V,sF:0,tF:2}"
+
     } else {
 
-        $debug and $et->FoundTag(GPSType => 17);
+        $debug and $et->FoundTag(GPSType => 18);
         # (look for binary GPS as stored by Nextbase 512G, ref PH)
         #  0000: 00 00 80 00 66 72 65 65 47 50 53 20 78 01 00 00 [....freeGPS x...]
         #  0010: 78 2e 78 78 00 00 00 00 00 00 00 00 00 00 00 00 [x.xx............]

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

@@ -34,7 +34,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Minolta;
 
-$VERSION = '3.69';
+$VERSION = '3.70';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -170,6 +170,7 @@ sub PrintInvLensSpec($;$$);
     32885 => 'Sony FE 16-35mm F2.8 GM II', #JR
     32886 => 'Sony FE 300mm F2.8 GM OSS', #JR
     32887 => 'Sony E PZ 16-50mm F3.5-5.6 OSS II', #JR
+    32888 => 'Sony FE 85mm F1.4 GM II', #JR
 
   # (comment this out so LensID will report the LensModel, which is more useful)
   # 32952 => 'Metabones Canon EF Speed Booster Ultra', #JR (corresponds to 184, but 'Advanced' mode, LensMount reported as E-mount)
@@ -241,6 +242,8 @@ sub PrintInvLensSpec($;$$);
     49474.9 => 'Viltrox 75mm F1.2 E', #JR
    '49474.10' => 'Viltrox 20mm F2.8 FE', #JR
     49475 => 'Tamron 50-300mm F4.5-6.3 Di III VC VXD', #JR (Model A069)
+    49476 => 'Tamron 28-300mm F4-7.1 Di III VC VXD', #JR (Model A074)
+    49477 => 'Tamron 90mm F2.8 Di III Macro VXD', #JR (Model F072)
 
     49712 => 'Tokina FiRIN 20mm F2 FE AF',       # (firmware Ver.01)
     49713 => 'Tokina FiRIN 100mm F2.8 FE MACRO', # (firmware Ver.01)
@@ -299,6 +302,7 @@ sub PrintInvLensSpec($;$$);
     50547 => 'Sigma 10-18mm F2.8 DC DN | C', #JR (023)
     50548 => 'Sigma 15mm F1.4 DG DN DIAGONAL FISHEYE | A', #JR (024)
     50549 => 'Sigma 50mm F1.2 DG DN | A', #JR (024)
+    50550 => 'Sigma 28-105mm F2.8 DG DN | A', #JR (024)
     50551 => 'Sigma 28-45mm F1.8 DG DN | A', #JR (024)
 
     50992 => 'Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III', #JR
@@ -315,6 +319,7 @@ sub PrintInvLensSpec($;$$);
     51003 => 'Voigtlander NOKTON 35mm F1.2 Aspherical SE', #JR
     51006 => 'Voigtlander APO-LANTHAR 35mm F2 Aspherical', #JR
     51007 => 'Voigtlander NOKTON 50mm F1 Aspherical', #JR
+    51008 => 'Voigtlander NOKTON 75mm F1.5 Aspherical', #JR
 
     # lenses listed in the Sigma MC-11 list, but not yet seen:
     # 504xx => 'Sigma 18-200mm F3.5-6.3 DC MACRO OS HSM | C + MC-11', # (014)

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

@@ -8686,7 +8686,6 @@ my %tagExists = (
 	'cont' => 1,
 	'contactnames' => 1,
 	'containerversion' => 1,
-	'contake' => 1,
 	'contentbranding' => 1,
 	'contentdescribes' => 1,
 	'contentdescription' => 1,
@@ -8709,6 +8708,7 @@ my %tagExists = (
 	'contrastadjustment' => 1,
 	'contrastinfo' => 1,
 	'controller' => 1,
+	'conttake' => 1,
 	'convergenceangle' => 1,
 	'convergencebaseimage' => 1,
 	'convergencedistance' => 1,
@@ -8820,6 +8820,7 @@ my %tagExists = (
 	'customfunctionsd30' => 1,
 	'customfunctionsd60' => 1,
 	'customfunctionsunknown' => 1,
+	'custominfo' => 1,
 	'customsettingsd3' => 1,
 	'customsettingsd300' => 1,
 	'customsettingsd300s' => 1,
@@ -12014,6 +12015,7 @@ my %tagExists = (
 	'scenebalancealgorithmrevision' => 1,
 	'sceneclassification' => 1,
 	'scenecolorimetryestimates' => 1,
+	'sceneilluminance' => 1,
 	'scheduleitemid' => 1,
 	'schemeinfo' => 1,
 	'schemetype' => 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 28148 tags, with 17486 unique tag names.
+They contain a total of 28150 tags, with 17488 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
@@ -26108,7 +26108,7 @@ the image undisplayable.
   ------   --------                             --------
       0    MajorBrand                           no
       1    MinorVersion                         no
-      2    CompatibleBrands                     no
+      2    CompatibleBrands                     no+
 
 =head3 Jpeg2000 ImageHeader Tags
 
@@ -26163,7 +26163,7 @@ from any tags found in this segment.
   ------               --------                 --------
   'Aperture'           Aperture                 no
   'ColorMode'          ColorMode                no
-  'ConTake'            ConTake                  no
+  'ContTake'           ContTake                 no
   'ExpBias'            ExposureCompensation     no
   'FNumber'            FNumber                  no
   'FWare'              FirmwareVersion          no
@@ -29846,6 +29846,7 @@ for the official QuickTime specification.
   'PICT'               PreviewPICT              no
   '_htc'               HTCInfo                  QuickTime HTCInfo
   'ardt'               ARDroneFile              no
+  'cust'               CustomInfo               no
   'frea'               Kodak_frea               Kodak frea
   'free'               KodakFree                Kodak Free
                        Pittasoft                QuickTime Pittasoft
@@ -29897,7 +29898,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 77 different formats of timed GPS metadata from video files.
+currently reads 78 different formats of timed GPS metadata from video files.
 
   Tag Name                                      Writable
   --------                                      --------
@@ -30163,6 +30164,7 @@ changed via the config file.
   'producer'    Producer                        yes
   'publisher'   Publisher                       yes
   'rating.user' UserRating                      yes
+  'scene-illuminance' SceneIlluminance          no
   'software'    Software                        yes
   'still-image-time' StillImageTime             no
   'title'       Title                           yes
@@ -30230,7 +30232,7 @@ Tags found in Pittasoft Blackvue dashcam "free" data.
   ------   --------                             --------
       0    MajorBrand                           no
       1    MinorVersion                         no
-      2    CompatibleBrands                     no
+      2    CompatibleBrands                     no+
 
 =head3 QuickTime OtherMeta Tags
 
@@ -31280,7 +31282,7 @@ Tags found in TomTom Bandit Action Cam MP4 videos.
   'TTAD'   TomTomAD                             QuickTime Stream
   'TTHL'   TomTomHL?                            no
   'TTID'   TomTomID                             no
-  'TTVD'   TomTomVD                             no
+  'TTVD'   TomTomVD                             no+
   'TTVI'   TomTomVI?                            no
 
 =head3 QuickTime HintTrackInfo Tags

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

@@ -184,11 +184,19 @@ sub GetFreeEntries($)
 {
     my $dict = shift;
     my %xrefFree;
-    # from the start we have only written xref stream entries in 'CNn' format,
-    # so we can simplify things for now and only support this type of entry
+    # we write xref stream entries in 'CNn' or 'CNNn' format (with 8-byte 'NN' offset),
     my $w = $$dict{W};
-    if (ref $w eq 'ARRAY' and "@$w" eq '1 4 2') {
-        my $size = $$dict{_entry_size}; # this will be 7 for 'CNn'
+    if (ref $w eq 'ARRAY') {
+        my $bytes = "@$w";
+        my $fmt;
+        if ($bytes eq '1 4 2') {
+            $fmt = 'CNn';
+        } elsif ($bytes eq '1 8 2') {
+            $fmt = 'CNNn';
+        } else {
+            return \%xrefFree;
+        }
+        my $size = $$dict{_entry_size}; # this will be 7 for 'CNn' or 11 for 'CNNn'
         my $index = $$dict{Index};
         my $len = length $$dict{_stream};
         # scan the table for free objects
@@ -200,7 +208,12 @@ sub GetFreeEntries($)
             my $count = $$index[$i*2+1];
             for ($j=0; $j<$count; ++$j) {
                 last if $pos + $size > $len;
-                my @t = unpack("x$pos CNn", $$dict{_stream});
+                my @t = unpack("x$pos $fmt", $$dict{_stream});
+                if (@t == 4) {
+                    $t[1] = $t[1] * 4294967296 + $t[2];
+                    $t[2] = $t[3];
+                    @t = 3;
+                }
                 # add entry if object was free
                 $xrefFree{$start+$j} = [ $t[1], $t[2], 'f' ] if $t[0] == 0;
                 $pos += $size;  # step to next entry
@@ -657,24 +670,37 @@ sub WritePDF($$)
             $newXRef{$nextObject++} = [ Tell($outfile) - $$et{PDFBase} + length($/), 0, 'n' ];
             $$mainDict{Size} = $nextObject;
             # create xref stream and Index entry
-            $$mainDict{W} = [ 1, 4, 2 ];    # int8u, int32u, int16u ('CNn')
-            $$mainDict{Index} = [ ];
-            $$mainDict{_stream} = '';
-            my @ids = sort { $a <=> $b } keys %newXRef;
-            while (@ids) {
-                my $startID = $ids[0];
-                for (;;) {
-                    $id = shift @ids;
-                    my ($pos, $gen, $type) = @{$newXRef{$id}};
-                    if ($pos > 0xffffffff) {
-                        $et->Error('Huge files not yet supported');
-                        last;
+            my $bits = 4;
+Restart:    for (;;) {
+                $$mainDict{W} = [ 1, $bits, 2 ];    # int8u, int32u/int64u, int16u ('CNn' or 'CNNn')
+                $$mainDict{Index} = [ ];
+                $$mainDict{_stream} = '';
+                my @ids = sort { $a <=> $b } keys %newXRef;
+                while (@ids) {
+                    my $startID = $ids[0];
+                    for (;;) {
+                        $id = shift @ids;
+                        my ($pos, $gen, $type) = @{$newXRef{$id}};
+                        if ($pos > 0xffffffff) {
+                            if ($bits == 4) {
+                                # switch to 64-bit integer offsets
+                                $bits = 8;
+                                next Restart;
+                            }
+                        }
+                        if ($bits == 4) {
+                            $$mainDict{_stream} .= pack('CNn', $type eq 'f' ? 0 : 1, $pos, $gen);
+                        } else {
+                            my $hi = int($pos / 4294967296);
+                            my $lo = $pos - $hi * 4294967296;
+                            $$mainDict{_stream} .= pack('CNNn', $type eq 'f' ? 0 : 1, $hi, $lo, $gen);
+                        }
+                        last if not @ids or $ids[0] != $id + 1;
                     }
-                    $$mainDict{_stream} .= pack('CNn', $type eq 'f' ? 0 : 1, $pos, $gen);
-                    last if not @ids or $ids[0] != $id + 1;
+                    # add Index entries for this section of the xref stream
+                    push @{$$mainDict{Index}}, $startID, $id - $startID + 1;
                 }
-                # add Index entries for this section of the xref stream
-                push @{$$mainDict{Index}}, $startID, $id - $startID + 1;
+                last;
             }
             # write the xref stream object
             $keyExt = "$id 0 obj";  # (set anyway, but xref stream should NOT be encrypted)

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

@@ -925,19 +925,31 @@ sub WriteXMP($$;$)
     # get hash of all information we want to change
     # (sorted by tag name so alternate languages come last, but with structures
     # first so flattened tags may be used to override individual structure elements)
-    my (@tagInfoList, $delLangPath, %delLangPaths, %delAllLang, $firstNewPath);
+    my (@tagInfoList, @structList, $delLangPath, %delLangPaths, %delAllLang, $firstNewPath, @langTags);
     my $writeGroup = $$dirInfo{WriteGroup};
     foreach $tagInfo (sort ByTagName $et->GetNewTagInfoList()) {
         next unless $et->GetGroup($tagInfo, 0) eq 'XMP';
         next if $$tagInfo{Name} eq 'XMP'; # (ignore full XMP block if we didn't write it already)
         next if $writeGroup and $writeGroup ne $$et{NEW_VALUE}{$tagInfo}{WriteGroup};
-        if ($$tagInfo{Struct}) {
-            unshift @tagInfoList, $tagInfo;
+        if ($$tagInfo{LangCode}) {
+            push @langTags, $tagInfo
+        } elsif ($$tagInfo{Struct}) {
+            push @structList, $tagInfo;
         } else {
             push @tagInfoList, $tagInfo;
         }
     }
-    foreach $tagInfo (@tagInfoList) {
+    if (@langTags) {
+        # keep original order in which lang-alt entries were added
+        foreach $tagInfo (sort { $$et{NEW_VALUE}{$a}{Order} <=> $$et{NEW_VALUE}{$b}{Order} } @langTags) {
+            if ($$tagInfo{Struct}) {
+                push @structList, $tagInfo;
+            } else {
+                push @tagInfoList, $tagInfo;
+            }
+        }
+    }
+    foreach $tagInfo (@structList, @tagInfoList) {
         my @delPaths;   # list of deleted paths
         my $tag = $$tagInfo{TagID};
         my $path = GetPropertyPath($tagInfo);

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

@@ -295,10 +295,11 @@ my %ignorePrintConv = map { $_ => 1 } qw(OTHER BITMASK Notes);
 #           CreateGroups - hash of all family 0 group names where tag may be created
 #           WriteGroup - group name where information is being written (correct case)
 #           WantGroup - group name as specified in call to function (case insensitive)
-#           Next - pointer to next new value hash (if more than one)
+#           Next - pointer to next new value hash (if more than one for this tag)
 #           NoReplace - set if value was created with Replace=0
 #           AddBefore - number of list items added by a subsequent Replace=0 call
-#           IsNVH - Flag indicating this is a new value hash
+#           IsNVH - flag indicating this is a new value hash
+#           Order - counter to indicate the order that new value hashes were created
 #           Shift - shift value
 #           Save - counter used by SaveNewValues()/RestoreNewValues()
 #           MAKER_NOTE_FIXUP - pointer to fixup if necessary for a maker note value
@@ -317,7 +318,7 @@ sub SetNewValue($;$$%)
 
     unless (defined $tag) {
         delete $$self{NEW_VALUE};
-        $$self{SAVE_COUNT} = 0;
+        $$self{SAVE_COUNT} = $$self{NV_COUNT} = 0;
         $$self{DEL_GROUP} = { };
         return 1;
     }
@@ -1389,8 +1390,16 @@ sub SetNewValuesFromFile($$;@)
     return $info if $$info{Error} and $$info{Error} eq 'Error opening file';
     delete $$srcExifTool{VALUE}{Error}; # delete so we can check this later
 
-    # sort tags in reverse order so we get priority tag last
-    my @tags = reverse sort keys %$info;
+    # sort tags in file order with priority tags last
+    my (@tags, @prio);
+    foreach (sort { $$srcExifTool{FILE_ORDER}{$a} <=> $$srcExifTool{FILE_ORDER}{$b} } keys %$info) {
+        if (/ /) {
+            push @tags, $_;
+        } else {
+            push @prio, $_;
+        }
+    }
+    push @tags, @prio;
 #
 # simply transfer all tags from source image if no tags specified
 #
@@ -3896,6 +3905,7 @@ sub GetNewValueHash($$;$$$$)
             TagInfo => $tagInfo,
             WriteGroup => $writeGroup,
             IsNVH => 1, # set flag so we can recognize a new value hash
+            Order => $$self{NV_COUNT}++,
         };
         # add entry to our NEW_VALUE hash
         if ($$self{NEW_VALUE}{$tagInfo}) {
@@ -4023,7 +4033,7 @@ sub RemoveNewValuesForGroup($$)
 #------------------------------------------------------------------------------
 # Get list of tagInfo hashes for all new data
 # Inputs: 0) ExifTool object reference, 1) optional tag table pointer
-# Returns: list of tagInfo hashes
+# Returns: list of tagInfo hashes in no particular order
 sub GetNewTagInfoList($;$)
 {
     my ($self, $tagTablePtr) = @_;

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

@@ -50,7 +50,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 require Exporter;
 
-$VERSION = '3.66';
+$VERSION = '3.67';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeXML UnescapeXML);
 
@@ -3777,8 +3777,13 @@ sub ParseXMPElement($$$;$$$$)
 
         # extract property attributes
         my ($parseResource, %attrs, @attrs);
-        while ($attrs =~ m/(\S+?)\s*=\s*(['"])(.*?)\2/sg) {
-            my ($attr, $val) = ($1, $3);
+# this hangs Perl (v5.18.4) for a specific capture string [patched in ExifTool 12.98]
+#        while ($attrs =~ m/(\S+?)\s*=\s*(['"])(.*?)\2/sg) {
+        while ($attrs =~ /(\S+?)\s*=\s*(['"])/g) {
+            my ($attr, $quote) = ($1, $2);
+            my $p0 = pos($attrs);
+            last unless $attrs =~ /$quote/g;
+            my $val = substr($attrs, $p0, pos($attrs)-$p0-1);
             # handle namespace prefixes (defined by xmlns:PREFIX, or used with PREFIX:tag)
             if ($attr =~ /(.*?):/) {
                 if ($1 eq 'xmlns') {