exiftool_vendored 13.57.1 → 13.59.0

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 33465 tags, with 21435 unique tag names.
+They contain a total of 33487 tags, with 21437 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
@@ -9628,18 +9628,18 @@ These tags are used by the EOS R3, R7, R50 and R6mkII
     169    ColorTempUnknown10?                  int16s
     170    WB_RGGBLevelsUnknown11?              int16s[4]
     174    ColorTempUnknown11?                  int16s
-    175    WB_RGGBLevelsUnknown11?              int16s[4]
-    179    ColorTempUnknown11?                  int16s
-    180    WB_RGGBLevelsUnknown12?              int16s[4]
-    184    ColorTempUnknown12?                  int16s
-    185    WB_RGGBLevelsUnknown13?              int16s[4]
-    189    ColorTempUnknown13?                  int16s
-    190    WB_RGGBLevelsUnknown14?              int16s[4]
-    194    ColorTempUnknown14?                  int16s
-    195    WB_RGGBLevelsUnknown15?              int16s[4]
-    199    ColorTempUnknown15?                  int16s
-    200    WB_RGGBLevelsUnknown16?              int16s[4]
-    204    ColorTempUnknown16?                  int16s
+    175    WB_RGGBLevelsUnknown12?              int16s[4]
+    179    ColorTempUnknown12?                  int16s
+    180    WB_RGGBLevelsUnknown13?              int16s[4]
+    184    ColorTempUnknown13?                  int16s
+    185    WB_RGGBLevelsUnknown14?              int16s[4]
+    189    ColorTempUnknown14?                  int16s
+    190    WB_RGGBLevelsUnknown15?              int16s[4]
+    194    ColorTempUnknown15?                  int16s
+    195    WB_RGGBLevelsUnknown16?              int16s[4]
+    199    ColorTempUnknown16?                  int16s
+    200    WB_RGGBLevelsUnknown17?              int16s[4]
+    204    ColorTempUnknown17?                  int16s
     205    WB_RGGBLevelsDaylight                int16s[4]
     209    ColorTempDaylight                    int16s
     210    WB_RGGBLevelsShade                   int16s[4]
@@ -9654,28 +9654,28 @@ These tags are used by the EOS R3, R7, R50 and R6mkII
     234    ColorTempKelvin                      int16s
     235    WB_RGGBLevelsFlash                   int16s[4]
     239    ColorTempFlash                       int16s
-    240    WB_RGGBLevelsUnknown17?              int16s[4]
-    244    ColorTempUnknown17?                  int16s
-    245    WB_RGGBLevelsUnknown18?              int16s[4]
-    249    ColorTempUnknown18?                  int16s
-    250    WB_RGGBLevelsUnknown19?              int16s[4]
-    254    ColorTempUnknown19?                  int16s
-    255    WB_RGGBLevelsUnknown20?              int16s[4]
-    259    ColorTempUnknown20?                  int16s
-    260    WB_RGGBLevelsUnknown21?              int16s[4]
-    264    ColorTempUnknown21?                  int16s
-    265    WB_RGGBLevelsUnknown22?              int16s[4]
-    269    ColorTempUnknown22?                  int16s
-    270    WB_RGGBLevelsUnknown23?              int16s[4]
-    274    ColorTempUnknown23?                  int16s
-    275    WB_RGGBLevelsUnknown24?              int16s[4]
-    279    ColorTempUnknown24?                  int16s
-    280    WB_RGGBLevelsUnknown25?              int16s[4]
-    284    ColorTempUnknown25?                  int16s
-    285    WB_RGGBLevelsUnknown26?              int16s[4]
-    289    ColorTempUnknown26?                  int16s
-    290    WB_RGGBLevelsUnknown27?              int16s[4]
-    294    ColorTempUnknown27?                  int16s
+    240    WB_RGGBLevelsUnknown18?              int16s[4]
+    244    ColorTempUnknown18?                  int16s
+    245    WB_RGGBLevelsUnknown19?              int16s[4]
+    249    ColorTempUnknown19?                  int16s
+    250    WB_RGGBLevelsUnknown20?              int16s[4]
+    254    ColorTempUnknown20?                  int16s
+    255    WB_RGGBLevelsUnknown21?              int16s[4]
+    259    ColorTempUnknown21?                  int16s
+    260    WB_RGGBLevelsUnknown22?              int16s[4]
+    264    ColorTempUnknown22?                  int16s
+    265    WB_RGGBLevelsUnknown23?              int16s[4]
+    269    ColorTempUnknown23?                  int16s
+    270    WB_RGGBLevelsUnknown24?              int16s[4]
+    274    ColorTempUnknown24?                  int16s
+    275    WB_RGGBLevelsUnknown25?              int16s[4]
+    279    ColorTempUnknown25?                  int16s
+    280    WB_RGGBLevelsUnknown26?              int16s[4]
+    284    ColorTempUnknown26?                  int16s
+    285    WB_RGGBLevelsUnknown27?              int16s[4]
+    289    ColorTempUnknown27?                  int16s
+    290    WB_RGGBLevelsUnknown28?              int16s[4]
+    294    ColorTempUnknown28?                  int16s
     300    ColorCalib?                          Canon ColorCalib
     363    PerChannelBlackLevel                 int16u[4]
     640    NormalWhiteLevel                     int16u
