exiftool_vendored 11.52.0 → 11.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 708b8f54e7785c774043632d9e5dcefe98ae0a8d
-  data.tar.gz: 1d0693dcecc6c821a9ae9aab22427cd42d63ea8a
+  metadata.gz: 97fbb02d04f7a13c79740ef2c0ca3aa5397dbb8f
+  data.tar.gz: a0bdb72ec276cfc6612f9551fd78f681352f1853
 SHA512:
-  metadata.gz: 457d788e530ab3b621d414c6ad4c23bac4427b584886f5667cb1b3865dcd6ec77897a944a6b7ff5820e03e955826f37bd42c80269a75f30f47481ff5aec27ec4
-  data.tar.gz: dc5b34c896e756158c04c3ceb286746fe813fd2b0a1f37aca9faa517df5ce4706c53fc38e514647ed845d1bdbf519d2d2618087e8dcb6b84084ff0c82eba4e9e
+  metadata.gz: c8771355f5818b9bb5720b8a3caa567b111fa6582120519746658e03135b3df367b4c861a9b40eb7c274d36e858ac96949c1c3e4063162a27251a85537853f72
+  data.tar.gz: 128d993de5cb91c2e8929893d8cc6481c446203de05f0f8807e41aaa3131a76152b34e825a36d472b98a7939fceb64234b298e0c01ecaf669f9261aee7975464

data/bin/Changes

@@ -7,11 +7,30 @@ RSS feed: http://owl.phy.queensu.ca/~phil/exiftool/rss.xml
 Note: The most recent production release is Version 11.50. (Other versions are
 considered development releases, and are not uploaded to CPAN.)
 
+June 24, 2019 - Version 11.53 - "Exif 2.32"
+
+  - Added support for the new tags of the Exif 2.32 specification
+  - Added a new SamsungModelID (thanks LibRaw)
+  - Added warning if extracting ZIP file contents without the -a option
+  - Added ability to extract EmbeddedVideo from the trailer of Android JPEG
+    images with the ExtractEmbedded option
+  - Decode timed GPS from Cobra Dash Cam AVI videos
+  - Decode a new GoPro tag
+  - Enhanced -struct option to allow extraction of structured Torrent Info
+  - Improved error handling when an unexpected terminator is encountered while
+    writing a QuickTime-format file
+  - Renamed one of the Nikon Saturation tags to "SaturationAdj"
+  - Removed warning message when writing FujiFilm RAFVersion 0240 and 0261 files
+  - Fixed encoding problem when writing some QuickTime UserData tags with
+    strings containing special characters
+  - API Changes:
+      - Enhanced XMPShorthand option to add level 2
+
 June 17, 2019 - Version 11.52
 
   - Added a few new Nikon CropHiSpeed values (thanks Hayo Baan)
-  - Added a couple of new Nikon LensID's
-  - Fixed problem where processing large, corrupt AIFF files may could take an
+  - Added a new Nikon LensID (thanks Yves)
+  - Fixed problem where reading a large, corrupt AIFF file may could take an
     excessively long time
   - API Changes:
       - Enhanced Compact option to add levels 3, 4 and 5

data/bin/META.json

@@ -47,6 +47,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "11.52",
+   "version" : "11.53",
    "x_serialization_backend" : "JSON::PP version 4.02"
 }

data/bin/META.yml

@@ -28,5 +28,5 @@ recommends:
   Time::HiRes: '0'
 requires:
   perl: '5.004'
-version: '11.52'
+version: '11.53'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

data/bin/README

@@ -104,8 +104,8 @@ your home directory, then you would type the following commands in a
 terminal window to extract and run ExifTool:
 
   cd ~/Desktop
-  gzip -dc Image-ExifTool-11.52.tar.gz | tar -xf -
-  cd Image-ExifTool-11.52
+  gzip -dc Image-ExifTool-11.53.tar.gz | tar -xf -
+  cd Image-ExifTool-11.53
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/exiftool

@@ -12,7 +12,7 @@
 use strict;
 require 5.004;
 
-my $version = '11.52';
+my $version = '11.53';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -5119,7 +5119,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 11.52 --
+    -- Generated by ExifTool 11.53 --
     File: a.jpg - 2003:10:31 15:44:19
     (f/5.6, 1/60s, ISO 100)
     File: b.jpg - 2006:05:23 11:57:38

data/bin/lib/Image/ExifTool.pm

@@ -7,7 +7,7 @@
 #
 # Revisions:    Nov. 12/2003 - P. Harvey Created
 #               (See html/history.html for revision history)
-#
+#2.32
 # Legal:        Copyright (c) 2003-2019, Phil Harvey (phil at owl.phy.queensu.ca)
 #               This library is free software; you can redistribute it and/or
 #               modify it under the same terms as Perl itself.
@@ -27,7 +27,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %mimeType $swapBytes $swapWords $currentByteOrder %unpackStd
             %jpegMarker %specialTags %fileTypeLookup);
 
-$VERSION = '11.52';
+$VERSION = '11.53';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -1662,6 +1662,7 @@ my %systemTagsNotes = (
             commas, eg. C<-ForceWrite=exif,xmp>
         },
     },
+    EmbeddedVideo => { Groups => { 2 => 'Video' } },
 );
 
 # YCbCrSubSampling values (used by JPEG SOF, EXIF and XMP)
@@ -2108,7 +2109,7 @@ sub ClearOptions($)
         CharsetPhotoshop => 'Latin', # internal encoding for Photoshop resource names
         CharsetQuickTime => 'MacRoman', # internal QuickTime string encoding
         CharsetRIFF => 0,       # internal RIFF string encoding (0=default to Latin)
-        Compact     => undef,   # compact XMP and IPTC data
+        Compact     => 0,       # write compact XMP
         Composite   => 1,       # flag to calculate Composite tags
         Compress    => undef,   # flag to write new values as compressed if possible
         CoordFormat => undef,   # GPS lat/long coordinate format
