exiftool_vendored 12.82.0 → 12.83.0

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.67';
+$VERSION = '3.68';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -164,9 +164,11 @@ sub PrintInvLensSpec($;$$);
     32877 => 'Sony E 15mm F1.4 G', #JR
     32878 => 'Sony FE 20-70mm F4 G', #JR
     32879 => 'Sony FE 50mm F1.4 GM', #JR
+    32881 => 'Sony FE 24-50mm F2.8 G', #JR
+    32882 => 'Sony FE 16-25mm F2.8 G', #JR
     32884 => 'Sony FE 70-200mm F4 Macro G OSS II', #JR
     32885 => 'Sony FE 16-35mm F2.8 GM II', #JR
-    32886 => 'Sony FE 300mm F2.8 OSS', #JR
+    32886 => 'Sony FE 300mm F2.8 GM OSS', #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)
@@ -187,6 +189,8 @@ sub PrintInvLensSpec($;$$);
     33086 => 'Sony FE 70-200mm F2.8 GM OSS II + 2X Teleconverter', #JR
     33087 => 'Sony FE 70-200mm F4 Macro G OSS II + 1.4X Teleconverter', #JR
     33088 => 'Sony FE 70-200mm F4 Macro G OSS II + 2X Teleconverter', #JR
+    33089 => 'Sony FE 300mm F2.8 GM OSS + 1.4X Teleconverter', #JR (NC)
+    33090 => 'Sony FE 300mm F2.8 GM OSS + 2X Teleconverter', #JR
 
     49201 => 'Zeiss Touit 12mm F2.8', #JR (lens firmware Ver.02)
     49202 => 'Zeiss Touit 32mm F1.8', #JR (lens firmware Ver.02)
@@ -234,6 +238,7 @@ sub PrintInvLensSpec($;$$);
     49474.7 => 'Viltrox 35mm F1.8 FE', #JR
     49474.8 => 'Viltrox 50mm F1.8 FE', #JR
     49474.9 => 'Viltrox 75mm F1.2 E', #JR
+   '49474.10' => 'Viltrox 20mm F2.8 FE', #JR
 
     49712 => 'Tokina FiRIN 20mm F2 FE AF',       # (firmware Ver.01)
     49713 => 'Tokina FiRIN 100mm F2.8 FE MACRO', # (firmware Ver.01)
@@ -287,7 +292,9 @@ sub PrintInvLensSpec($;$$);
     50540 => 'Sigma 14mm F1.4 DG DN | A', #JR (023)
     50543 => 'Sigma 70-200mm F2.8 DG DN OS | S', #JR (023)
     50544 => 'Sigma 23mm F1.4 DC DN | C', #JR (023)
+    50546 => 'Sigma 500mm F5.6 DG DN OS | S', #JR (024)
     50547 => 'Sigma 10-18mm F2.8 DC DN | C', #JR (023)
+    50548 => 'Sigma 15mm F1.4 DG DN DIAGONAL FISHEYE | A', #JR (024)
 
     50992 => 'Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III', #JR
     50993 => 'Voigtlander HELIAR-HYPER WIDE 10mm F5.6', #IB
@@ -2031,6 +2038,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
             '4 0 0 0' => 'ARW 4.0', # (ILCE-7SM3)
             '4 0 1 0' => 'ARW 4.0.1', #github#195 (ZV-E1)
             '5 0 0 0' => 'ARW 5.0', # (ILCE-9M3)
+            '5 0 1 0' => 'ARW 5.0.1', # (ILCE-1 with FirmWare 2.0)
             # what about cRAW images?
         },
     },
@@ -8515,16 +8523,17 @@ my %isoSetting2010 = (
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     DATAMEMBER => [ 0 ],
-    IS_SUBDIR => [ 0x03e2, 0x03f4, 0x044e, 0x0498, 0x049d, 0x04a1, 0x04a2, 0x04ba, 0x059d, 0x0634, 0x0636, 0x064c, 0x0653, 0x0678, 0x06b8, 0x06de, 0x06e7 ],
+    IS_SUBDIR => [ 0x03e2, 0x03f4, 0x044e, 0x0498, 0x049d, 0x049e, 0x04a1, 0x04a2, 0x04ba, 0x059d, 0x0634, 0x0636, 0x064c, 0x0653, 0x0678, 0x06b8, 0x06de, 0x06e7 ],
     0x0000 => { Name => 'Ver9401', Hidden => 1, RawConv => '$$self{Ver9401} = $val; $$self{OPTIONS}{Unknown}<2 ? undef : $val' },
 
     0x03e2 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 181',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x03f4 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 185',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x044e => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 178',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x0498 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 148',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
-    0x049d => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 167',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
-    0x04a1 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} =~ /^(160|164)/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
-    0x04a2 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} =~ /^(152|154|155)/ and $$self{Model} !~ /^ZV-1M2/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
+    0x049d => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 167 and $$self{Software} !~ /^ILCE-7M4 (v2|v3)/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
+    0x049e => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 167 and $$self{Software} =~ /^ILCE-7M4 (v2|v3)/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
+    0x04a1 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} =~ /^(160|164)/ and $$self{Software} !~ /^ILCE-1 v2/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
+    0x04a2 => { Name => 'ISOInfo', Condition => '($$self{Ver9401} =~ /^(152|154|155)/ and $$self{Model} !~ /^ZV-1M2/) or ($$self{Ver9401} == 164 and $$self{Software} =~ /^ILCE-1 v2/)', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x04ba => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 155 and $$self{Model} =~ /^ZV-1M2/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x059d => { Name => 'ISOInfo', Condition => '$$self{Ver9401} =~ /^(144|146)/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x0634 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 68',           Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },

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

@@ -2072,7 +2072,7 @@ my %tagLookup = (
 	'creditlinereq' => { 543 => 'CreditLineReq' },
 	'creditlinerequired' => { 334 => 'CreditLineRequired' },
 	'cropactive' => { 104 => 0x0, 111 => 0x244 },
-	'cropangle' => { 511 => 'CropAngle', 513 => 'CropAngle' },
+	'cropangle' => { 104 => 0x8, 511 => 'CropAngle', 513 => 'CropAngle' },
 	'croparea' => { 239 => 0x45, 486 => 0x9011 },
 	'cropaspectratio' => { 106 => 0x30101, 111 => 0x260 },
 	'cropaspectratiocustom' => { 106 => 0x30102 },
@@ -2112,7 +2112,7 @@ my %tagLookup = (
 	'croprightmargin' => { 55 => 0x1 },
 	'croprotatedoriginalheight' => { 104 => 0x2 },
 	'croprotatedoriginalwidth' => { 104 => 0x1 },
-	'croprotation' => { 104 => 0x8, 126 => 0xb },
+	'croprotation' => { 104 => 0x7, 126 => 0xb },
 	'cropscaledresolution' => { 292 => 0x9e },
 	'cropsize' => { 130 => 0x1053 },
 	'cropsourceresolution' => { 292 => 0xae },
@@ -3944,6 +3944,9 @@ my %tagLookup = (
 	'jpgfromrawstart' => { 122 => [0x111,0x201] },
 	'jpgrecordedpixels' => { 364 => '14.1' },
 	'jurisdiction' => { 509 => 'jurisdiction' },
+	'jxldecodespeed' => { 122 => 0xcd4b },
+	'jxldistance' => { 122 => 0xcd49 },
+	'jxleffort' => { 122 => 0xcd4a },
 	'keepexposure' => { 320 => 0x237, 321 => 0x237, 322 => 0x24f },
 	'kelvinwb_01' => { 372 => 0x5 },
 	'kelvinwb_02' => { 372 => 0x9 },
@@ -4877,6 +4880,9 @@ my %tagLookup = (
 	'mood' => { 182 => 'WM/Mood' },
 	'moonphase' => { 409 => 0x12, 410 => 0x43, 411 => 0x4c },
 	'morepermissions' => { 509 => 'morePermissions' },
+	'motionphoto' => { 494 => 'MotionPhoto' },
+	'motionphotopresentationtimestampus' => { 494 => 'MotionPhotoPresentationTimestampUs' },
+	'motionphotoversion' => { 494 => 'MotionPhotoVersion' },
 	'motionphotovideo' => { 403 => 'mpvd' },
 	'motionsensitivity' => { 409 => 0x29, 411 => 0x60 },
 	'movementcount' => { 400 => "\xa9mvc" },
@@ -5743,7 +5749,7 @@ my %tagLookup = (
 	'previewcroptop' => { 394 => 0xed },
 	'previewdate' => { 406 => 0x0 },
 	'previewdatetime' => { 122 => 0xc71b },
-	'previewimage' => { 116 => 0x2000, 117 => 'Exif-PreviewImage', 123 => 'PreviewImage', 125 => 0x4, 169 => 'data', 189 => 0x81, 329 => 0x280, 346 => 0x300, 408 => 'mcvr', 449 => 0x2001 },
+	'previewimage' => { 116 => 0x2000, 117 => 'Exif-PreviewImage', 123 => 'PreviewImage', 125 => 0x4, 169 => 'data', 189 => 0x81, 329 => 0x280, 346 => 0x300, 400 => 'snal', 408 => 'mcvr', 449 => 0x2001 },
 	'previewimageborders' => { 383 => 0x3e },
 	'previewimageheight' => { 75 => 0x4, 145 => 0xfa58 },
 	'previewimagelength' => { 75 => 0x2, 116 => 0x3, 122 => [0x117,0x202], 189 => 0x89, 259 => 0x202, 324 => 0x102, 329 => 0x1037, 383 => 0x3, 414 => 0x1e, 419 => 0x3, 425 => [0x1b,0x1d], 438 => 0x202 },
@@ -6255,7 +6261,7 @@ my %tagLookup = (
 	'rflenstype' => { 59 => 0x3d },
 	'rgbcurvelimits' => { 111 => 0x238 },
 	'rgbcurvepoints' => { 110 => 0x7, 111 => 0x20e },
-	'rgbtables' => { 122 => 0xcd3b },
+	'rgbtables' => { 122 => 0xcd3f },
 	'richtextcomment' => { 520 => 'RichTextComment' },
 	'ricohdate' => { 414 => 0x6 },
 	'ricohimageheight' => { 414 => 0x2 },
@@ -6858,7 +6864,7 @@ my %tagLookup = (
 	'thumbnailfilename' => { 100 => 0x817 },
 	'thumbnailformat' => { 538 => [\'Thumbnails','ThumbnailsFormat'] },
 	'thumbnailheight' => { 145 => 0xfa55, 538 => [\'Thumbnails','ThumbnailsHeight'] },
-	'thumbnailimage' => { 6 => 'CNDA', 100 => 0x2008, 117 => 'Exif-ThumbnailImage', 125 => 0x3, 170 => 'data', 329 => 0x100, 408 => 'thmb', 538 => [\'Thumbnails','ThumbnailsImage'] },
+	'thumbnailimage' => { 6 => 'CNDA', 100 => 0x2008, 117 => 'Exif-ThumbnailImage', 125 => 0x3, 170 => 'data', 329 => 0x100, 400 => 'tnal', 408 => 'thmb', 538 => [\'Thumbnails','ThumbnailsImage'] },
 	'thumbnailimagename' => { 170 => '1Name' },
 	'thumbnailimagesize' => { 170 => 'ImageSize' },
 	'thumbnailimagetype' => { 170 => '0Type' },

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 27840 tags, with 17432 unique tag names.
+They contain a total of 27849 tags, with 17438 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
@@ -1042,7 +1042,7 @@ for the official EXIF 2.32 specification.
   0xcd38   MaskSubArea               SubIFD     no
   0xcd39   ProfileHueSatMapData3     IFD0       float[n]!
   0xcd3a   ReductionMatrix3          IFD0       rational64s[n]!
-  0xcd3b   RGBTables                 IFD0       undef!
+  0xcd3f   RGBTables                 IFD0       undef!
   0xcd40   ProfileGainTableMap2      IFD0       undef!
   0xcd41   JUMBF                     -          Jpeg2000
   0xcd43   ColumnInterleaveFactor    SubIFD     int32u!
@@ -1050,6 +1050,9 @@ for the official EXIF 2.32 specification.
   0xcd46   ImageStats                IFD0       undef!
   0xcd47   ProfileDynamicRange       IFD0       DNG ProfileDynamicRange
   0xcd48   ProfileGroupName          IFD0       string!
+  0xcd49   JXLDistance               IFD0       float
+  0xcd4a   JXLEffort                 IFD0       int32u
+  0xcd4b   JXLDecodeSpeed            IFD0       int32u
   0xea1c   Padding                   ExifIFD    undef!
   0xea1d   OffsetSchema              ExifIFD    int32s!
   0xfde8   OwnerName                 ExifIFD    string/
@@ -4797,6 +4800,9 @@ These tags belong to the ExifTool XMP-GCamera family 1 group.
   MicroVideoOffset                              integer
   MicroVideoPresentationTimestampUs             integer
   MicroVideoVersion                             integer
+  MotionPhoto                                   integer
+  MotionPhotoPresentationTimestampUs            integer
+  MotionPhotoVersion                            integer
   PortraitNote                                  string
   PortraitRequest                               string
   PortraitVersion                               string
@@ -12402,7 +12408,8 @@ below by a decimal appended to the tag ID (.0, .1 or .2).
       4    CropY                                int32s
       5    CropWidth                            int32s
       6    CropHeight                           int32s
-      8    CropRotation                         double
+      7    CropRotation                         int32s
+      8    CropAngle                            double
      10    CropOriginalWidth                    int32s
      11    CropOriginalHeight                   int32s
 
@@ -22520,6 +22527,7 @@ WX350/WX500, ILCE-1/7/7C/7R/7S/7M2/7M3/7RM2/7RM3/7RM4/7SM2/7SM3/9/9M2/5000/
    1102    ISOInfo                              Sony ISOInfo
    1176    ISOInfo                              Sony ISOInfo
    1181    ISOInfo                              Sony ISOInfo
+   1182    ISOInfo                              Sony ISOInfo
    1185    ISOInfo                              Sony ISOInfo
    1186    ISOInfo                              Sony ISOInfo
    1210    ISOInfo                              Sony ISOInfo
@@ -29978,6 +29986,7 @@ QuickTimeHandler option may be set to 0 to avoid this.
   'sdes'       StoreDescription                 string
   'sfID'       AppleStoreCountry                int32s
   'shwm'       ShowMovement                     int8s
+  'snal'       PreviewImage                     string
   'soaa'       SortAlbumArtist                  string
   'soal'       SortAlbum                        string
   'soar'       SortArtist                       string
@@ -29987,6 +29996,7 @@ QuickTimeHandler option may be set to 0 to avoid this.
   'stik'       MediaType                        int8s
   'titl'       Title                            string/
   'tmpo'       BeatsPerMinute                   int16s
+  'tnal'       ThumbnailImage                   string
   'trkn'       TrackNumber                      undef
   'tven'       TVEpisodeID                      string
   'tves'       TVEpisode                        int32s
@@ -31674,7 +31684,10 @@ Camero.
 
 Use the API PrintCSV option to output all timed
 PDR data in CSV format at greatly increased speed and with much lower memory
-usage.
+usage.  This option prints the numerical values for each channel in CSV
+format, suitable for import into RaceRender.  In this output, the gear
+numbers for Neutral and Reverse are changed to -1 and -100 respectively for
+compatibility with RaceRender.
 
 =head3 GM marl Tags
 

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

@@ -168,7 +168,8 @@ sub ConvInvISO6709($)
         # requires at least 3 digits after the decimal point
         # (and as of Apr 2021, Google Photos doesn't accept coordinats
         #  with more than 5 digits after the decimal place:
-        #  https://exiftool.org/forum/index.php?topic=11055.msg67171#msg67171 )
+        #  https://exiftool.org/forum/index.php?topic=11055.msg67171#msg67171 
+        #  still a problem Apr 2024: https://exiftool.org/forum/index.php?msg=85761)
         my @fmt = ('%s%02d.%s%s','%s%03d.%s%s','%s%d.%s%s');
         my @limit = (90,180);
         foreach (@a) {

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

@@ -1234,7 +1234,8 @@ WriteAlso:
 
 #------------------------------------------------------------------------------
 # set new values from information in specified file
-# Inputs: 0) ExifTool object reference, 1) source file name or reference, etc
+# Inputs: 0) ExifTool object reference, 1) source file name or reference, etc,
+#         or ExifTool ref to use already-extracted tags from an ExifTool object,
 #         2-N) List of tags to set (or all if none specified), or reference(s) to
 #         hash for options to pass to SetNewValue.  The Replace option defaults
 #         to 1 for SetNewValuesFromFile -- set this to 0 to allow multiple tags
@@ -1245,11 +1246,12 @@ WriteAlso:
 #        be used to represent all tags in a group.  An optional destination tag
 #        may be specified with '>DSTTAG' ('DSTTAG<TAG' also works, but in this
 #        case the source tag may also be an expression involving tag names).
+#        Simple assignments are also allowed: 'DSTTAG[#][+-][^]=[string]'
 sub SetNewValuesFromFile($$;@)
 {
     local $_;
     my ($self, $srcFile, @setTags) = @_;
-    my ($key, $tag, @exclude, @reqTags);
+    my ($srcExifTool, $key, $tag, @exclude, @reqTags, $info);
 
     # get initial SetNewValuesFromFile options
     my %opts = ( Replace => 1 );    # replace existing list items by default
@@ -1261,113 +1263,8 @@ sub SetNewValuesFromFile($$;@)
     }
     # expand shortcuts
     @setTags and ExpandShortcuts(\@setTags);
-    my $srcExifTool = Image::ExifTool->new;
-    # set flag to indicate we are being called from inside SetNewValuesFromFile()
-    $$srcExifTool{TAGS_FROM_FILE} = 1;
-    # synchronize and increment the file sequence number
-    $$srcExifTool{FILE_SEQUENCE} = $$self{FILE_SEQUENCE}++;
     # set options for our extraction tool
     my $options = $$self{OPTIONS};
-    # copy both structured and flattened tags by default (but flattened tags are "unsafe")
-    my $structOpt = defined $$options{Struct} ? $$options{Struct} : 2;
-    # copy structures only if no tags specified (since flattened tags are "unsafe")
-    $structOpt = 1 if $structOpt eq '2' and not @setTags;
-    # +------------------------------------------+
-    # ! DON'T FORGET!!  Must consider each new   !
-    # ! option to decide how it is handled here. !
-    # +------------------------------------------+
-    $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},
-        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) {
-        $self->VPrint(0, '(resetting unnecessary Geolocation option)');
-        $$srcExifTool{OPTIONS}{Geolocation} = undef;
-    }
-    $$srcExifTool{GLOBAL_TIME_OFFSET} = $$self{GLOBAL_TIME_OFFSET};
-    $$srcExifTool{ALT_EXIFTOOL} = $$self{ALT_EXIFTOOL};
-    foreach $tag (@setTags) {
-        next if ref $tag;
-        if ($tag =~ /^-(.*)/) {
-            # avoid extracting tags that are excluded
-            push @exclude, $1;
-            next;
-        }
-        # add specified tags to list of requested tags
-        $_ = $tag;
-        if (/(.+?)\s*(>|<)\s*(.+)/) {
-            if ($2 eq '>') {
-                $_ = $1;
-            } else {
-                $_ = $3;
-                /\$/ and push(@reqTags, /\$\{?(?:[-\w]+:)*([-\w?*]+)/g), next;
-            }
-        }
-        push @reqTags, $2 if /(^|:)([-\w?*]+)#?$/;
-    }
-    if (@exclude) {
-        ExpandShortcuts(\@exclude, 1);
-        $srcExifTool->Options(Exclude => \@exclude);
-    }
-    $srcExifTool->Options(RequestTags => \@reqTags) if @reqTags;
     my $printConv = $$options{PrintConv};
     if ($opts{Type}) {
         # save source type separately because it may be different than dst Type
@@ -1377,9 +1274,120 @@ sub SetNewValuesFromFile($$;@)
         $srcExifTool->Options(PrintConv => $printConv);
     }
     my $srcType = $printConv ? 'PrintConv' : 'ValueConv';
+    my $structOpt = defined $$options{Struct} ? $$options{Struct} : 2;
 
-    # get all tags from source file (including MakerNotes block)
-    my $info = $srcExifTool->ImageInfo($srcFile);
+    if (ref $srcFile and UNIVERSAL::isa($srcFile,'Image::ExifTool')) {
+        $srcExifTool = $srcFile;
+        $info = $srcExifTool->GetInfo();
+    } else {
+        $srcExifTool = Image::ExifTool->new;
+        # set flag to indicate we are being called from inside SetNewValuesFromFile()
+        $$srcExifTool{TAGS_FROM_FILE} = 1;
+        # synchronize and increment the file sequence number
+        $$srcExifTool{FILE_SEQUENCE} = $$self{FILE_SEQUENCE}++;
+        # copy both structured and flattened tags by default (but flattened tags are "unsafe")
+        # copy structures only if no tags specified (since flattened tags are "unsafe")
+        $structOpt = 1 if $structOpt eq '2' and not @setTags;
+        # +------------------------------------------+
+        # ! DON'T FORGET!!  Must consider each new   !
+        # ! option to decide how it is handled here. !
+        # +------------------------------------------+
+        $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) {
+            $self->VPrint(0, '(resetting unnecessary Geolocation option)');
+            $$srcExifTool{OPTIONS}{Geolocation} = undef;
+        }
+        $$srcExifTool{GLOBAL_TIME_OFFSET} = $$self{GLOBAL_TIME_OFFSET};
+        $$srcExifTool{ALT_EXIFTOOL} = $$self{ALT_EXIFTOOL};
+        foreach $tag (@setTags) {
+            next if ref $tag;
+            if ($tag =~ /^-(.*)/) {
+                # avoid extracting tags that are excluded
+                push @exclude, $1;
+                next;
+            }
+            # add specified tags to list of requested tags
+            $_ = $tag;
+            if (/(.+?)\s*(>|<)\s*(.+)/) {
+                if ($2 eq '>') {
+                    $_ = $1;
+                } else {
+                    $_ = $3;
+                    /\$/ and push(@reqTags, /\$\{?(?:[-\w]+:)*([-\w?*]+)/g), next;
+                }
+            }
+            push @reqTags, $2 if /(^|:)([-\w?*]+)#?$/;
+        }
+        if (@exclude) {
+            ExpandShortcuts(\@exclude, 1);
+            $srcExifTool->Options(Exclude => \@exclude);
+        }
+        $srcExifTool->Options(RequestTags => \@reqTags) if @reqTags;
+        # get all tags from source file (including MakerNotes block)
+        $info = $srcExifTool->ImageInfo($srcFile);
+    }
     return $info if $$info{Error} and $$info{Error} eq 'Error opening file';
     delete $$srcExifTool{VALUE}{Error}; # delete so we can check this later
 
@@ -1414,6 +1422,7 @@ sub SetNewValuesFromFile($$;@)
 #
     # 1) loop through input list of tags to set, and build @setList
     my (@setList, $set, %setMatches, $t, %altFiles);
+    my $assign = 0;
     foreach $t (@setTags) {
         if (ref $t eq 'HASH') {
             # update current options
@@ -1428,18 +1437,22 @@ sub SetNewValuesFromFile($$;@)
         $tag = lc $t;   # change tag/group names to all lower case
         my (@fg, $grp, $dst, $dstGrp, $dstTag, $isExclude);
         # handle redirection to another tag
-        if ($tag =~ /(.+?)\s*(>|<)\s*(.+)/) {
+        if ($tag =~ /(.+?)\s*(>|<|=)(\s*)(.*)/) {
             $dstGrp = '';
-            my $opt;
+            my ($opt, $op, $spc);
             if ($2 eq '>') {
-                ($tag, $dstTag) = ($1, $3);
+                ($tag, $dstTag) = ($1, $4);
                 # flag add and delete (eg. '+<' and '-<') redirections
                 $opt = $1 if $tag =~ s/\s*([-+])$// or $dstTag =~ s/^([-+])\s*//;
             } else {
-                ($tag, $dstTag) = ($3, $1);
+                ($dstTag, $op, $spc, $tag) = ($1, $2, $3, $4);
                 $opt = $1 if $dstTag =~ s/\s*([-+])$//;
-                # handle expressions
-                if ($tag =~ /\$/) {
+                if ($op eq '=') {
+                    # simple assignment ($tag will be the new value)
+                    $tag = $spc . $tag;
+                    undef $tag unless $dstTag =~ s/\^$// or length $tag;
+                    $$opts{ASSIGN} = ++$assign;
+                } elsif ($tag =~ /\$/) {    # handle expressions
                     $tag = $t;  # restore original case
                     # recover leading whitespace (except for initial single space)
                     $tag =~ s/(.+?)\s*(>|<) ?//;
@@ -1452,7 +1465,7 @@ sub SetNewValuesFromFile($$;@)
             }
             $$opts{Replace} = 0 if $dstTag =~ s/^\+//;
             # validate tag name(s)
-            unless ($$opts{EXPR} or ValidTagName($tag)) {
+            unless ($$opts{EXPR} or $$opts{ASSIGN} or ValidTagName($tag)) {
                 $self->Warn("Invalid tag name '${tag}'. Use '=' not '<' to assign a tag value");
                 next;
             }
@@ -1470,7 +1483,7 @@ sub SetNewValuesFromFile($$;@)
         } else {
             $$opts{Replace} = 0 if $tag =~ s/^\+//;
         }
-        unless ($$opts{EXPR}) {
+        unless ($$opts{EXPR} or $$opts{ASSIGN}) {
             $isExclude = ($tag =~ s/^-//);
             if ($tag =~ /(.*):(.+)/) {
                 ($grp, $tag) = ($1, $2);
@@ -1540,6 +1553,8 @@ sub SetNewValuesFromFile($$;@)
     foreach $set (@setList) {
         $$set[2] and $setMatches{$set} = [ ];
     }
+    # no need to search source tags if doing only assignments
+    undef @tags if $assign == @setList;
     # 3) loop through all tags in source image and save tags matching each setTag
     my (%rtnInfo, $isAlt);
     foreach $tag (@tags) {
@@ -1592,21 +1607,26 @@ SET:    foreach $set (@setList) {
         # get options for SetNewValue
         my $opts = $$set[3];
         # handle expressions
-        if ($$opts{EXPR}) {
-            my $val = $srcExifTool->InsertTagValues($$set[1], \@tags, 'Error');
-            my $err = $$srcExifTool{VALUE}{Error};
-            if ($err) {
-                # pass on any error as a warning unless it is suppressed
-                my $noWarn = $$srcExifTool{OPTIONS}{NoWarning};
-                unless ($noWarn and (eval { $err =~ /$noWarn/ } or
-                    # (also apply expression to warning without "[minor] " prefix)
-                    ($err =~ s/^\[minor\] //i and eval { $err =~ /$noWarn/ })))
-                {
-                    $tag = NextFreeTagKey(\%rtnInfo, 'Warning');
-                    $rtnInfo{$tag} = $$srcExifTool{VALUE}{Error};
+        if ($$opts{EXPR} or $$opts{ASSIGN}) {
+            my $val;
+            if ($$opts{EXPR}) {
+                $val = $srcExifTool->InsertTagValues($$set[1], \@tags, 'Error');
+                my $err = $$srcExifTool{VALUE}{Error};
+                if ($err) {
+                    # pass on any error as a warning unless it is suppressed
+                    my $noWarn = $$srcExifTool{OPTIONS}{NoWarning};
+                    unless ($noWarn and (eval { $err =~ /$noWarn/ } or
+                        # (also apply expression to warning without "[minor] " prefix)
+                        ($err =~ s/^\[minor\] //i and eval { $err =~ /$noWarn/ })))
+                    {
+                        $tag = NextFreeTagKey(\%rtnInfo, 'Warning');
+                        $rtnInfo{$tag} = $$srcExifTool{VALUE}{Error};
+                    }
+                    delete $$srcExifTool{VALUE}{Error};
+                    next unless defined $val;
                 }
-                delete $$srcExifTool{VALUE}{Error};
-                next unless defined $val;
+            } else {
+                $val = $$set[1];
             }
             my ($dstGrp, $dstTag) = @{$$set[2]};
             $$opts{Protected} = 1 unless $dstTag =~ /[?*]/ and $dstTag ne '*';
@@ -3454,6 +3474,18 @@ sub NoDups
     $_ = ($_[0] and $new eq $_) ? undef : $new;
 }
 
+#------------------------------------------------------------------------------
+# Utility routine to set in $_ image from current object
+# Inputs: 0-N) list of tags to copy
+# Notes: - for use only in advanced formatting expressions
+sub SetTags(@)
+{
+    my $self = $advFmtSelf;
+    my $et = Image::ExifTool->new;
+    $et->SetNewValuesFromFile($self, @_);
+    $et->WriteInfo(\$_);
+}
+
 #------------------------------------------------------------------------------
 # Is specified tag writable
 # Inputs: 0) tag name, case insensitive (optional group name currently ignored)

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

@@ -1941,6 +1941,9 @@ my %sACDSeeRegionStruct = (
         ValueConv => 'Image::ExifTool::XMP::DecodeBase64($val)',
         ValueConvInv => 'Image::ExifTool::XMP::EncodeBase64($val)',
     },
+    MotionPhoto        => { Writable => 'integer' },
+    MotionPhotoVersion => { Writable => 'integer' },
+    MotionPhotoPresentationTimestampUs => { Writable => 'integer' },
 );
 
 # Google creations namespace (ref PH)