@@ -11157,6 +11157,7 @@ for a given protocol should be considered to have the default value of 0.
   'dvtm_AVATA2_1-1-10'      Model               no
   'dvtm_AVATA2_2-2-3-1'     SerialNumber2       no
   'dvtm_AVATA2_2-3'         FrameInfo           DJI FrameInfo
+  'dvtm_AVATA2_3-1-1'       FrameNumber         no
   'dvtm_AVATA2_3-1-2'       TimeStamp           no
   'dvtm_AVATA2_3-2-2-1'     ISO                 no
   'dvtm_AVATA2_3-2-4-1'     ShutterSpeed        no
@@ -11168,6 +11169,7 @@ for a given protocol should be considered to have the default value of 0.
   'dvtm_AVATA2_3-4-5-1'     RelativeAltitude    no
   'dvtm_Air3_1-1-5'         SerialNumber        no
   'dvtm_Air3_2-3'           FrameInfo           DJI FrameInfo
+  'dvtm_Air3_3-1-1'         FrameNumber         no
   'dvtm_Air3_3-1-2'         TimeStamp           no
   'dvtm_Air3_3-2-7-1'       ISO                 no
   'dvtm_Air3_3-2-10-1'      ShutterSpeed        no
@@ -11180,6 +11182,7 @@ for a given protocol should be considered to have the default value of 0.
   'dvtm_Air3_3-4-3'         GimbalInfo          DJI GimbalInfo
   'dvtm_Air3s_1-1-5'        SerialNumber        no
   'dvtm_Air3s_2-3'          FrameInfo           DJI FrameInfo
+  'dvtm_Air3s_3-1-1'        FrameNumber         no
   'dvtm_Air3s_3-1-2'        TimeStamp           no
   'dvtm_Air3s_3-2-7-1'      ISO                 no
   'dvtm_Air3s_3-2-10-1'     ShutterSpeed        no
@@ -11193,6 +11196,7 @@ for a given protocol should be considered to have the default value of 0.
   'dvtm_Mavic4_1-1-5'       SerialNumber        no
   'dvtm_Mavic4_1-1-10'      Model               no
   'dvtm_Mavic4_2-3'         FrameInfo           DJI FrameInfo
+  'dvtm_Mavic4_3-1-1'       FrameNumber         no
   'dvtm_Mavic4_3-1-2'       TimeStamp           no
   'dvtm_Mavic4_3-2-9-1'     ISO                 no
   'dvtm_Mavic4_3-2-10-1'    ShutterSpeed        no
@@ -11205,6 +11209,7 @@ for a given protocol should be considered to have the default value of 0.
   'dvtm_Mini4_Pro_1-1-5'    SerialNumber        no
   'dvtm_Mini4_Pro_1-1-10'   Model               no
   'dvtm_Mini4_Pro_2-3'      FrameInfo           DJI FrameInfo
+  'dvtm_Mini4_Pro_3-1-1'    FrameNumber         no
   'dvtm_Mini4_Pro_3-2-7-1'  ISO                 no
   'dvtm_Mini4_Pro_3-3-3'    DroneInfo           DJI DroneInfo
   'dvtm_Mini4_Pro_3-3-4-1'  GPSInfo             DJI GPSInfo
@@ -11213,6 +11218,7 @@ for a given protocol should be considered to have the default value of 0.
   'dvtm_Mini4_Pro_3-4-3'    GimbalInfo          DJI GimbalInfo
   'dvtm_Mini5Pro_1-1-5'     SerialNumber        no
   'dvtm_Mini5Pro_1-1-10'    Model               no