@@ -5974,29 +5975,50 @@ sub ProcessJPEG($$)
             # we are here because we are looking for trailer information
             if ($wantTrailer) {
                 my $start = $$self{PreviewImageStart};
-                if ($start) {
+                if ($start or $$options{ExtractEmbedded}) {
                     my $buff;
                     # most previews start right after the JPEG EOI, but the Olympus E-20
                     # preview is 508 bytes into the trailer, the K-M Maxxum 7D preview is
                     # 979 bytes in, and Sony previews can start up to 32 kB into the trailer.
                     # (and Minolta and Sony previews can have a random first byte...)
                     my $scanLen = $$self{Make} =~ /Sony/i ? 65536 : 1024;
-                    if ($raf->Read($buff, $scanLen) and ($buff =~ /\xff\xd8\xff./g or
-                        ($$self{Make} =~ /(Minolta|Sony)/i and $buff =~ /.\xd8\xff\xdb/g)))
-                    {
-                        # adjust PreviewImageStart to this location
-                        my $actual = $pos + pos($buff) - 4;
-                        if ($start ne $actual and $verbose > 1) {
-                            print $out "(Fixed PreviewImage location: $start -> $actual)\n";
-                        }
-                        # update preview image offsets
-                        $$self{VALUE}{PreviewImageStart} = $actual if $$self{VALUE}{PreviewImageStart};
-                        $$self{PreviewImageStart} = $actual;
-                        # load preview now if we tried and failed earlier
-                        if ($$self{PreviewError} and $$self{PreviewImageLength}) {
-                            if ($raf->Seek($actual, 0) and $raf->Read($buff, $$self{PreviewImageLength})) {
-                                $self->FoundTag('PreviewImage', $buff);
-                                delete $$self{PreviewError};
+                    if ($raf->Read($buff, $scanLen)) {
+                        if ($buff =~ /^.{4}ftyp/s) {
+                            my $val;
+                            if ($raf->Seek(0,2)) {
+                                my $len = $raf->Tell() - $pos;
+                                if ($$options{Binary}) {
+                                    $val = \$buff if $raf->Seek($pos,0) and $raf->Read($buff,$len)==$len;
+                                } else {
+                                    $val = "(Binary data $len bytes)";
+                                }
+                                if ($val) {
+                                    $self->FoundTag('EmbeddedVideo', $val);
+                                } else {
+                                    $self->Warn('Error reading trailer');
+                                }
+                            } else {
+                                $self->Warn('Error seeking to end of file');
+                            }
+                        } elsif ($buff =~ /\xff\xd8\xff./g or
+                           ($$self{Make} =~ /(Minolta|Sony)/i and $buff =~ /.\xd8\xff\xdb/g))
+                        {
+                            # adjust PreviewImageStart to this location
+                            my $actual = $pos + pos($buff) - 4;
+                            if ($start and $start ne $actual and $verbose > 1) {
+                                print $out "(Fixed PreviewImage location: $start -> $actual)\n";
+                            }
+                            # update preview image offsets
+                            if ($start) {
+                                $$self{VALUE}{PreviewImageStart} = $actual if $$self{VALUE}{PreviewImageStart};
+                                $$self{PreviewImageStart} = $actual;
+                            }
+                            # load preview now if we tried and failed earlier
+                            if ($$self{PreviewError} and $$self{PreviewImageLength}) {
+                                if ($raf->Seek($actual, 0) and $raf->Read($buff, $$self{PreviewImageLength})) {
+                                    $self->FoundTag('PreviewImage', $buff);
+                                    delete $$self{PreviewError};
+                                }
                             }
                         }
                     }
@@ -6047,7 +6069,7 @@ sub ProcessJPEG($$)
                     # only if we can't finish without scanning from end of file)
                     $self->ProcessTrailers($trailInfo) and undef $trailInfo;
                 }
-                if ($wantTrailer) {
+                if ($wantTrailer and $$self{PreviewImageStart}) {
                     # seek ahead and validate preview image
                     my $buff;
                     my $curPos = $raf->Tell();
@@ -6064,6 +6086,8 @@ sub ProcessJPEG($$)
                     require Image::ExifTool::Panasonic;
                     Image::ExifTool::Panasonic::ProcessLeicaTrailer($self);
                     $wantTrailer = 1 if $$self{LeicaTrailer};
+                } else {
+                    $wantTrailer = 1 if $$options{ExtractEmbedded};
                 }
                 next if $trailInfo or $wantTrailer or $verbose > 2 or $htmlDump;
             }

data/bin/lib/Image/ExifTool.pod

@@ -537,7 +537,7 @@ When set to 2, spaces to indent XMP for readability are also dropped.  A
 setting of 3 places all tags in a single rdf:Description element, and 4
 removes newlines from between XMP elements.  A setting of 5 also writes XMP
 in shorthand format (to save setting the XMPShorthand option separately). 
-Default is undef.
+Default is 0.
 
 =item Composite
 
@@ -1001,7 +1001,8 @@ look like rational numbers or dates.  Default is 1.
 
 =item XMPShorthand
 
-Flag set to write xmp in shorthand format.  Default is undef.
+Set to 1 to write xmp in shorthand format, or 2 to also combine properties
+into a single rdf:Description element.  Default is 0.
 
 =back
 

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

@@ -256,11 +256,11 @@ tags remain.
 
 The table below lists all EXIF tags.  Also listed are TIFF, DNG, HDP and
 other tags which are not part of the EXIF specification, but may co-exist
-with EXIF tags in some images.  Tags which are part of the EXIF 2.31
+with EXIF tags in some images.  Tags which are part of the EXIF 2.32
 specification have an underlined B<Tag Name> in the HTML version of this
 documentation.  See
-L<http://www.cipa.jp/std/documents/e/DC-008-Translation-2016-E.pdf> for the
-official EXIF 2.31 specification.
+L<http://www.cipa.jp/std/documents/e/DC-008-Translation-2019-E.pdf> for the
+official EXIF 2.32 specification.
 },
     GPS => q{
 These GPS tags are part of the EXIF standard, and are stored in a separate

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

@@ -55,7 +55,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '4.16';
+$VERSION = '4.17';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -1975,7 +1975,8 @@ my %sampleFormat = (
         Writable => 'undef',
         Mandatory => 1,
         RawConv => '$val=~s/\0+$//; $val',  # (some idiots add null terminators)
-        PrintConvInv => '$val=~tr/.//d; $val=~/^\d{4}$/ ? $val : undef',
+        # (allow strings like "2.31" when writing)
+        PrintConvInv => '$val=~tr/.//d; $val=~/^\d{4}$/ ? $val : $val =~ /^\d{3}$/ ? "0$val" : undef',
     },
     0x9003 => {
         Name => 'DateTimeOriginal',
@@ -2699,6 +2700,74 @@ my %sampleFormat = (
     0xa433 => { Name => 'LensMake',         Writable => 'string' }, #24
     0xa434 => { Name => 'LensModel',        Writable => 'string' }, #24
     0xa435 => { Name => 'LensSerialNumber', Writable => 'string' }, #24
+    0xa460 => { #Exif2.32
+        Name => 'CompositeImage',
+        Writable => 'int16u',
+        PrintConv => {
+            1 => 'No',
+            2 => 'General Composite Image',
+            3 => 'Composite Image Captured While Shooting',
+        },
+    },
+    0xa461 => { #Exif2.32
+        Name => 'CompositeImageCount',
+        Notes => q{
+            2 values: number of source images and the number of images used.  Called
+            SourceImageNumberOfCompositeImage by the EXIF spec.
+        },
+        Writable => 'int16u',
+        Count => 2,
+    },
+    0xa462 => { #Exif2.32
+        Name => 'CompositeImageExposureTimes',
+        Notes => q{
+            9 or more values: 1. total exposure time period, 2. total exposure of all
+            source images, 3. total exposure of all used images, 4. Max exposure time of
+            source images, 5. Max exposure time of used images, 6. Min exposure time of
+            source images, 7. Min exposure of used images, 8. Number of sequences, 9.
+            Number of source images in sequence. 10-N. Exposure times of each source
+            image. Called SourceExposureTimesOfCompositeImage by the EXIF spec.
+        },
+        Writable => 'undef',
+        RawConv => sub {
+            my $val = shift;
+            my @v;
+            my $i = 0;
+            for (;;) {
+                if ($i == 56 or $i == 58) {
+                    last if $i + 2 > length $val;
+                    push @v, Get16u(\$val, $i);
+                    $i += 2;
+                } else {
+                    last if $i + 8 > length $val;
+                    push @v, Image::ExifTool::GetRational64u(\$val, $i);
+                    $i += 8;
+                }
+            }
+            return join ' ', @v;
+        },
+        RawConvInv => sub {
+            my $val = shift;
+            my @v = split ' ', $val;
+            my $i;
+            for ($i=0; ; ++$i) {
+                last unless defined $v[$i];
+                $v[$i] = ($i == 7 or $i == 8) ? Set16u($v[$i]) : Image::ExifTool::SetRational64u($v[$i]);
+            }
+            return join '', @v;
+        },
+        PrintConv => sub {
+            my $val = shift;
+            my @v = split ' ', $val;
+            my $i;
+            for ($i=0; ; ++$i) {
+                last unless defined $v[$i];
+                $v[$i] = PrintExposureTime($v[$i]) unless $i == 7 or $i == 8;
+            }
+            return join ' ', @v;
+        },
+        PrintConvInv => '$val',
+    },
     0xa480 => { Name => 'GDALMetadata',     Writable => 'string', WriteGroup => 'IFD0' }, #3
     0xa481 => { Name => 'GDALNoData',       Writable => 'string', WriteGroup => 'IFD0' }, #3
     0xa500 => { Name => 'Gamma',            Writable => 'rational64u' },

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

@@ -30,7 +30,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.71';
+$VERSION = '1.72';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -53,8 +53,10 @@ my %testedRAF = (
     '0212' => 'S3Pro Ver2.12',
     '0216' => 'S3Pro Ver2.16', # (NC)
     '0218' => 'S3Pro Ver2.18',
+    '0240' => 'X-E1 Ver2.40',
     '0264' => 'F700 Ver2.00',
     '0266' => 'S9500 Ver1.01',
+    '0261' => 'X-E1 Ver2.61',
     '0269' => 'S9500 Ver1.02',
     '0271' => 'S3Pro Ver2.71', # UV/IR model?
     '0300' => 'X-E2',

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

@@ -16,7 +16,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::QuickTime;
 
-$VERSION = '1.02';
+$VERSION = '1.03';
 
 sub ProcessGoPro($$$);
 sub ProcessString($$$);
@@ -78,7 +78,7 @@ my %addUnits = (
         Binary => 1,
     },
     ALLD => 'AutoLowLightDuration', #1 (gpmd) (untested)
-  # APTO (GPMF) - seen: 'RAW' (fmt c)
+  # APTO (GPMF) - seen: 'RAW', 'DYNM' (fmt c)
     ATTD => { #PH (Karma)
         Name => 'Attitude',
         # UNIT=s,rad,rad,rad,rad/s,rad/s,rad/s,
@@ -94,7 +94,7 @@ my %addUnits = (
         Binary => 1,
     },
     AUDO => 'AudioSetting', #PH (GPMF - seen: 'WIND', fmt c)
-  # AUPT (GPMF) - seen: 'N' (fmt c)
+  # AUPT (GPMF) - seen: 'N','Y' (fmt c)
     BPOS => { #PH (Karma)
         Name => 'Controller',
         Unknown => 1,
@@ -104,9 +104,9 @@ my %addUnits = (
         %addUnits,
     },
   # BRID (GPMF) - seen: 0 (fmt B)
-  # BROD (GPMF) - seen: 'ASK' (fmt c)
+  # BROD (GPMF) - seen: 'ASK','' (fmt c)
     CASN => 'CameraSerialNumber', #PH (GPMF - seen: 'C3221324545448', fmt c)
-  # CINF (GPMF) - seen: 0x67376be7709bc8876a8baf3940908618 (fmt B)
+  # CINF (GPMF) - seen: 0x67376be7709bc8876a8baf3940908618 (fmt B) (Camera INFormation?)
   # CMOD (GPMF) - seen: 12,13,17 [13 time-laps video, 17 JPEG] (fmt B)
     CYTS => { #PH (Karma)
         Name => 'CoyoteStatus',
@@ -130,13 +130,15 @@ my %addUnits = (
     DVID => { Name => 'DeviceID', Unknown => 1 }, #2 (gpmd)
   # DVNM (GPMF) seen: 'Video Global Settings' (fmt c), 'Highlights' (fmt c)
   # DVNM (gpmd) seen: 'Camera' (Hero5), 'Hero6 Black' (Hero6), 'GoPro Karma v1.0' (Karma)
-    DVNM => 'DeviceName', #PH
+    DVNM => 'DeviceName', #PH (n/c)
     DZOM => { #PH (GPMF - seen: 'Y', fmt c)
         Name => 'DigitalZoom',
         PrintConv => { N => 'No', Y => 'Yes' },
     },
   # DZST (GPMF) - seen: 0 (fmt L) (something to do with digital zoom maybe?)
-  # EISA (GPMF) - seen: 'Y','N' [N was for a time-lapse video] (fmt c)
+    EISA => { #PH (GPMF) - seen: 'Y','N', 'HS EIS' (fmt c) [N was for a time-lapse video]
+        Name => 'ElectronicImageStabilization',
+    },
   # EISE (GPMF) - seen: 'Y' (fmt c)
     EMPT => { Name => 'Empty', Unknown => 1 }, #2 (gpmd)
     ESCS => { #PH (Karma)
@@ -147,7 +149,7 @@ my %addUnits = (
         Unknown => 1,
         %addUnits,
     },
-  # EXPT (GPMF) - seen: '' (fmt c)
+  # EXPT (GPMF) - seen: '', 'AUTO' (fmt c)
     FACE => 'FaceDetected', #PH (gpmd)
     FCNM => 'FaceNumbers', #PH (gpmd) (faces counted per frame, ref 1)
     FMWR => 'FirmwareVersion', #PH (GPMF - seen: HD6.01.01.51.00, fmt c)
@@ -213,7 +215,7 @@ my %addUnits = (
         RawConv => '$val', # necessary to use scaled value instead of raw data as subdir data
         SubDirectory => { TagTable => 'Image::ExifTool::GoPro::KBAT' },
     },
-  # LINF (GPMF) - seen: LAJ7061916601668 (fmt c)
+  # LINF (GPMF) - seen: LAJ7061916601668 (fmt c) (Lens INFormation?)
     LNED => { #PH (Karma)
         Name => 'LocalPositionNED',
         # UNIT=s,m,m,m,m/s,m/s,m/s
@@ -241,7 +243,7 @@ my %addUnits = (
     PHDR => 'HDRSetting', #PH (APP6 - seen: 0)
     PIMN => 'AutoISOMin', #PH (GPMF - seen: 100, fmt L)
     PIMX => 'AutoISOMax', #PH (GPMF - seen: 1600, fmt L)
-  # PRAW (APP6) - seen: 0
+  # PRAW (APP6) - seen: 0, 'N' (fmt c)
     PRES => 'PhotoResolution', #PH (APP6 - seen: '12MP_W')
     PRTN => { #PH (GPMF - seen: 'N', fmt c)
         Name => 'ProTune',
@@ -348,7 +350,7 @@ my %addUnits = (
         # UNIT=m/s,m/s,m,m/s,deg,%
         # TYPE=ffffsS
     },
-  # VLTE (GPMF) - seen: 'Y' (fmt c)
+  # VLTE (GPMF) - seen: 'Y','N' (fmt c)
     WBAL => 'ColorTemperatures', #PH (gpmd)
     WRGB => { #PH (gpmd)
         Name => 'WhiteBalanceRGB',

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

@@ -239,6 +239,10 @@ sub ProcessJPEG_HDR($$$);
         Name => 'PreviewImage',
         Condition => '$$valPt =~ /^\xff\xd8\xff/',
         Writable => 1,  # (for docs only)
+      }, {
+        Name => 'EmbeddedVideo',
+        Notes => 'extracted only when ExtractEmbedded option is used',
+        Condition => '$$valPt =~ /^.{4}ftyp/s',
     }],
 );
 

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

@@ -60,7 +60,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.65';
+$VERSION = '3.66';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -574,7 +574,6 @@ sub GetAFPointGrid($$;$);
     'F7 53 5C 80 24 24 84 06' => 'Tamron SP AF 70-200mm f/2.8 Di LD (IF) Macro (A001)',
     'FE 53 5C 80 24 24 84 06' => 'Tamron SP AF 70-200mm f/2.8 Di LD (IF) Macro (A001)',
     'F7 53 5C 80 24 24 40 06' => 'Tamron SP AF 70-200mm f/2.8 Di LD (IF) Macro (A001)',
-    'E2 47 5C 80 24 24 DF 4E' => 'Tamron SP 70-200mm f/2.8 Di VC USD G2 (A025)', #30
   # 'FE 54 5C 80 24 24 DF 0E' => 'Tamron SP AF 70-200mm f/2.8 Di VC USD (A009)',
     'FE 54 5C 80 24 24 DF 0E' => 'Tamron SP 70-200mm f/2.8 Di VC USD (A009)', #NJ
     'E2 47 5C 80 24 24 DF 4E' => 'Tamron SP 70-200mm f/2.8 Di VC USD G2 (A025)', #forum9549
@@ -1786,7 +1785,7 @@ my %binaryDataAttrs = (
             9 => 'Packed 12 bits', #IB (2 pixels in 3 bytes)
         },
     },
-    0x0094 => { Name => 'Saturation',       Writable => 'int16s' },
+    0x0094 => { Name => 'SaturationAdj',    Writable => 'int16s' },
     0x0095 => { Name => 'NoiseReduction',   Writable => 'string' }, # ("Off" or "FPNR"=long exposure NR)
     0x0096 => {
         Name => 'NEFLinearizationTable', # same table as DNG LinearizationTable (ref JD)

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

@@ -29,7 +29,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.51';
+$VERSION = '1.52';
 
 sub ConvertTimecode($);
 sub ProcessSGLT($$$);
@@ -534,6 +534,32 @@ my %code2charset = (
             ProcessProc => \&ProcessSLLT,
         },
     },
+#
+# tags found in an AlphaImagingTech AVI video - PH
+#
+    LIST_INF0 => {  # ('0' instead of 'O' -- odd)
+        Name => 'Info',
+        SubDirectory => { TagTable => 'Image::ExifTool::RIFF::Info' },
+    },
+    gps0 => {
+        Name => 'GPSTrack',
+        SetGroups => 'RIFF', # (moves "QuickTime" tags to the "RIFF" group)
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::QuickTime::Stream',
+            # (don't use code ref here or get "Prototype mismatch" warning with some Perl versions)
+            ProcessProc => 'Image::ExifTool::QuickTime::Process_gps0',
+        },
+    },
+    gsen => {
+        Name => 'GSensor',
+        SetGroups => 'RIFF', # (moves "QuickTime" tags to the "RIFF" group)
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::QuickTime::Stream',
+            ProcessProc => 'Image::ExifTool::QuickTime::Process_gsen',
+        },
+    },
+    # gpsa - seen hex "01 20 00 00", same as QuickTime
+    # gsea - 16 bytes hex "04 08 02 00 20 02 00 00 1f 03 00 00 01 00 00 00"
 );
 
 # the maker notes used by some digital cameras
@@ -1432,8 +1458,7 @@ sub MakeTagInfo($$)
 
 #------------------------------------------------------------------------------
 # Process RIFF chunks
-# Inputs: 0) ExifTool object reference, 1) directory information reference
-#         2) tag table reference
+# Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
 # Returns: 1 on success
 sub ProcessChunks($$$)
 {
@@ -1661,9 +1686,14 @@ sub ProcessRIFF($$)
         }
         # RIFF chunks are padded to an even number of bytes
         my $len2 = $len + ($len & 0x01);
-        if ($$tagTbl{$tag} or (($verbose or $unknown) and $tag !~ /^(data|idx1|LIST_movi|RIFF)$/)) {
+        my $tagInfo = $$tagTbl{$tag};
+        if ($tagInfo or (($verbose or $unknown) and $tag !~ /^(data|idx1|LIST_movi|RIFF)$/)) {
             $raf->Read($buff, $len2) == $len2 or $err=1, last;
-            MakeTagInfo($tagTbl, $tag) if not $$tagTbl{$tag} and ($verbose or $unknown);
+            my $setGroups;
+            if ($tagInfo and ref $tagInfo eq 'HASH' and $$tagInfo{SetGroups}) {
+                $setGroups = $$et{SET_GROUP0} = $$et{SET_GROUP1} = $$tagInfo{SetGroups};
+            }
+            MakeTagInfo($tagTbl, $tag) if not $tagInfo and ($verbose or $unknown);
             $et->HandleTag($tagTbl, $tag, $buff,
                 DataPt  => \$buff,
                 DataPos => 0,   # (relative to Base)
@@ -1671,6 +1701,10 @@ sub ProcessRIFF($$)
                 Size    => $len2,
                 Base    => $pos,
             );
+            if ($setGroups) {
+                delete $$et{SET_GROUP0};
+                delete $$et{SET_GROUP1};
+            }
         } elsif ($tag eq 'RIFF') {
             # don't read into RIFF chunk (eg. concatenated video file)
             $raf->Read($buff, 4) == 4 or $err=1, last;

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

@@ -22,7 +22,7 @@ use vars qw($VERSION %samsungLensTypes);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.44';
+$VERSION = '1.45';
 
 sub WriteSTMN($$$);
 sub ProcessINFO($$$);
@@ -234,6 +234,7 @@ my %formatMinMax = (
             0x500103c => 'WB600 / VLUU WB600 / WB610',
             0x500133e => 'WB150 / WB150F / WB152 / WB152F / WB151',
             0x5a0000f => 'WB5000 / HZ25W',
+            0x5a0001e => 'WB5500 / VLUU WB5500 / HZ50W',
             0x6001036 => 'EX1',
             0x700131c => 'VLUU SH100, SH100',
             0x27127002 => 'SMX-C20N',

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

@@ -8599,7 +8599,7 @@ my %isoSetting2010 = (
 );
 
 
-# AFInfo (SLT models only) (ref PH, decoded mainly from A77)
+# AFInfo 0x940e (SLT models only) (ref PH, decoded mainly from A77)
 %Image::ExifTool::Sony::AFInfo = (
     PROCESS_PROC => \&ProcessEnciphered,
     WRITE_PROC => \&WriteEnciphered,
@@ -10171,7 +10171,7 @@ sub Decrypt($$$$)
 }
 
 #------------------------------------------------------------------------------
-# Decipher/encipher Sony tag 0x94xx data (ref PH)
+# Decipher/encipher Sony tag 0x2010, 0x900b, 0x9050 and 0x940x data (ref PH)
 # Inputs: 0) data reference, 1) true to encipher the data
 sub Decipher($;$)
 {

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

@@ -1547,6 +1547,9 @@ my %tagLookup = (
 	'componentversion' => { 92 => 0x80c },
 	'composer' => { 354 => ["\xa9com","\xa9wrt"], 362 => ["\xa9com","\xa9wrt"], 480 => 'composer' },
 	'composerkeywords' => { 362 => "\xa9cok" },
+	'compositeimage' => { 114 => 0xa460 },
+	'compositeimagecount' => { 114 => 0xa461 },
+	'compositeimageexposuretimes' => { 114 => 0xa462 },
 	'composition' => { 445 => 'Composition' },
 	'compositionadjust' => { 336 => '0.1' },
 	'compositionadjustrotation' => { 336 => 0x7 },
@@ -4921,8 +4924,8 @@ my %tagLookup = (
 	'samsungmodelid' => { 376 => 0x3 },
 	'sanyoquality' => { 378 => 0x201 },
 	'sanyothumbnail' => { 378 => 0x100 },
-	'saturation' => { 10 => 0x6e, 12 => 0x76, 34 => 0xe, 49 => 0x1, 107 => 0xd, 108 => [0x3013,0x1f], 114 => [0xa409,0xfe55], 122 => 0x1003, 148 => 'Saturation', 172 => 0x1f, 173 => 0x32, 174 => 0x28, 175 => 0x1a, 180 => 0x1, 215 => [0x94,0xaa], 217 => 0x35, 218 => 0x3b, 219 => 0x43, 302 => 0x40, 304 => 0x300d, 337 => 0x1f, 344 => 0xd, 363 => 0x27, 365 => 0x58, 368 => 0x28, 369 => 0x1013, 379 => 0x10, 387 => 0x1e, 388 => 0x1b, 400 => 0x2005, 456 => 'Saturation', 460 => 'Saturation' },
-	'saturationadj' => { 98 => 0x20901, 103 => 0x116, 254 => 0x1, 258 => 0x2e, 433 => 0x8016 },
+	'saturation' => { 10 => 0x6e, 12 => 0x76, 34 => 0xe, 49 => 0x1, 107 => 0xd, 108 => [0x3013,0x1f], 114 => [0xa409,0xfe55], 122 => 0x1003, 148 => 'Saturation', 172 => 0x1f, 173 => 0x32, 174 => 0x28, 175 => 0x1a, 180 => 0x1, 215 => 0xaa, 217 => 0x35, 218 => 0x3b, 219 => 0x43, 302 => 0x40, 304 => 0x300d, 337 => 0x1f, 344 => 0xd, 363 => 0x27, 365 => 0x58, 368 => 0x28, 369 => 0x1013, 379 => 0x10, 387 => 0x1e, 388 => 0x1b, 400 => 0x2005, 456 => 'Saturation', 460 => 'Saturation' },
+	'saturationadj' => { 98 => 0x20901, 103 => 0x116, 215 => 0x94, 254 => 0x1, 258 => 0x2e, 433 => 0x8016 },
 	'saturationadjustmentaqua' => { 456 => 'SaturationAdjustmentAqua' },
 	'saturationadjustmentblue' => { 456 => 'SaturationAdjustmentBlue' },
 	'saturationadjustmentgreen' => { 456 => 'SaturationAdjustmentGreen' },
@@ -7352,6 +7355,7 @@ my %tagExists = (
 	'effectsvisible' => 1,
 	'eighteenpercentpoint' => 1,
 	'eighthlanguage' => 1,
+	'electronicimagestabilization' => 1,
 	'electronicvr' => 1,
 	'elementarystreamtrack' => 1,
 	'embeddedaudiofile' => 1,
@@ -7368,6 +7372,7 @@ my %tagExists = (
 	'embeddedimagewidth' => 1,
 	'embeddedjpg' => 1,
 	'embeddedpng' => 1,
+	'embeddedvideo' => 1,
 	'embeddedvideofile' => 1,
 	'embeddedvideotype' => 1,
 	'emphasis' => 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 22571 tags, with 15015 unique tag names.
+They contain a total of 22577 tags, with 15020 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
@@ -144,6 +144,7 @@ L<https://www.w3.org/Graphics/JPEG/jfif3.pdf> for the JPEG specification.
                MIE                              MIE
                Samsung                          Samsung Trailer
                PreviewImage                     yes
+               EmbeddedVideo                    no
 
 =head3 JPEG AVI1 Tags
 
@@ -308,11 +309,11 @@ tags remain.
 
 The table below lists all EXIF tags.  Also listed are TIFF, DNG, HDP and
 other tags which are not part of the EXIF specification, but may co-exist
-with EXIF tags in some images.  Tags which are part of the EXIF 2.31
+with EXIF tags in some images.  Tags which are part of the EXIF 2.32
 specification have an underlined B<Tag Name> in the HTML version of this
 documentation.  See
-L<http://www.cipa.jp/std/documents/e/DC-008-Translation-2016-E.pdf> for the
-official EXIF 2.31 specification.
+L<http://www.cipa.jp/std/documents/e/DC-008-Translation-2019-E.pdf> for the
+official EXIF 2.32 specification.
 
   Tag ID   Tag Name                  Group      Writable
   ------   --------                  -----      --------
@@ -752,6 +753,9 @@ official EXIF 2.31 specification.
   0xa433   LensMake                  ExifIFD    string
   0xa434   LensModel                 ExifIFD    string
   0xa435   LensSerialNumber          ExifIFD    string
+  0xa460   CompositeImage            ExifIFD    int16u
+  0xa461   CompositeImageCount       ExifIFD    int16u[2]
+  0xa462   CompositeImageExposureTimes ExifIFD  undef
   0xa480   GDALMetadata              IFD0       string
   0xa481   GDALNoData                IFD0       string
   0xa500   Gamma                     ExifIFD    rational64u
@@ -10895,7 +10899,7 @@ DiMAGE X and Xt.
            ShotInfoUnknown                      Nikon ShotInfo
   0x0092   HueAdjustment                        int16s
   0x0093   NEFCompression                       int16u
-  0x0094   Saturation                           int16s
+  0x0094   SaturationAdj                        int16s
   0x0095   NoiseReduction                       string
   0x0096   NEFLinearizationTable                undef!
   0x0097   ColorBalance0100                     Nikon ColorBalance1
@@ -18834,6 +18838,7 @@ about this format.
   'DVID'   DeviceID?                            no
   'DVNM'   DeviceName                           no
   'DZOM'   DigitalZoom                          no
+  'EISA'   ElectronicImageStabilization         no
   'EMPT'   Empty?                               no
   'ESCS'   EscapeStatus?                        no
   'FACE'   FaceDetected                         no
@@ -27795,6 +27800,7 @@ sub-documents, but the Duration is calculated for the full video.
                        PentaxJunk2              Pentax Junk2
                        TextJunk                 no
   'JUNQ'               OldXMP                   no
+  'LIST_INF0'          Info                     RIFF Info
   'LIST_INFO'          Info                     RIFF Info
   'LIST_Tdat'          Tdat                     RIFF Tdat
   'LIST_exif'          Exif                     RIFF Exif
@@ -27815,6 +27821,8 @@ sub-documents, but the Duration is calculated for the full video.
   'ds64'               DataSize64               RIFF DS64
   'fact'               NumberOfSamples          no
   'fmt '               AudioFormat              RIFF AudioFormat
+  'gps0'               GPSTrack                 QuickTime Stream
+  'gsen'               GSensor                  QuickTime Stream
   'labl'               Label                    RIFF Label
   'list'               ListType                 no
   'olym'               Olym                     Olympus WAV
@@ -32953,6 +32961,7 @@ FileName.
   CurrentIPTCDigest          File               no
   Directory                  System             yes!
   EXIF                       EXIF               yes!
+  EmbeddedVideo              File               no
   Error                      ExifTool           no
   ExifByteOrder              File               yes
   ExifToolVersion            ExifTool           no

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

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.03';
+$VERSION = '1.04';
 
 sub ReadBencode($$);
 sub ExtractTags($$$;$$@);
@@ -232,6 +232,11 @@ sub ExtractTags($$$;$$@)
                 $tagInfo = $et->GetTagInfo($tagTablePtr, $id) or next;
             }
             if (ref $val eq 'HASH') {
+                if ($et->Options('Struct') and $tagInfo and $$tagInfo{Name} eq 'Info') {
+                    $et->FoundTag($tagInfo, $val);
+                    ++$count;
+                    next;
+                }
                 # extract tags from this dictionary
                 my ($table, $rootID, $rootName);
                 if ($$tagInfo{SubDirectory}) {
@@ -268,7 +273,7 @@ sub ProcessTorrent($$)
     my $dict = ReadBencode($raf, \$buff);
     my $err = $$raf{BencodeError};
     $et->Warn("Bencode error: $err") if $err;
-    if (ref $dict eq 'HASH' and $$dict{announce}) {
+    if (ref $dict eq 'HASH' and ($$dict{announce} or $$dict{'created by'})) {
         $et->SetFileType();
         my $tagTablePtr = GetTagTable('Image::ExifTool::Torrent::Main');
         ExtractTags($et, $dict, $tagTablePtr) and $success = 1;

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

@@ -22,7 +22,7 @@ $VERSION = '1.14';
 use Image::ExifTool qw(:Utils);
 use Image::ExifTool::Exif;
 
-# EXIF table tag ID's which are part of the EXIF 2.31 specification
+# EXIF table tag ID's which are part of the EXIF 2.32 specification
 # (also used by BuildTagLookup to add underlines in HTML version of EXIF Tag Table)
 %exifSpec = (
     0x1 => 1,
@@ -42,16 +42,16 @@ use Image::ExifTool::Exif;
     0x11a => 1,  0x8834 => 1,  0x9403 => 1,  0xa40a => 1,
     0x11b => 1,  0x8835 => 1,  0x9404 => 1,  0xa40b => 1,
     0x11c => 1,  0x9000 => 1,  0x9405 => 1,  0xa40c => 1,
-    0x128 => 1,  0x9003 => 1,  0xa000 => 1,  0xa420 => 1,
-    0x12d => 1,  0x9004 => 1,  0xa001 => 1,  0xa430 => 1,
-    0x131 => 1,  0x9010 => 1,  0xa002 => 1,  0xa431 => 1,
-    0x132 => 1,  0x9011 => 1,  0xa003 => 1,  0xa432 => 1,
-    0x13b => 1,  0x9012 => 1,  0xa004 => 1,  0xa433 => 1,
-    0x13e => 1,  0x9101 => 1,  0xa005 => 1,  0xa434 => 1,
-    0x13f => 1,  0x9102 => 1,  0xa20b => 1,  0xa435 => 1,
-    0x201 => 1,  0x9201 => 1,  0xa20c => 1,
-    0x202 => 1,  0x9202 => 1,  0xa20e => 1,
-    0x211 => 1,  0x9203 => 1,  0xa20f => 1,
+    0x128 => 1,  0x9003 => 1,  0xa000 => 1,  0xa460 => 1,
+    0x12d => 1,  0x9004 => 1,  0xa001 => 1,  0xa461 => 1,
+    0x131 => 1,  0x9010 => 1,  0xa002 => 1,  0xa462 => 1,
+    0x132 => 1,  0x9011 => 1,  0xa003 => 1,  0xa420 => 1,
+    0x13b => 1,  0x9012 => 1,  0xa004 => 1,  0xa430 => 1,
+    0x13e => 1,  0x9101 => 1,  0xa005 => 1,  0xa431 => 1,
+    0x13f => 1,  0x9102 => 1,  0xa20b => 1,  0xa432 => 1,
+    0x201 => 1,  0x9201 => 1,  0xa20c => 1,  0xa433 => 1,
+    0x202 => 1,  0x9202 => 1,  0xa20e => 1,  0xa434 => 1,
+    0x211 => 1,  0x9203 => 1,  0xa20f => 1,  0xa435 => 1,
     0x212 => 1,  0x9204 => 1,  0xa210 => 1,
     0x213 => 1,  0x9205 => 1,  0xa214 => 1,
     0x214 => 1,  0x9206 => 1,  0xa215 => 1,

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

@@ -38,7 +38,7 @@ my %mandatory = (
         0x0128 => 2,        # ResolutionUnit (inches)
     },
     ExifIFD => {
-        0x9000 => '0231',   # ExifVersion
+        0x9000 => '0232',   # ExifVersion
         0x9101 => "1 2 3 0",# ComponentsConfiguration
         0xa000 => '0100',   # FlashpixVersion
         0xa001 => 0xffff,   # ColorSpace (uncalibrated)

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

@@ -793,11 +793,18 @@ sub WriteQuickTime($$$)
             }
             $size = $hi * 4294967296 + $lo - 16;
             $size < 0 and $et->Error('Invalid extended atom size'), last;
-        } elsif ($size == -8 and not $dataPt) {
-            # size of zero is only valid for top-level atom, and
-            # indicates the atom extends to the end of file
-            # (save in mdat list to write later; with zero end position to copy rest of file)
-            push @mdat, [ $raf->Tell(), 0, $hdr ];
+        } elsif ($size == -8) {
+            if ($dataPt) {
+                my $pos = $raf->Tell() - 4;
+                $raf->Seek(0,2);
+                my $str = $$dirInfo{DirName} . ' with ' . ($raf->Tell() - $pos) . ' bytes';
+                $et->Error("Terminator found in $str remaining", 1);
+            } else {
+                # size of zero is only valid for top-level atom, and
+                # indicates the atom extends to the end of file
+                # (save in mdat list to write later; with zero end position to copy rest of file)
+                push @mdat, [ $raf->Tell(), 0, $hdr ];
+            }
             last;
         } elsif ($size < 0) {
             if ($$tagTablePtr{VARS}{IGNORE_BAD_ATOMS} and $dataPt) {
@@ -1029,7 +1036,7 @@ sub WriteQuickTime($$$)
                                         my $prVal = $newVal;
                                         my $flags = FormatQTValue($et, \$newVal, $$tagInfo{Format});
                                         next unless defined $newVal;
-                                        my ($ctry, $lang) = (0,0);
+                                        my ($ctry, $lang) = (0, $undLang);
                                         if ($$ti{LangCode}) {
                                             unless ($$ti{LangCode} =~ /^([A-Z]{3})?[-_]?([A-Z]{2})?$/i) {
                                                 $et->Warn("Invalid language code for $$ti{Name}");
@@ -1179,6 +1186,11 @@ sub WriteQuickTime($$$)
                                 } else {
                                     $newData = pack('nn', length($newData), $lang) . $newData;
                                 }
+                            } elsif (not $$tagInfo{Format} or $$tagInfo{Format} =~ /^string/ and
+                                    not $$tagInfo{Binary} and not $$tagInfo{ValueConv})
+                            {
+                                # write all strings as UTF-8
+                                $newData = $et->Encode($newData, 'UTF8');
                             }
                         }
                         $$didTag{$nvHash} = 1;   # set flag so we don't add this tag again
@@ -1315,8 +1327,10 @@ sub WriteQuickTime($$$)
                 }
                 if ($$dirInfo{HasData}) {
                     # add 'data' header
+                    $lang or $lang = $undLang;
                     $newVal = pack('Na4Nnn',16+length($newVal),'data',$flags,$ctry,$lang).$newVal;
                 } elsif ($tag =~ /^\xa9/ or $$tagInfo{IText}) {
+                    $lang or $lang = $undLang;
                     if ($ctry) {
                         my $grp = $et->GetGroup($tagInfo,1);
                         $et->Warn("Can't use country code for $grp:$$tagInfo{Name}");

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

@@ -607,7 +607,7 @@ sub LimitXMPSize($$$$$$)
     my ($sp, $nl) = $noPad ? ('', $noPad > 1 ? '' : "\n") : (' ',"\n");
     # write the required xmpNote:HasExtendedXMP property
     $newData .= "$nl$sp<$rdfDesc rdf:about='${about}'\n$sp${sp}xmlns:xmpNote='$nsURI{xmpNote}'";
-    if ($$et{OPTIONS}{XMPShorthand} or ($$et{OPTIONS}{Compact} and $$et{OPTIONS}{Compact} > 4)) {
+    if ($$et{OPTIONS}{XMPShorthand} or $$et{OPTIONS}{Compact} > 4) {
         $newData .= "\n$sp${sp}xmpNote:HasExtendedXMP='${guid}'/>\n";
     } else {
         $newData .= ">$nl$sp$sp<xmpNote:HasExtendedXMP>$guid</xmpNote:HasExtendedXMP>$nl$sp</$rdfDesc>\n";
@@ -723,7 +723,7 @@ sub WriteXMP($$;$)
     # prefer XMP over other metadata formats in some types of files
     my $preferred = $xmpFile || ($$et{PreferredGroup} and $$et{PreferredGroup} eq 'XMP');
     my $verbose = $$et{OPTIONS}{Verbose};
-    my $compact = $$et{OPTIONS}{Compact} || 0;
+    my $compact = $$et{OPTIONS}{Compact};
     my $dirLen = $$dirInfo{DirLen};
     $dirLen = length($$dataPt) if not defined $dirLen and $dataPt;
     $noPad = $compact > 1 ? ($compact > 3 ? 2 : 1) : undef;
@@ -1236,7 +1236,7 @@ sub WriteXMP($$;$)
 # write out the new XMP information (serialize it)
 #
     # start writing the XMP data
-    my $useShorthand = $$et{OPTIONS}{XMPShorthand} || $compact > 4;
+    my $useShorthand = $$et{OPTIONS}{XMPShorthand} || ($compact > 4 ? 1 : 0);
     my (@long, @short, @resFlag);
     $long[0] = $long[1] = $short[0] = '';
     if ($$et{XMP_NO_XPACKET}) {
@@ -1316,7 +1316,7 @@ sub WriteXMP($$;$)
             my ($path2, $ns2);
             foreach $path2 (@pathList) {
                 my @ns2s = ($path2 =~ m{(?:^|/)([^/]+?):}g);
-                my $opening = $compact > 2 ? 1 : 0;
+                my $opening = ($compact > 2 or $useShorthand > 1) ? 1 : 0;
                 foreach $ns2 (@ns2s) {
                     next if $ns2 eq 'rdf';
                     $nsNew{$ns2} and ++$opening, next;

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

@@ -19,7 +19,7 @@ use strict;
 use vars qw($VERSION $warnString);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.24';
+$VERSION = '1.25';
 
 sub WarnProc($) { $warnString = $_[0]; }
 
@@ -308,6 +308,9 @@ sub ProcessRAR($$)
         $raf->Seek($size, 1) or last if $size;
     }
     $$et{DOC_NUM} = 0;
+    if ($docNum > 1 and not $et->Options('Duplicates')) {
+        $et->Warn("Use the Duplicates option to extract tags for all $docNum files", 1);
+    }
 
     return 1;
 }
@@ -387,11 +390,12 @@ sub ProcessZIP($$)
 {
     my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
-    my ($buff, $buf2, $zip, $docNum);
+    my ($buff, $buf2, $zip);
 
     return 0 unless $raf->Read($buff, 30) == 30 and $buff =~ /^PK\x03\x04/;
 
     my $tagTablePtr = GetTagTable('Image::ExifTool::ZIP::Main');
+    my $docNum = 0;
 
     # use Archive::Zip if avilable
     for (;;) {
@@ -566,7 +570,6 @@ sub ProcessZIP($$)
         # otherwise just extract general ZIP information
         $et->SetFileType();
         @members = $zip->members();
-        $docNum = 0;
         my ($member, $iWorkType);
         # special files to extract
         my %extract = (
@@ -608,12 +611,14 @@ sub ProcessZIP($$)
     if ($zip) {
         delete $$dirInfo{ZIP};
         delete $$et{DOC_NUM};
+        if ($docNum > 1 and not $et->Options('Duplicates')) {
+            $et->Warn("Use the Duplicates option to extract tags for all $docNum files", 1);
+        }
         return 1;
     }
 #
 # process the ZIP file by hand (funny, but this seems easier than using Archive::Zip)
 #
-    $docNum = 0;
     $et->VPrint(1, "  -- processing as binary data --\n");
     $raf->Seek(30, 0);
     $et->SetFileType();
@@ -659,6 +664,9 @@ sub ProcessZIP($$)
         $raf->Read($buff, 30) == 30 and $buff =~ /^PK\x03\x04/ or last;
     }
     delete $$et{DOC_NUM};
+    if ($docNum > 1 and not $et->Options('Duplicates')) {
+        $et->Warn("Use the Duplicates option to extract tags for all $docNum files", 1);
+    }
     return 1;
 }
 

data/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 11.52
+Version: 11.53
 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('11.52.0')
+  VERSION = Gem::Version.new('11.53.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 11.52.0
+  version: 11.53.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-17 00:00:00.000000000 Z
+date: 2019-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool