exiftool_vendored 12.98.0 → 13.02.0

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' },
@@ -591,8 +591,8 @@ my %insvLimit = (
     GROUPS => { 2 => 'Location' },
     FIRST_ENTRY => 0,
     NOTES => q{
-        Tags extracted from the tx3g sbtl timed metadata of Yuneec drones, and
-        subtitle text in some other videos.
+        Tags extracted from the tx3g sbtl timed metadata of Yuneec and Autel drones,
+        and subtitle text in some other videos.
     },
     Lat => {
         Name => 'GPSLatitude',
@@ -619,6 +619,32 @@ my %insvLimit = (
         PrintConv => '$self->ConvertDateTime($val)',
     },
     Text => { Groups => { 2 => 'Other' } },
+    # the following tags are extracted from Autel Evo II drone videos
+    GPSDateTime  => {
+        Groups => { 2 => 'Time' },
+        Description => 'GPS Date/Time',
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
+    HomeLat => {
+        Name => 'GPSHomeLatitude',
+        RawConv => '$$self{FoundGPSLatitude} = 1; $val',
+        PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")',
+    },
+    HomeLon => {
+        Name => 'GPSHomeLongitude',
+        PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")',
+    },
+    ISO => { },
+    SHUTTER => {
+        Name => 'ExposureTime',
+        ValueConv => '1 / $val',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+    },
+    'F-NUM' => {
+        Name => 'FNumber',
+        PrintConv => 'Image::ExifTool::Exif::PrintFNumber($val)',
+    },
+    EV => 'ExposureCompensation',
 );
 
 %Image::ExifTool::QuickTime::INSV_MakerNotes = (
@@ -2163,9 +2189,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............]
@@ -2344,7 +2387,7 @@ sub ParseTag($$$)
 }
 
 #------------------------------------------------------------------------------
-# Process Yuneec 'tx3g' sbtl metadata (ref PH)
+# Process Yuneec 'tx3g' and Autel sbtl metadata (ref PH)
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
 # Returns: 1 on success
 sub Process_tx3g($$$)
@@ -2352,13 +2395,49 @@ sub Process_tx3g($$$)
     my ($et, $dirInfo, $tagTablePtr) = @_;
     my $dataPt = $$dirInfo{DataPt};
     return 0 if length $$dataPt < 2;
-    pos($$dataPt) = 2;  # skip 2-byte length word
     $et->VerboseDir('tx3g', undef, length($$dataPt)-2);
-    $et->HandleTag($tagTablePtr, 'Text', substr($$dataPt, 2));
-    if ($$dataPt =~ /^..\w{3} (\d{4})-(\d{2})-(\d{2}) (\d{2}:\d{2}:\d{2}) ?([-+])(\d{2}):?(\d{2})$/s) {
+    my $text = substr($$dataPt, 2); # remove 2-byte length word
+    $et->HandleTag($tagTablePtr, 'Text', $text);
+    if ($text =~ /^HOME\(/) {
+        # --- sample text from Autel Evo II drone ---
+        # HOME(W: 109.318642, N: 40.769371) 2023-09-12 10:28:07
+        # GPS(W: 109.339287, N: 40.768574, 2371.76m) 
+        # HDR ISO:100 SHUTTER:1000 EV:-0.7 F-NUM:1.8 
+        # F.PRY (1.0\xc2\xb0, -3.7\xc2\xb0, -59.0\xc2\xb0), G.PRY (-51.1\xc2\xb0, 0.0\xc2\xb0, -58.9\xc2\xb0)
+        my $line;
+        foreach $line (split /\x0a/, $text) {
+            if ($line =~ /^HOME\(([EW]):\s*(\d+\.\d+),\s*([NS]):\s*(\d+\.\d+)\)\s*(.*)/) {
+                my ($lon, $lat, $time) = ($2, $4, $5);
+                $lon = -$lon if $1 eq 'W';
+                $lat = -$lat if $3 eq 'S';
+                $time =~ tr/-/:/; # (likely local time zone, but not confirmed)
+                $et->HandleTag($tagTablePtr, GPSDateTime => $time);
+                $et->HandleTag($tagTablePtr, HomeLat     => $lat);
+                $et->HandleTag($tagTablePtr, HomeLon     => $lon);
+            } elsif ($line =~ /^GPS\(([EW]):\s*(\d+\.\d+),\s*([NS]):\s*(\d+\.\d+),\s*(.*)m/) {
+                my ($lon, $lat, $alt) = ($2, $4, $5);
+                $lon = -$lon if $1 eq 'W';
+                $lat = -$lat if $3 eq 'S';
+                $et->HandleTag($tagTablePtr, Lat  => $lat);
+                $et->HandleTag($tagTablePtr, Lon  => $lon);
+                $et->HandleTag($tagTablePtr, Alt  => $alt);
+            } elsif ($line =~ /^F\.PRY\s*\((-?[\d.]+)\xc2\xb0,\s*(-?[\d.]+)\xc2\xb0,\s*(-?[\d.]+)\xc2\xb0/) {
+                $et->HandleTag($tagTablePtr, Yaw   => $1);
+                $et->HandleTag($tagTablePtr, Pitch => $2);
+                $et->HandleTag($tagTablePtr, Roll  => $3);
+                if ($line =~ /G\.PRY\s*\((-?[\d.]+)\xc2\xb0,\s*(-?[\d.]+)\xc2\xb0,\s*(-?[\d.]+)\xc2\xb0/) {
+                    $et->HandleTag($tagTablePtr, GimYaw   => $1);
+                    $et->HandleTag($tagTablePtr, GimPitch => $2);
+                    $et->HandleTag($tagTablePtr, GimRoll  => $3);
+                }
+            } else {
+                $et->HandleTag($tagTablePtr, $1, $2) while $line =~ /([-\w]+):([^:]*[^:\s])(\s|$)/sg;
+            }
+        }
+    } elsif ($text =~ /^\w{3} (\d{4})-(\d{2})-(\d{2}) (\d{2}:\d{2}:\d{2}) ?([-+])(\d{2}):?(\d{2})$/s) {
         $et->HandleTag($tagTablePtr, 'DateTime', "$1:$2:$3 $4$5$6:$7");
     } else {
-        $et->HandleTag($tagTablePtr, $1, $2) while $$dataPt =~ /(\w+):([^:]*[^:\s])(\s|$)/sg;
+        $et->HandleTag($tagTablePtr, $1, $2) while $text =~ /(\w+):([^:]*[^:\s])(\s|$)/sg;
     }
     return 1;
 }

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

@@ -1349,7 +1349,7 @@ my %tagLookup = (
 	'camerae-mountversion' => { 490 => 0xb },
 	'cameraelevationangle' => { 124 => 0x9405, 524 => 'CameraElevationAngle' },
 	'camerafilename' => { 507 => 'CameraFilename' },
-	'camerafirmware' => { 124 => 0xa439 },
+	'camerafirmware' => { 124 => 0xa439, 524 => 'CameraFirmware' },
 	'cameraid' => { 333 => 0x209, 413 => 'cmid', 429 => 0x209 },
 	'cameraidentifier' => { 407 => 'camera.identifier' },
 	'cameraimage' => { 495 => [\'Cameras','CamerasCameraImage'] },
@@ -3728,8 +3728,8 @@ my %tagLookup = (
 	'imagedustoff' => { 300 => 0xfe443a45 },
 	'imageeditcount' => { 388 => 0x41 },
 	'imageediting' => { 388 => 0x32 },
-	'imageeditingsoftware' => { 124 => 0xa43b },
-	'imageeditor' => { 124 => 0xa438 },
+	'imageeditingsoftware' => { 124 => 0xa43b, 524 => 'ImageEditingSoftware' },
+	'imageeditor' => { 124 => 0xa438, 524 => 'ImageEditor' },
 	'imageeffects' => { 420 => 0x1010 },
 	'imagefileconstraints' => { 338 => 'ImageFileConstraints' },
 	'imagefileformatasdelivered' => { 338 => 'ImageFileFormatAsDelivered' },
@@ -3805,9 +3805,10 @@ my %tagLookup = (
 	'imagesuppliername' => { 338 => [\'ImageSupplier','ImageSupplierImageSupplierName'] },
 	'imagetemperaturemax' => { 126 => 0x1 },
 	'imagetemperaturemin' => { 126 => 0x2 },
+	'imagetitle' => { 124 => 0xa436, 524 => 'ImageTitle' },
 	'imagetone' => { 388 => 0x4f },
 	'imagetype' => { 136 => 0x82, 338 => 'ImageType' },
-	'imageuniqueid' => { 1 => 0x15, 68 => 0x28, 124 => 0xa420, 522 => 'ImageUniqueID', 523 => 'ImageUniqueID' },
+	'imageuniqueid' => { 1 => 0x15, 68 => 0x28, 124 => 0xa420, 522 => 'ImageUniqueID', 523 => 'ImageUniqueID', 524 => 'ImageUniqueID' },
 	'imagewidth' => { 124 => 0x100, 193 => 0xe, 397 => 0x10c, 502 => 'ImageWidth', 542 => 'ImageWidth' },
 	'inclinationangle' => { 491 => 0x900f },
 	'inclinationcorrection' => { 491 => 0x900e },
@@ -4796,7 +4797,7 @@ my %tagLookup = (
 	'metadataauthorityidentifier' => { 531 => [\'metadataAuthority','metadataAuthorityIdentifier'] },
 	'metadataauthorityname' => { 531 => [\'metadataAuthority','metadataAuthorityName'] },
 	'metadatadate' => { 544 => 'MetadataDate' },
-	'metadataeditingsoftware' => { 124 => 0xa43c },
+	'metadataeditingsoftware' => { 124 => 0xa43c, 524 => 'MetadataEditingSoftware' },
 	'metadatalastedited' => { 531 => 'metadataLastEdited' },
 	'metadatalasteditor' => { 531 => 'metadataLastEditor' },
 	'metadatalasteditoridentifier' => { 531 => [\'metadataLastEditor','metadataLastEditorIdentifier'] },
@@ -5599,7 +5600,7 @@ my %tagLookup = (
 	'photoeffectsgreen' => { 302 => 0x6 },
 	'photoeffectsred' => { 302 => 0x4 },
 	'photoeffectstype' => { 302 => 0x0 },
-	'photographer' => { 124 => 0xa437 },
+	'photographer' => { 124 => 0xa437, 524 => 'Photographer' },
 	'photographicsensitivity' => { 524 => 'PhotographicSensitivity' },
 	'photoidentifier' => { 1 => 0x2b },
 	'photoinfoplayback' => { 307 => '17.6', 316 => '33.6' },
@@ -5946,7 +5947,7 @@ my %tagLookup = (
 	'rawdevcolorspace' => { 334 => 0x108, 335 => 0x109 },
 	'rawdevcontrastvalue' => { 334 => 0x106, 335 => 0x105 },
 	'rawdeveditstatus' => { 334 => 0x10b },
-	'rawdevelopingsoftware' => { 124 => 0xa43a },
+	'rawdevelopingsoftware' => { 124 => 0xa43a, 524 => 'RAWDevelopingSoftware' },
 	'rawdevelopmentprocess' => { 388 => 0x62 },
 	'rawdevengine' => { 334 => 0x109, 335 => 0x10b },
 	'rawdevexposurebiasvalue' => { 334 => 0x100, 335 => 0x100 },
@@ -6940,7 +6941,7 @@ my %tagLookup = (
 	'timezoneinfo' => { 105 => 0x2 },
 	'timezoneoffset' => { 124 => 0x882a },
 	'tint' => { 407 => 'player.movie.visual.tint', 517 => 'Tint', 519 => 'Tint' },
-	'title' => { 124 => 0xa436, 162 => 'Title', 337 => 'Title', 341 => 'Title', 352 => 0x65, 404 => 'Title', 405 => ['titl',"\xa9nam"], 407 => 'title', 413 => ['titl',"\xa9nam"], 520 => 'title', 533 => 'Title', 544 => 'Title' },
+	'title' => { 162 => 'Title', 337 => 'Title', 341 => 'Title', 352 => 0x65, 404 => 'Title', 405 => ['titl',"\xa9nam"], 407 => 'title', 413 => ['titl',"\xa9nam"], 520 => 'title', 533 => 'Title', 544 => 'Title' },
 	'togglestyleamount' => { 517 => 'ToggleStyleAmount', 519 => 'ToggleStyleAmount' },
 	'togglestyledigest' => { 517 => 'ToggleStyleDigest', 519 => 'ToggleStyleDigest' },
 	'tonecomp' => { 241 => 0x81 },
@@ -8686,7 +8687,6 @@ my %tagExists = (
 	'cont' => 1,
 	'contactnames' => 1,
 	'containerversion' => 1,
-	'contake' => 1,
 	'contentbranding' => 1,
 	'contentdescribes' => 1,
 	'contentdescription' => 1,
@@ -8709,6 +8709,7 @@ my %tagExists = (
 	'contrastadjustment' => 1,
 	'contrastinfo' => 1,
 	'controller' => 1,
+	'conttake' => 1,
 	'convergenceangle' => 1,
 	'convergencebaseimage' => 1,
 	'convergencedistance' => 1,
@@ -8820,6 +8821,7 @@ my %tagExists = (
 	'customfunctionsd30' => 1,
 	'customfunctionsd60' => 1,
 	'customfunctionsunknown' => 1,
+	'custominfo' => 1,
 	'customsettingsd3' => 1,
 	'customsettingsd300' => 1,
 	'customsettingsd300s' => 1,
@@ -9741,6 +9743,8 @@ my %tagExists = (
 	'gpsframingaltitude' => 1,
 	'gpsframinglatitude' => 1,
 	'gpsframinglongitude' => 1,
+	'gpshomelatitude' => 1,
+	'gpshomelongitude' => 1,
 	'gpshorizontalaccuracy' => 1,
 	'gpsinfo' => 1,
 	'gpslatitude2' => 1,
@@ -12014,6 +12018,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 28165 tags, with 17491 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
@@ -871,7 +871,7 @@ for the official EXIF 2.32 specification.
   0xa433   LensMake                  ExifIFD    string
   0xa434   LensModel                 ExifIFD    string
   0xa435   LensSerialNumber          ExifIFD    string
-  0xa436   Title                     ExifIFD    string/
+  0xa436   ImageTitle                ExifIFD    string
   0xa437   Photographer              ExifIFD    string
   0xa438   ImageEditor               ExifIFD    string
   0xa439   CameraFirmware            ExifIFD    string
@@ -4605,7 +4605,7 @@ These tags belong to the ExifTool XMP-exif family 1 group.
   GPSTrack                                      rational
   GPSTrackRef                                   string
   GPSVersionID                                  string
-  ImageUniqueID                                 string
+  ImageUniqueID                                 string/
   ISO                                           integer+
   LightSource                                   string
   MakerNote                                     string
@@ -4686,6 +4686,7 @@ These tags belong to the ExifTool XMP-exifEX family 1 group.
   Acceleration                                  rational
   SerialNumber                                  string
   CameraElevationAngle                          rational
+  CameraFirmware                                string
   OwnerName                                     string
   CompositeImage                                integer
   CompositeImageCount                           integer+
@@ -4702,6 +4703,10 @@ These tags belong to the ExifTool XMP-exifEX family 1 group.
   CompImageValues                               rational_+
   Gamma                                         rational
   Humidity                                      rational
+  ImageEditingSoftware                          string
+  ImageEditor                                   string
+  ImageTitle                                    string
+  ImageUniqueID                                 string
   InteropIndex                                  string
   ISOSpeed                                      integer
   ISOSpeedLatitudeyyy                           integer
@@ -4710,8 +4715,11 @@ These tags belong to the ExifTool XMP-exifEX family 1 group.
   LensModel                                     string
   LensSerialNumber                              string
   LensInfo                                      rational+
+  MetadataEditingSoftware                       string
+  Photographer                                  string
   PhotographicSensitivity                       integer
   Pressure                                      rational
+  RAWDevelopingSoftware                         string
   RecommendedExposureIndex                      integer
   SensitivityType                               integer
   StandardOutputSensitivity                     integer
@@ -26163,7 +26171,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 +29854,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 +29906,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 +30172,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
@@ -30185,22 +30195,29 @@ changed via the config file.
 
 =head3 QuickTime tx3g Tags
 
-Tags extracted from the tx3g sbtl timed metadata of Yuneec drones, and
-subtitle text in some other videos.
+Tags extracted from the tx3g sbtl timed metadata of Yuneec and Autel drones,
+and subtitle text in some other videos.
 
-  Tag ID       Tag Name                         Writable
-  ------       --------                         --------
-  'Alt'        GPSAltitude                      no
-  'DateTime'   DateTime                         no
-  'GimPitch'   GimbalPitch                      no
-  'GimRoll'    GimbalRoll                       no
-  'GimYaw'     GimbalYaw                        no
-  'Lat'        GPSLatitude                      no
-  'Lon'        GPSLongitude                     no
-  'Pitch'      Pitch                            no
-  'Roll'       Roll                             no
-  'Text'       Text                             no
-  'Yaw'        Yaw                              no
+  Tag ID               Tag Name                 Writable
+  ------               --------                 --------
+  'Alt'                GPSAltitude              no
+  'DateTime'           DateTime                 no
+  'EV'                 ExposureCompensation     no
+  'F-NUM'              FNumber                  no
+  'GPSDateTime'        GPSDateTime              no
+  'GimPitch'           GimbalPitch              no
+  'GimRoll'            GimbalRoll               no
+  'GimYaw'             GimbalYaw                no
+  'HomeLat'            GPSHomeLatitude          no
+  'HomeLon'            GPSHomeLongitude         no
+  'ISO'                ISO                      no
+  'Lat'                GPSLatitude              no
+  'Lon'                GPSLongitude             no
+  'Pitch'              Pitch                    no
+  'Roll'               Roll                     no
+  'SHUTTER'            ExposureTime             no
+  'Text'               Text                     no
+  'Yaw'                Yaw                      no
 
 =head3 QuickTime HTCInfo Tags
 

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

@@ -15,7 +15,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.04';
+$VERSION = '1.05';
 
 # Text tags
 %Image::ExifTool::Text::Main = (
@@ -191,7 +191,8 @@ sub ProcessTXT($$)
             $enc = 'unknown-8bit';
         }
     }
-    if ($$et{VALUE}{MIMEEncoding} ne $enc) {
+    # ($$et{VALUE}{MIMEEncoding} may be undef if it was ignored)
+    if (defined $$et{VALUE}{MIMEEncoding} and $$et{VALUE}{MIMEEncoding} ne $enc) {
         $$et{VALUE}{MIMEEncoding} = $enc;
         $et->VPrint(0,"  MIMEEncoding [override] = $enc\n");
     }

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

@@ -17,7 +17,7 @@ package Image::ExifTool::Validate;
 use strict;
 use vars qw($VERSION %exifSpec);
 
-$VERSION = '1.23';
+$VERSION = '1.24';
 
 use Image::ExifTool qw(:Utils);
 use Image::ExifTool::Exif;
@@ -575,7 +575,7 @@ sub FinishValidate($$)
             # get all tags in this group
             foreach $key (sort keys %{$$et{VALUE}}) {
                 next unless $et->GetGroup($key, 1) eq $grp;
-                next if $$et{TAG_EXTRA}{$key} and $$et{TAG_EXTRA}{$key}{G3}; # ignore sub-documents
+                next if $$et{TAG_EXTRA}{$key}{G3}; # ignore sub-documents
                 # fill in %val lookup with values based on tag ID
                 my $tag = $$et{TAG_INFO}{$key}{TagID};
                 $val{$tag} = $$et{VALUE}{$key};

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;
     }
@@ -1290,67 +1291,29 @@ sub SetNewValuesFromFile($$;@)
         # ! DON'T FORGET!!  Must consider each new   !
         # ! option to decide how it is handled here. !
         # +------------------------------------------+
+        foreach (qw(ByteUnit Charset CharsetEXIF CharsetFileName CharsetID3 CharsetIPTC
+                    CharsetPhotoshop Composite DateFormat Debug EncodeHangs Escape ExtendedXMP
+                    ExtractEmbedded FastScan Filter FixBase Geolocation GeolocAltNames
+                    GeolocFeature GeolocMinPop GeolocMaxDist GlobalTimeShift HexTagIDs
+                    IgnoreGroups IgnoreMinorErrors IgnoreTags ImageHashType Lang
+                    LargeFileSupport ListItem ListSep MDItemTags MissingTagValue NoPDFList
+                    NoWarning Password PrintConv QuickTimeUTC RequestTags SaveFormat SavePath
+                    ScanForXMP StructFormat SystemTags TimeZone Unknown UserParam Validate
+                    WindowsLongPath WindowsWideFile XAttrTags XMPAutoConv))
+        {
+            $srcExifTool->Options($_ => $$options{$_});
+        }
         $srcExifTool->Options(
             Binary          => 1,
-            ByteUnit        => $$options{ByteUnit},
-            Charset         => $$options{Charset},
-            CharsetEXIF     => $$options{CharsetEXIF},
-            CharsetFileName => $$options{CharsetFileName},
-            CharsetID3      => $$options{CharsetID3},
-            CharsetIPTC     => $$options{CharsetIPTC},
-            CharsetPhotoshop=> $$options{CharsetPhotoshop},
-            Composite       => $$options{Composite},
             CoordFormat     => $$options{CoordFormat} || '%d %d %.8f', # copy coordinates at high resolution unless otherwise specified
-            DateFormat      => $$options{DateFormat},
             Duplicates      => 1,
-            Escape          => $$options{Escape},
           # Exclude (set below)
-            ExtendedXMP     => $$options{ExtendedXMP},
-            ExtractEmbedded => $$options{ExtractEmbedded},
-            FastScan        => $$options{FastScan},
-            Filter          => $$options{Filter},
-            FixBase         => $$options{FixBase},
-            Geolocation     => $$options{Geolocation},
-            GeolocAltNames  => $$options{GeolocAltNames},
-            GeolocFeature   => $$options{GeolocFeature},
-            GeolocMinPop    => $$options{GeolocMinPop},
-            GeolocMaxDist   => $$options{GeolocMaxDist},
-            GlobalTimeShift => $$options{GlobalTimeShift},
-            HexTagIDs       => $$options{HexTagIDs},
-            IgnoreGroups    => $$options{IgnoreGroups},
-            IgnoreMinorErrors=>$$options{IgnoreMinorErrors},
-            IgnoreTags      => $$options{IgnoreTags},
-            ImageHashType   => $$options{ImageHashType},
-            Lang            => $$options{Lang},
-            LargeFileSupport=> $$options{LargeFileSupport},
             LimitLongValues => 10000000, # (10 MB)
             List            => 1,
-            ListItem        => $$options{ListItem},
-            ListSep         => $$options{ListSep},
             MakerNotes      => $$options{FastScan} && $$options{FastScan} > 1 ? undef : 1,
-            MDItemTags      => $$options{MDItemTags},
-            MissingTagValue => $$options{MissingTagValue},
-            NoPDFList       => $$options{NoPDFList},
-            NoWarning       => $$options{NoWarning},
-            Password        => $$options{Password},
-            PrintConv       => $$options{PrintConv},
-            QuickTimeUTC    => $$options{QuickTimeUTC},
             RequestAll      => $$options{RequestAll} || 1, # (is this still necessary now that RequestTags are being set?)
-            RequestTags     => $$options{RequestTags},
-            SaveFormat      => $$options{SaveFormat},
-            SavePath        => $$options{SavePath},
-            ScanForXMP      => $$options{ScanForXMP},
             StrictDate      => defined $$options{StrictDate} ? $$options{StrictDate} : 1,
             Struct          => $structOpt,
-            StructFormat    => $$options{StructFormat},
-            SystemTags      => $$options{SystemTags},
-            TimeZone        => $$options{TimeZone},
-            Unknown         => $$options{Unknown},
-            UserParam       => $$options{UserParam},
-            Validate        => $$options{Validate},
-            WindowsWideFile => $$options{WindowsWideFile},
-            XAttrTags       => $$options{XAttrTags},
-            XMPAutoConv     => $$options{XMPAutoConv},
         );
         # reset Geolocation option if we aren't copying any geolocation tags
         if ($$options{Geolocation} and not grep /\bGeolocation/i, @setTags) {
@@ -1389,8 +1352,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
 #
@@ -2367,9 +2338,13 @@ sub WriteInfo($$;$$)
         } elsif (UNIVERSAL::isa($inRef,'File::RandomAccess')) {
             $inRef->Seek(0);
             $raf = $inRef;
-        } elsif ($] >= 5.006 and (eval { require Encode; Encode::is_utf8($$inRef) } or $@)) {
+        } elsif ($] >= 5.006 and ($$self{OPTIONS}{EncodeHangs} or
+            eval { require Encode; Encode::is_utf8($$inRef) } or $@))
+        {
+            local $SIG{'__WARN__'} = \&SetWarning;
             # convert image data from UTF-8 to character stream if necessary
-            my $buff = $@ ? pack('C*',unpack($] < 5.010000 ? 'U0C*' : 'C0C*',$$inRef)) : Encode::encode('utf8',$$inRef);
+            my $buff = ($$self{OPTIONS}{EncodeHangs} or $@) ? pack('C*', unpack($] < 5.010000 ?
+                       'U0C*' : 'C0C*', $$inRef)) : Encode::encode('utf8', $$inRef);
             if (defined $outfile) {
                 $inRef = \$buff;
             } else {
@@ -2942,10 +2917,15 @@ sub Sanitize($$)
     $$valPt = $$$valPt if ref $$valPt eq 'SCALAR';
     # make sure the Perl UTF-8 flag is OFF for the value if perl 5.6 or greater
     # (otherwise our byte manipulations get corrupted!!)
-    if ($] >= 5.006 and (eval { require Encode; Encode::is_utf8($$valPt) } or $@)) {
+    # NOTE: Don't use Encode on Windows becase "require Encode" on Windows hangs if cwd is a long path name!!
+    if ($] >= 5.006 and ($$self{OPTIONS}{EncodeHangs} or
+        eval { require Encode; Encode::is_utf8($$valPt) } or $@))
+    {
+        # (SIG handling was added in 10.39.  Not sure why, but I've added this to other similar code for 13.02)
         local $SIG{'__WARN__'} = \&SetWarning;
         # repack by hand if Encode isn't available
-        $$valPt = $@ ? pack('C*',unpack($] < 5.010000 ? 'U0C*' : 'C0C*',$$valPt)) : Encode::encode('utf8',$$valPt);
+        $$valPt = ($$self{OPTIONS}{EncodeHangs} or $@) ? pack('C*', unpack($] < 5.010000 ?
+                   'U0C*' : 'C0C*', $$valPt)) : Encode::encode('utf8', $$valPt);
     }
     # un-escape value if necessary
     if ($$self{OPTIONS}{Escape}) {
@@ -3286,7 +3266,7 @@ sub InsertTagValues($$;$$$$)
                     my @matches = grep /^$tag(\s|$)/i, @$foundTags;
                     @matches = $self->GroupMatches($group, \@matches) if defined $group;
                     foreach (@matches) {
-                        my $doc = $$ex{$_} ? $$ex{$_}{G3} || 0 : 0;
+                        my $doc = $$ex{$_}{G3} || 0;
                         if (defined $$cacheTag[$doc]) {
                             next unless $$cacheTag[$doc] =~ / \((\d+)\)$/;
                             my $cur = $1;
@@ -3896,6 +3876,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 +4004,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) = @_;