+  'dvtm_Mini5Pro_3-1-1'     FrameNumber         no
   'dvtm_Mini5Pro_3-2-37-1'  Temperature         no
   'dvtm_Mini5Pro_3-3-4-1'   GPSInfo             DJI GPSInfo
   'dvtm_Mini5Pro_3-3-4-2'   AbsoluteAltitude    no
@@ -11223,6 +11229,7 @@ for a given protocol should be considered to have the default value of 0.
   'dvtm_PP-101_1-1-5'       SerialNumber        no
   'dvtm_PP-101_1-1-10'      Model               no
   'dvtm_PP-101_2-3'         FrameInfo           DJI FrameInfo
+  'dvtm_PP-101_3-1-1'       FrameNumber         no
   'dvtm_PP-101_3-1-2'       TimeStamp           no
   'dvtm_PP-101_3-2-9-1'     ISO                 no
   'dvtm_PP-101_3-2-10-1'    ShutterSpeed        no
@@ -11230,7 +11237,8 @@ for a given protocol should be considered to have the default value of 0.
   'dvtm_ac203_1-1-5'        SerialNumber        no
   'dvtm_ac203_1-1-10'       Model               no
   'dvtm_ac203_2-3'          FrameInfo           DJI FrameInfo
-  'dvtm_ac203_3-2-2-1'      ISO                 no
+  'dvtm_ac203_3-1-1'        FrameNumber         no
+  'dvtm_ac203_3-2-3-1'      ISO                 no
   'dvtm_ac203_3-2-4-1'      ShutterSpeed        no
   'dvtm_ac203_3-2-6-1'      ColorTemperature    no
   'dvtm_ac203_3-2-10-2'     AccelerometerX      no
@@ -11242,6 +11250,8 @@ for a given protocol should be considered to have the default value of 0.
   'dvtm_ac204_1-1-5'        SerialNumber        no
   'dvtm_ac204_1-1-10'       Model               no
   'dvtm_ac204_2-3'          FrameInfo           DJI FrameInfo
+  'dvtm_ac204_3-1-1'        FrameNumber         no
+  'dvtm_ac204_3-2-3-1'      ISO                 no
   'dvtm_ac204_3-2-4-1'      ShutterSpeed        no
   'dvtm_ac204_3-2-6-1'      ColorTemperature    no
   'dvtm_ac204_3-2-10-2'     AccelerometerX      no
@@ -11253,6 +11263,8 @@ for a given protocol should be considered to have the default value of 0.
   'dvtm_ac206_1-1-5'        SerialNumber        no
   'dvtm_ac206_1-1-10'       Model               no
   'dvtm_ac206_2-3'          FrameInfo           DJI FrameInfo
+  'dvtm_ac206_3-1-1'        FrameNumber         no
+  'dvtm_ac206_3-2-3-1'      ISO                 no
   'dvtm_ac206_3-2-4-1'      ShutterSpeed        no
   'dvtm_ac206_3-2-6-1'      ColorTemperature    no
   'dvtm_ac206_3-2-10-2'     AccelerometerX      no
@@ -11265,6 +11277,7 @@ for a given protocol should be considered to have the default value of 0.
   'dvtm_dji_neo_1-1-10'     Model               no
   'dvtm_dji_neo_2-2-3-1'    SerialNumber2       no
   'dvtm_dji_neo_2-3'        FrameInfo           DJI FrameInfo
+  'dvtm_dji_neo_3-1-1'      FrameNumber         no
   'dvtm_dji_neo_3-1-2'      TimeStamp           no
   'dvtm_dji_neo_3-2-2-1'    ISO                 no
   'dvtm_dji_neo_3-2-4-1'    ShutterSpeed        no
@@ -11276,6 +11289,7 @@ for a given protocol should be considered to have the default value of 0.
   'dvtm_oq101_1-1-5'        SerialNumber        no
   'dvtm_oq101_1-1-10'       Model               no
   'dvtm_oq101_1-14-1'       FNumber             no
+  'dvtm_oq101_3-1-1'        FrameNumber         no
   'dvtm_oq101_3-1-2'        TimeStamp           no
   'dvtm_oq101_3-2-3-1'      ISO                 no
   'dvtm_oq101_3-2-4-1'      ShutterSpeed        no
@@ -11289,6 +11303,7 @@ for a given protocol should be considered to have the default value of 0.
   'dvtm_pm320_1-1-5'        SerialNumber        no
   'dvtm_pm320_1-1-10'       Model               no
   'dvtm_pm320_2-2'          FrameInfo           DJI FrameInfo
+  'dvtm_pm320_3-1-1'        FrameNumber         no
   'dvtm_pm320_3-2-2-1'      ISO                 no
   'dvtm_pm320_3-2-3-1'      ShutterSpeed        no
   'dvtm_pm320_3-2-4-1'      FNumber             no
@@ -11301,6 +11316,7 @@ for a given protocol should be considered to have the default value of 0.
   'dvtm_wa345e_1-1-5'       SerialNumber        no
   'dvtm_wa345e_1-1-10'      Model               no
   'dvtm_wa345e_2-2'         FrameInfo           DJI FrameInfo
+  'dvtm_wa345e_3-1-1'       FrameNumber         no
   'dvtm_wa345e_3-1-2'       TimeStamp           no
   'dvtm_wa345e_3-3-3'       DroneInfo           DJI DroneInfo
   'dvtm_wa345e_3-3-4-1'     GPSInfo             DJI GPSInfo
@@ -11311,6 +11327,7 @@ for a given protocol should be considered to have the default value of 0.
   'dvtm_wm261_1-1-5'        SerialNumber        no
   'dvtm_wm261_1-1-10'       Model               no
   'dvtm_wm261_2-3'          FrameInfo           DJI FrameInfo
+  'dvtm_wm261_3-1-1'        FrameNumber         no
   'dvtm_wm261_3-1-2'        TimeStamp           no
   'dvtm_wm261_3-2-9-1'      ISO                 no
   'dvtm_wm261_3-2-10-1'     ShutterSpeed        no
@@ -11324,6 +11341,7 @@ for a given protocol should be considered to have the default value of 0.
   'dvtm_wm265e_1-1-5'       SerialNumber        no
   'dvtm_wm265e_1-1-10'      Model               no
   'dvtm_wm265e_2-2'         FrameInfo           DJI FrameInfo
+  'dvtm_wm265e_3-1-1'       FrameNumber         no
   'dvtm_wm265e_3-2-2-1'     ISO                 no
   'dvtm_wm265e_3-2-3-1'     ShutterSpeed        no
   'dvtm_wm265e_3-2-6-1'     DigitalZoom         no
@@ -12001,7 +12019,7 @@ Tags extracted from the header of RAF images.
 
   Index1   Tag Name                             Writable
   ------   --------                             --------
-     60    RAFVersion                           no
+     60    FirmwareVersion                      no
     108    RAFCompression                       no
 
 =head3 FujiFilm RAF Tags
@@ -12032,6 +12050,7 @@ RAF-format information.
   0x2310  WB_GRGBLevelsWarmWhiteFluor           no
   0x2311  WB_GRGBLevelsLivingRoomWarmWhiteFluor no
   0x2400  WB_GRGBLevelsTungsten                 no
+  0x2410  WB_GRGBLevelsFlash                    no
   0x2ff0  WB_GRGBLevels                         no
   0x9200  RelativeExposure                      no
   0x9650  RawExposureBias                       no
@@ -20650,6 +20669,7 @@ These tags are used in Pentax/Asahi/Ricoh cameras.
   0x0095   SkinToneCorrection                   int8s[2]
            SkinToneCorrection                   int8s[3]
   0x0096   ClarityControl                       int8s[2]
+  0x009e   HDF                                  int8u
   0x0200   BlackPoint                           int16u[4]
   0x0201   WhitePoint                           int16u[4]
   0x0203   ColorMatrixA                         int16s[9]
@@ -23708,8 +23728,8 @@ Valid from July 2020 for ILCE-1/7SM3, ILME-FX3.
 
 =head3 Sony Tag9050d Tags
 
-Valid for ILCE-6700/7CM2/7CR/ZV-E1. Also for ILCE-1M2/7M5 when using mechanical
-shutter.
+Valid for ILCE-6700/7CM2/7CR/ZV-E1. Also for ILCE-1M2/7M5/7RM6 when using
+mechanical shutter.
 
   Index1   Tag Name                             Writable
   ------   --------                             --------
@@ -24125,8 +24145,8 @@ E-mount models.
 
 =head3 Sony Tag9416 Tags
 
-Valid for the ILCE-1/6700/7CM2/7CR/7M4/7M5/7RM5/7SM3/9M3, ILME-FX2/FX3/FX30,
-ZV-E1/E10M2, but ILCE-7M5 has different offsets.
+Valid for the ILCE-1/6700/7CM2/7CR/7M4/7M5/7RM5/7RM6/7SM3/9M3,
+ILME-FX2/FX3/FX30, ZV-E1/E10M2, but ILCE-7M5 has different offsets.
 
   Index1   Tag Name                             Writable
   ------   --------                             --------
@@ -24151,8 +24171,11 @@ ZV-E1/E10M2, but ILCE-7M5 has different offsets.
     115    MinFocalLength                       no
     117    MaxFocalLength                       no
    1794    VignettingCorrParams                 no
+   1800    VignettingCorrParams                 no
    1866    APS-CSizeCapture                     no
+   1871    APS-CSizeCapture                     no
    2107    ChromaticAberrationCorrParams        no
+   2115    ChromaticAberrationCorrParams        no
    2191    VignettingCorrParams                 no
    2193    VignettingCorrParams                 no
    2205    VignettingCorrParams                 no
@@ -31050,7 +31073,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 123 different types of timed GPS metadata.
+currently reads 124 different types of timed GPS metadata.
 
   Tag ID                 Tag Name               Writable
   ------                 --------               --------
@@ -43114,15 +43137,17 @@ L<XMP DICOM Tags|Image::ExifTool::TagNames/XMP DICOM Tags>.
 =head3 Garmin FIT Tags
 
 Information extracted from Garmin FIT (Flexible and Interoperable data
-Transfer) files. By default, only timestamps and GPS-related FIT messages
-are decoded, and the rest are marked as Unknown to be extracted only if the
-Unknown (-u) option is used. And unless the ExtractEmbedded (-ee) option is
-used, only the first FIT message of each type is extracted. When both of
-these options are used, a significant amount of information may be
-extracted, and processing times may be lengthy. The family 1 group names of
-the extracted tags correspond to the FIT message names. The first table
-below lists the FIT messages, and subsequent tables list the extracted tags.
-See L<https://developer.garmin.com/fit/> for the specification.
+Transfer) files.  The main reason for adding FIT support was to allow
+geotagging directly from FIT files using the -geotag option.  For this
+reason, only timestamps and GPS-related FIT messages are decoded by default,
+and the rest are marked as Unknown to be extracted only if the Unknown
+(-u) option is used. And unless the ExtractEmbedded (-ee) option is used,
+only the first FIT message of each type is extracted. When both of these
+options are used, a significant amount of information may be extracted, and
+processing times may be lengthy. The family 1 group names of the extracted
+tags correspond to the FIT message names. The first table below lists the
+FIT messages, and subsequent tables list the extracted tags. See
+L<https://developer.garmin.com/fit/> for the specification.
 
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
@@ -47589,6 +47614,7 @@ FileName.
   MakerNoteByteOrder         File               no
   MaxVal                     File               no
   NewGUID                    ExifTool           no
+  NewUUID                    ExifTool           no
   Now                        ExifTool           no
   NumPlanes                  File               no
   OtherImage                 File               no
@@ -47600,8 +47626,6 @@ FileName.
   PreviewTIFF                File               no
   PreviewWMF                 File               no
   ProcessingTime             ExifTool           no
-  RAFCompression             File               no
-  RAFVersion                 File               no
   ResourceForkSize           System             no
   SphericalVideoXML          GSpherical         yes!
   SymLink                    -                  yes!
@@ -47913,14 +47937,14 @@ values, may created via the ExifTool configuration file.
                        SegWidth
                        SegHeight
   SubSecCreateDate     EXIF:CreateDate          yes
-                       SubSecTimeDigitized
-                       OffsetTimeDigitized
+                       EXIF:SubSecTimeDigitized
+                       EXIF:OffsetTimeDigitized
   SubSecDateTimeOriginal EXIF:DateTimeOriginal  yes
-                       SubSecTimeOriginal
-                       OffsetTimeOriginal
+                       EXIF:SubSecTimeOriginal
+                       EXIF:OffsetTimeOriginal
   SubSecModifyDate     EXIF:ModifyDate          yes
-                       SubSecTime
-                       OffsetTime
+                       EXIF:SubSecTime
+                       EXIF:OffsetTime
   ThumbnailImage       ThumbnailOffset          yes
                        ThumbnailLength
   ThumbnailTIFF        SubfileType              no

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

@@ -33,6 +33,9 @@ my %extendedRes = (
     'crss' => 1,
 );
 
+# namespaces to validate more completely when Validate option is used
+my %validateNS = ( tiff => 1, exif => 1, exifEX => 1 );
+
 my $rdfDesc = 'rdf:Description';
 #
 # packet/xmp/rdf headers and trailers
@@ -118,6 +121,12 @@ sub ValidateProperty($$;$)
                             }
                         }
                     }
+                    if ($$propList[-1] =~ /^(\w+):(\w+)/ and $validateNS{$1} or
+                        $$propList[-1] eq 'rdf:li' and $$propList[-3] =~ /^(\w+):(\w+)/ and $validateNS{$1})
+                    {
+                        my $tbl = GetTagTable("Image::ExifTool::XMP::$1");
+                        $et->Warn("Non-standard XMP property: $1:$2") if $tbl and not $$tbl{$2};
+                    }
                     my $xmpValidate = $$et{XmpValidate};
                     my $path = join('/', @$propList[3..$#$propList]);
                     if (defined $$xmpValidate{$path}) {

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

@@ -4929,6 +4929,18 @@ sub NewGUID()
                    $$ & 0xffff, rand(0x10000), rand(0x10000), rand(0x10000));
 }
 
+#------------------------------------------------------------------------------
+# Generate a version 4 ("random"), variant 1 UUID (RFC 9562, Section 5.4) (github #421)
+# Inputs: <none>
+# Returns: UUID string
+sub NewUUID()
+{
+    my @rnd = map {int(rand(256))} 1 .. 16;
+    $rnd[6] = ($rnd[6] & 0x0f) | 0x40;
+    $rnd[8] = ($rnd[8] & 0x3f) | 0x80;
+    return uc scalar unpack('H32', join '', map {chr} @rnd);
+}
+
 #------------------------------------------------------------------------------
 # Make TIFF header for raw data
 # Inputs: 0) width, 1) height, 2) num colour components, 3) bits, 4) resolution

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

@@ -50,7 +50,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 require Exporter;
 
-$VERSION = '3.78';
+$VERSION = '3.79';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeXML UnescapeXML);
 
@@ -3661,7 +3661,7 @@ NoLoop:
         my $v = UnescapeXML(substr($val, 0, $p - length($1) - 12)) . $1;
         while ($val =~ /<!\[CDATA\[(.*?)\]\]>/sg) {
             my $p1 = pos $val;
-            $v .= UnescapeXML(substr($val, $p, $p1 - length($1) - 12)) . $1;
+            $v .= UnescapeXML(substr($val, $p, $p1 - $p - length($1) - 12)) . $1;
             $p = $p1;
         }
         $val = $v . UnescapeXML(substr($val, $p));
@@ -3774,6 +3774,7 @@ sub ParseXMPElement($$$;$$$$)
     my $isSVG = $$et{XMP_IS_SVG};
     my $saveNS;     # save xlatNS lookup if changed for the scope of this element
     my (%definedNS, %usedNS);  # namespaces defined and used in this scope
+    my $err;
 
     # get our parse procs
     my ($attrProc, $foundProc);
@@ -3803,11 +3804,16 @@ sub ParseXMPElement($$$;$$$$)
         last if pos($$dataPt) > $end - 4;
         # reset nodeID before processing each element
         my $nodeID = $$blankInfo{NodeID} = $oldNodeID;
-        # get next element
-        last if $$dataPt !~ m{<([?/]?)([-\w:.\x80-\xff]+|!--)([^>]*)>}sg or pos($$dataPt) > $end;
+        # find start of next element, skipping over "<![CDATA[xxx]]>" sections
+        last if $$dataPt !~ m{<([?/]?)([-\w:.\x80-\xff]+|!--)([^>]*)>|(<!\[CDATA\[)}sg or pos($$dataPt) > $end;
         # (the only reason we match '<[?/]' is to keep from scanning past the
         #  "<?xpacket end..." terminator or other closing token, so
         next if $1;
+        if ($4) { # skip CDATA
+            next if $$dataPt =~ /\]\]>/sg and pos($$dataPt) <= $end;
+            $err = "Missing CDATA terminator";
+            last Element;
+        }
         my ($prop, $attrs) = ($2, $3);
         # skip comments
         if ($prop eq '!--') {
@@ -3815,7 +3821,7 @@ sub ParseXMPElement($$$;$$$$)
             last;
         }
         my $valStart = pos($$dataPt);
-        my $valEnd;
+        my ($valEnd, $wasComment);
         # only look for closing token if this is not an empty element
         # (empty elements end with '/', eg. <a:b/>)
         if ($attrs !~ s/\/$//) {
@@ -3827,12 +3833,23 @@ sub ParseXMPElement($$$;$$$$)
 #                my $val2 = $1;
                 # find next matching closing token, or the next opening token
                 # of a nested same-named element
-                if ($$dataPt !~ m{<(/?)$prop([-\w:.\x80-\xff]*)(.*?(/?))>}sg or
+                if ($$dataPt !~ m{<(?:(/?)\Q$prop\E([-\w:.\x80-\xff]*)(.*?(/?))>|(!\[CDATA\[|!--))}sg or
                     pos($$dataPt) > $end)
                 {
-                    $et->Warn("XMP format error (no closing tag for $prop)");
+                    $err = "XMP format error (no closing tag for $prop)";
                     last Element;
                 }
+                if ($5) { # find end of CDATA or comment section
+                    if ($5 eq '![CDATA[') {
+                        next if $$dataPt =~ /\]\]>/sg and pos($$dataPt) <= $end;
+                        $err = 'Missing CDATA terminator';
+                        last Element;
+                    } else {
+                        $$dataPt =~ /-->/sg and pos($$dataPt) <= $end and $wasComment = 1, next;
+                        $err = 'Missing comment terminator';
+                        last Element;
+                    }
+                }
                 next if $2; # ignore opening properties with different names
                 if ($1) {
                     next if --$nesting;
@@ -4161,6 +4178,8 @@ sub ParseXMPElement($$$;$$$$)
                     # remove comments and whitespace from rdf:Description only
                     if ($prop eq 'rdf:Description' and $val) {
                         $val =~ s/<!--.*?-->//g; $val =~ s/^\s+//; $val =~ s/\s+$//;
+                    } elsif ($wasComment and $val) {
+                        $val =~ s/<!--.*?-->//g;
                     }
                     # if element value is empty, take value from RDF 'value' or 'resource' attribute
                     # (preferentially) or 'about' attribute (if no 'value' or 'resource')
@@ -4214,6 +4233,8 @@ sub ParseXMPElement($$$;$$$$)
         pos($$dataPt) = $start;
         $$dataPt =~ /\G\s+/gc;  # skip white space after closing token
     }
+    # handle any error which aborted processing
+    $isWriting ? $et->Error($err) : $et->Warn($err) if $err;
 #
 # process resources referenced by blank nodeID's
 #

data/bin/lib/Image/ExifTool.pm

@@ -29,7 +29,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %jpegMarker %specialTags %fileTypeLookup $testLen $exeDir
             %static_vars $advFmtSelf $configFile @configFiles $noConfig);
 
-$VERSION = '13.57';
+$VERSION = '13.59';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -121,6 +121,7 @@ sub CopyFileAttrs($$$);
 sub TimeNow(;$$);
 sub InverseDateTime($$;$$);
 sub NewGUID();
+sub NewUUID();
 sub MakeTiffHeader($$$$;$$);
 
 # other subroutine definitions
@@ -1873,8 +1874,6 @@ my %systemTagsNotes = (
         },
         PrintConv => 'sprintf("%.3g s", $val)',
     },
-    RAFVersion => { Notes => 'RAF file version number' },
-    RAFCompression => { PrintConv => { 0 => 'Uncompressed', 2 => 'Compressed' } }, # 1 maybe lossy?
     JPEGDigest => {
         Notes => q{
             an MD5 digest of the JPEG quantization tables is combined with the component
@@ -1921,6 +1920,15 @@ my %systemTagsNotes = (
         },
         PrintConv => '$val =~ s/(.{8})(.{4})(.{4})(.{4})/$1-$2-$3-$4-/; $val',
     },
+    NewUUID => {
+        Groups => { 0 => 'ExifTool', 1 => 'ExifTool', 2 => 'Other' },
+        Notes => q{
+            generates a version 4 ("random"), variant 1 UUID as per RFC 9562, Section
+            5.4.  Not generated unless specifically requested or the API L<RequestAll|../ExifTool.html#RequestAll>
+            option is set
+        },
+        PrintConv => '$val =~ s/(.{8})(.{4})(.{4})(.{4})/$1-$2-$3-$4-/; $val',
+    },
     ID3Size     => { Notes => 'size of the ID3 data block' },
     Geotag => {
         Writable => 1,
@@ -2771,6 +2779,7 @@ sub ExtractInfo($;@)
         $self->FoundTag('ExifToolVersion', "$VERSION$RELEASE");
         $self->FoundTag('Now', $self->TimeNow()) if $$req{now} or $reqAll;
         $self->FoundTag('NewGUID', NewGUID()) if $$req{newguid} or $reqAll;
+        $self->FoundTag('NewUUID', NewUUID()) if $$req{newuuid} or $reqAll;
         # generate sequence number if necessary
         $self->FoundTag('FileSequence', $$self{FILE_SEQUENCE}) if $$req{filesequence} or $reqAll;
 
@@ -3388,7 +3397,7 @@ sub GetTagList($;$$$)
                       $$fileOrder{$a} <=> $$fileOrder{$b} } @$foundTags;
     } elsif ($sort eq 'Descr') {
         my $desc = $self->GetDescriptions($foundTags);
-        return sort { $$desc{$a} cmp $$desc{$b} } @$foundTags;
+        return sort { $$desc{$a} cmp $$desc{$b} or $a cmp $b } @$foundTags;
     } else {
         return sort { $$fileOrder{$a} <=> $$fileOrder{$b} } @$foundTags;
     }
@@ -5411,7 +5420,7 @@ sub SetFoundTags($)
                 # put entry in return list even without value (value is undef)
                 $matches[0] = $byValue ? "$tag #(0)" : "$tag (0)";
                 # bogus file order entry to avoid warning if sorting in file order
-                $$self{FILE_ORDER}{$matches[0]} = 9999;
+                $$self{FILE_ORDER}{$matches[0]} = 999999999;
             }
             # copy over necessary information for tags from alternate files
             if ($g8) {
@@ -10171,7 +10180,7 @@ sub ProcessBinaryData($$$)
 push @configFiles, $configFile if defined $configFile;
 until ($noConfig) {
     my $config = shift @configFiles;
-    my $file;
+    my ($file, $wasConfig);
     if (not defined $config) {
         $config = '.ExifTool_config';
         # get our home directory (HOMEDRIVE and HOMEPATH are used in Windows cmd shell)
@@ -10182,17 +10191,34 @@ until ($noConfig) {
     } else {
         length $config or last; # filename of "" disables configuration
         $file = $config;
+        $wasConfig = 1;
     }
-    # also check executable directory unless path is absolute
-    $exeDir = ($0 =~ /(.*)[\\\/]/) ? $1 : '.' unless defined $exeDir;
-    -r $file or $config =~ /^\// or $file = "$exeDir/$config";
-    unless (-r $file) {
-        warn("Config file not found\n") if defined $Image::ExifTool::configFile;
-        last;
+    if ($file eq '-') {
+        local *FH;
+        if (open(\*FH, '<-')) {
+            my $buff;
+            my $n = read(\*FH, $buff, 100000000);
+            close \*FH;
+            if ($n == 100000000) {
+                warn("Piped config file is too large\n");
+            } elsif ($n) {
+                eval $buff;
+            } else {
+                undef $@;
+            }
+        }
+    } else {
+        # also check executable directory unless path is absolute
+        $exeDir = ($0 =~ /(.*)[\\\/]/) ? $1 : '.' unless defined $exeDir;
+        -r $file or $config =~ /^\// or $file = "$exeDir/$config";
+        unless (-r $file) {
+            warn("Config file not found\n") if $wasConfig;
+            last;
+        }
+        unshift @INC, '.';      # look in current directory first
+        eval { require $file }; # load the config file
+        shift @INC;
     }
-    unshift @INC, '.';      # look in current directory first
-    eval { require $file }; # load the config file
-    shift @INC;
     # print warning (minus "Compilation failed" part)
     $@ and $_=$@, s/Compilation failed.*//s, warn $_;
     last unless @configFiles;

data/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 13.57
+Version: 13.59
 Release: 1
 License: Artistic/GPL
 Group: Development/Libraries/Perl

data/lib/exiftool_vendored/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ExiftoolVendored
-  VERSION = Gem::Version.new('13.57.1')
+  VERSION = Gem::Version.new('13.59.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 13.57.1
+  version: 13.59.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -63,6 +63,7 @@ files:
 - bin/config_files/guano.config
 - bin/config_files/local_time.config
 - bin/config_files/nksc.config
+- bin/config_files/novelty.config
 - bin/config_files/onone.config
 - bin/config_files/photoshop_paths.config
 - bin/config_files/picasa_faces.config
@@ -344,7 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.8
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Vendored version of exiftool
 test_files: []