exiftool_vendored 11.60.0 → 11.61.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de41613ce5421f4a0a60fd8a46a6dc8e703ea126
-  data.tar.gz: 4a00871a6182540eaa1273d975a7cf529e90271c
+  metadata.gz: 65ea2b4bc54696ca9b8ded4b82cf20b63ccac35e
+  data.tar.gz: 2b940fd9b9756a41daf9b513c0cd8c6d2477a286
 SHA512:
-  metadata.gz: a3d5662e0bc57eb8c8df76eec7dfa79898d76b654a38f5bacc1970401b40fdc16ff34f0e73b572934fc4df1638ebfdb5568620ba594f843f885e767163cff805
-  data.tar.gz: b1ef3d7bf40176d2131c9a61f0dc92783d956a1bf8069c8a41b1c0bd90263a23270b3dd799d7ad418cbb2b8038f2f2133f9bc925b2f4cff95224703ba35ef7f8
+  metadata.gz: '08d346325378140b1eec45335a4c49b03bb1368c7eece40ffa62f4c252e6fda781e1feab4e339c86e8431f827e6eab8339c9f9c6a63944587d2f04ac5124b685'
+  data.tar.gz: b1fb4d3bd28b6561c247c5376d95a54b43c8af0a8c86c2ccb264edbb7b309ff75dc95c29344fe28c21055338ef5b6422ae9edb691ae3a9257ccc1b4e4ff60f02

data/bin/Changes

@@ -7,6 +7,21 @@ 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.)
 
+Aug. 7, 2019 - Version 11.61
+
+  - Added a new FujiFilm CropMode (thanks LibRaw)
+  - Added a couple of proprietary CustomRendered values (thanks Jeffrey Friedl)
+  - Added a new Nikon LensID and fixed a Canon LensType (thanks LibRaw)
+  - Added a new CanonModelID
+  - Decode more Sony DSC-RX100M7 tags (thanks Jos Roost)
+  - Write standard EXIF to PNG even if non-standard EXIF already exists
+  - Patched to avoid problems overriding new values when writing thumbnail and
+    preview images
+  - Changed a Minolta/Sony LensType (thanks LibRaw)
+  - Changed Composite GPS reference direction tags to be derived from only the
+    XMP-exif GPS coordinate tags (and not other XMP GPS coordinates)
+  - Reverted a PNG Validation check that was removed from 11.60
+
 July 30, 2019 - Version 11.60
 
   - Added a few new Sigma LensType values (thanks LibRaw)

data/bin/META.json

@@ -47,6 +47,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "11.60",
+   "version" : "11.61",
    "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.60'
+version: '11.61'
 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.60.tar.gz | tar -xf -
-  cd Image-ExifTool-11.60
+  gzip -dc Image-ExifTool-11.61.tar.gz | tar -xf -
+  cd Image-ExifTool-11.61
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/exiftool

@@ -10,7 +10,7 @@
 use strict;
 require 5.004;
 
-my $version = '11.60';
+my $version = '11.61';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -5157,7 +5157,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 11.60 --
+    -- Generated by ExifTool 11.61 --
     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

@@ -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.60';
+$VERSION = '11.61';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.19';
+$VERSION = '4.20';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -511,7 +511,7 @@ $VERSION = '4.19';
     4154 => 'Canon EF-S 24mm f/2.8 STM', #IB
     4155 => 'Canon EF-M 28mm f/3.5 Macro IS STM', #42
     4156 => 'Canon EF 50mm f/1.8 STM', #42
-    4157 => 'Canon EF-M 18-150mm 1:3.5-6.3 IS STM', #42
+    4157 => 'Canon EF-M 18-150mm f/3.5-6.3 IS STM', #42
     4158 => 'Canon EF-S 18-55mm f/4-5.6 IS STM', #PH
     4159 => 'Canon EF-M 32mm f/1.4 STM', #42
     4160 => 'Canon EF-S 35mm f/2.8 Macro IS STM', #42
@@ -774,6 +774,7 @@ $VERSION = '4.19';
     0x4180000 => 'PowerShot G1 X Mark III', #IB
     0x6040000 => 'PowerShot S100 / Digital IXUS / IXY Digital',
     0x801     => 'PowerShot SX740 HS',
+    0x804     => 'PowerShot G5 X Mark II',
     0x805     => 'PowerShot SX70 HS',
     0x808     => 'PowerShot G7 X Mark III',
 
@@ -8428,6 +8429,7 @@ my %filterConv = (
     },
     # CTBO - (CR3 files) int32u entry count N, N x (int32u index, int64u offset, int64u size)
     #        index: 1=XMP, 2=PRVW, 3=mdat, 4=?, 5=?
+    #        --> ignored when reading, but offsets are updated when writing
     CMT1 => { # (CR3 files)
         Name => 'IFD0',
         SubDirectory => {

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

@@ -42,6 +42,7 @@
 #              29) http://www.libtiff.org
 #              30) http://geotiff.maptools.org/spec/geotiffhome.html
 #              31) https://android.googlesource.com/platform/external/dng_sdk/+/refs/heads/master/source/dng_tag_codes.h
+#              32) Jeffry Friedl private communication
 #              IB) Iliah Borg private communication (LibRaw)
 #              JD) Jens Duttke private communication
 #------------------------------------------------------------------------------
@@ -55,7 +56,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '4.20';
+$VERSION = '4.21';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -2552,11 +2553,11 @@ my %sampleFormat = (
         PrintConv => {
             0 => 'Normal',
             1 => 'Custom',
-            # 2 - also seen (Apple iOS)
-            3 => 'HDR',      # non-standard (Apple iOS)
-            # 4 - also seen (Apple iOS) - normal image from iOS Camera app (ref http://regex.info/blog/lightroom-goodies/metadata-presets)
+            2 => 'HDR (no original saved)', #32 non-standard (Apple iOS)
+            3 => 'HDR (original saved)',    #32 non-standard (Apple iOS)
+            4 => 'Original (for HDR)',      #32 non-standard (Apple iOS)
             6 => 'Panorama', # non-standard (Apple iOS, horizontal or vertical)
-            # 7 - also seen (Apple iOS)
+            7 => 'Portrait HDR',            #32 non-standard (Apple iOS)
             8 => 'Portrait', # non-standard (Apple iOS, blurred background)
             # 9 - also seen (Apple iOS) (HDR Portrait?)
         },

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.72';
+$VERSION = '1.73';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -453,8 +453,9 @@ my %faceCategories = (
     0x104d => { #forum9634
         Name => 'CropMode',
         Writable => 'int16u',
-        PrintConv => {
+        PrintConv => { # (perhaps this is a bit mask?)
             0 => 'n/a',
+            1 => 'Full-frame on GFX', #IB
             2 => 'Sports Finder Mode', # (mechanical shutter)
             4 => 'Electronic Shutter 1.25x Crop', # (continuous high)
         },

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

@@ -49,7 +49,7 @@ use vars qw($VERSION %minoltaLensTypes %minoltaTeleconverters %minoltaColorMode
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.78';
+$VERSION = '2.79';
 
 # Full list of product codes for Sony-compatible Minolta lenses
 # (ref http://www.kb.sony.com/selfservice/documentLink.do?externalId=C1000570)
@@ -363,7 +363,9 @@ $VERSION = '2.78';
     137 => 'Cosina 70-210mm F2.8-4 AF', #11
     138 => 'Soligor 19-35mm F3.5-4.5', #11
     139 => 'Tokina AF 28-300mm F4-6.3', #IB
-    142 => 'Voigtlander 70-300mm F4.5-5.6', #JD
+    # (the following Cosina 70-300mm lens was also marketed as a Phoenix, Vivitar Series 1, and
+    # some sort of 3rd-party marketing as a Voightlander 70-300mm F4.5-5.6 SKOPAR AF, ref IB)
+    142 => 'Cosina AF 70-300mm F4.5-5.6 MC', #IB (was 'Voigtlander 70-300mm F4.5-5.6', #JD)
     146 => 'Voigtlander Macro APO-Lanthar 125mm F2.5 SL', #JD
     194 => 'Tamron SP AF 17-50mm F2.8 XR Di II LD Aspherical [IF]', #23 (Model A16)
     202 => 'Tamron SP AF 70-200mm F2.8 Di LD [IF] Macro', #JR (Model A001) (see also 255.7)

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.68';
+$VERSION = '3.69';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -333,6 +333,7 @@ sub GetAFPointGrid($$;$);
     'AA 48 88 A4 3C 3C D5 0E' => 'AF-S Nikkor 180-400mm f/4E TC1.4 FL ED VR + 1.4x TC',
     'AB 44 5C 8E 34 3C D6 CE' => 'AF-P Nikkor 70-300mm f/4.5-5.6E ED VR',
     'AB 44 5C 8E 34 3C D6 0E' => 'AF-P Nikkor 70-300mm f/4.5-5.6E ED VR',
+    'AB 44 5C 8E 34 3C D6 4E' => 'AF-P Nikkor 70-300mm f/4.5-5.6E ED VR', #IB
     'AC 54 3C 3C 0C 0C D7 46' => 'AF-S Nikkor 28mm f/1.4E ED',
     'AC 54 3C 3C 0C 0C D7 06' => 'AF-S Nikkor 28mm f/1.4E ED',
     'AD 3C A0 A0 3C 3C D8 0E' => 'AF-S Nikkor 500mm f/5.6E PF ED VR',

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

@@ -35,7 +35,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD %stdCase);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.50';
+$VERSION = '1.51';
 
 sub ProcessPNG_tEXt($$$);
 sub ProcessPNG_iTXt($$$);
@@ -797,8 +797,8 @@ sub FoundPNG($$$$;$$$$)
         my $tagName = $$tagInfo{Name};
         my $processed;
         if ($$tagInfo{SubDirectory}) {
-            if ($$et{OPTIONS}{Validate} and $$tagInfo{NonStandard} and not $wasCompressed) {
-                $et->Warn("Non-standard $$tagInfo{NonStandard} in PNG $tag chunk", 1);
+            if ($$et{OPTIONS}{Validate} and $$tagInfo{NonStandard}) {
+                $et->WarnOnce("Non-standard $$tagInfo{NonStandard} in PNG $tag chunk", 1);
             }
             my $subdir = $$tagInfo{SubDirectory};
             my $dirName = $$subdir{DirName} || $tagName;
@@ -1049,7 +1049,7 @@ sub ProcessProfile($$$)
             $$outBuff = $et->WriteDirectory(\%dirInfo, $tagTablePtr,
                                             \&Image::ExifTool::WriteTIFF);
             $$outBuff = $Image::ExifTool::exifAPP1hdr . $$outBuff if $$outBuff;
-            DoneDir($et, 'IFD0', $outBuff);
+            DoneDir($et, 'IFD0', $outBuff, $$tagInfo{NonStandard});
         } else {
             $processed = $et->ProcessTIFF(\%dirInfo);
         }
@@ -1063,7 +1063,7 @@ sub ProcessProfile($$$)
             return 1 unless $$editDirs{XMP};
             $$outBuff = $et->WriteDirectory(\%dirInfo, $tagTablePtr);
             $$outBuff and $$outBuff = $Image::ExifTool::xmpAPP1hdr . $$outBuff;
-            DoneDir($et, 'XMP', $outBuff, 1);
+            DoneDir($et, 'XMP', $outBuff, $$tagInfo{NonStandard});
         } else {
             $processed = $et->ProcessDirectory(\%dirInfo, $tagTablePtr);
         }
@@ -1079,7 +1079,7 @@ sub ProcessProfile($$$)
             }
             $$outBuff = $et->WriteDirectory(\%dirInfo, $tagTablePtr,
                                             \&Image::ExifTool::WriteTIFF);
-            DoneDir($et, 'IFD0', $outBuff);
+            DoneDir($et, 'IFD0', $outBuff, $$tagInfo{NonStandard});
         } else {
             $processed = $et->ProcessTIFF(\%dirInfo);
         }
@@ -1245,11 +1245,10 @@ sub ProcessPNG($$)
         $$et{ADD_PNG} = $et->GetNewTagInfoHash(
             \%Image::ExifTool::PNG::Main,
             \%Image::ExifTool::PNG::TextualData);
-        # NOTE: PNGDoneTag and PNGDoneDir are used to keep track of metadata added
-        # before the PNG IEND chunk is encountered.  Currently this is implemented
-        # only for XMP, but may be implemented in the future for other types - PH
+        # NOTE: PNGDoneTag is used to keep track of metadata added before the
+        # PNG IEND chunk is encountered.  Currently this is implemented only
+        # for XMP, but may be implemented in the future for other types - PH
         $$et{PNGDoneTag} = { };
-        $$et{PNGDoneDir} = { };
         # initialize with same directories, with PNG tags taking priority
         $et->InitWriteDirs(\%pngMap,'PNG');
         $editingXMP = $$et{EDIT_DIRS}{XMP};

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.14';
+$VERSION = '3.15';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -981,7 +981,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag2010h' },
     },{
         Name => 'Tag2010i', # ?
-        Condition => '$$self{Model} =~ /^(ILCE-(6400|7M3|7RM3|7RM4|9)|DSC-(RX10M4|RX100M6|RX100M5A|HX99|RX0M2))\b/',
+        Condition => '$$self{Model} =~ /^(ILCE-(6400|7M3|7RM3|7RM4|9)|DSC-(RX10M4|RX100M6|RX100M5A|RX100M7|HX99|RX0M2))\b/',
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag2010i' },
     },{
         Name => 'Tag_0x2010',
@@ -1057,7 +1057,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
         # FocusMode for SLT/HV/ILCA and NEX/ILCE; doesn't seem to apply to DSC models (always 0)
         #    from 2018: at least DSC-RX10M4 and RX100M6 also use this tag
         Name => 'FocusMode',
-        Condition => '($$self{Model} !~ /^DSC-/) or ($$self{Model} =~ /^DSC-(RX10M4|RX100M6|RX100M5A|HX99|RX0M2)/)',
+        Condition => '($$self{Model} !~ /^DSC-/) or ($$self{Model} =~ /^DSC-(RX10M4|RX100M6|RX100M7|RX100M5A|HX99|RX0M2)/)',
         Writable => 'int8u',
         Priority => 0,
         PrintConv => {
@@ -1089,7 +1089,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
             },
         },{
             Name => 'AFAreaModeSetting',
-            Condition => '$$self{Model} =~ /^(NEX-|ILCE-|DSC-(RX10M4|RX100M6|RX100M5A|HX99|RX0M2))/',
+            Condition => '$$self{Model} =~ /^(NEX-|ILCE-|DSC-(RX10M4|RX100M6|RX100M7|RX100M5A|HX99|RX0M2))/',
             Notes => 'NEX, ILCE and some DSC models',
             RawConv => '$$self{AFAreaILCE} = $val',
             DataMember => 'AFAreaILCE',
@@ -1125,7 +1125,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
         # observed values in range (0 0) to (640 480), with center (320 240) often seen
         # for NEX-5R/6, positions appear to be in an 11x9 grid
         Name => 'FlexibleSpotPosition',
-        Condition => '$$self{Model} =~ /^(NEX-|ILCE-|DSC-(RX10M4|RX100M6|RX100M5A|HX99|RX0M2))/',
+        Condition => '$$self{Model} =~ /^(NEX-|ILCE-|DSC-(RX10M4|RX100M6|RX100M7|RX100M5A|HX99|RX0M2))/',
         Writable => 'int16u',
         Count => 2,
         Notes => q{
@@ -1285,7 +1285,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
     #    from 2018: at least DSC-RX10M4 and RX100M6 also use this tag
     0x2021 => { #JR
         Name => 'AFTracking',
-        Condition => '($$self{Model} !~ /^DSC-/) or ($$self{Model} =~ /^DSC-(RX10M4|RX100M6|RX100M5A|HX99|RX0M2)/)',
+        Condition => '($$self{Model} !~ /^DSC-/) or ($$self{Model} =~ /^DSC-(RX10M4|RX100M6|RX100M7|RX100M5A|HX99|RX0M2)/)',
         Writable => 'int8u',
         PrintConv => {
             0 => 'Off',
@@ -7835,7 +7835,7 @@ my %isoSetting2010 = (
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     0x0009 => { %releaseMode2 },
     0x000a => [{
-        Condition => '$$self{Model} =~ /^(ILCE-(6400|7M3|7RM3|7RM4|9)|DSC-(RX10M4|RX100M6|RX100M5A|HX99|RX0M2))\b/',
+        Condition => '$$self{Model} =~ /^(ILCE-(6400|7M3|7RM3|7RM4|9)|DSC-(RX10M4|RX100M6|RX100M7|RX100M5A|HX99|RX0M2))\b/',
         Name => 'ShotNumberSincePowerUp',
         Format => 'int8u',
     },{
@@ -8376,7 +8376,7 @@ my %isoSetting2010 = (
     },
     0x0342 => {
         Name => 'LensZoomPosition',
-        Condition => '$$self{Model} !~ /^(ILCA-|ILCE-(7RM2|7M3|7RM3|7RM4|7SM2|6300|6400|6500|9)|DSC-(HX80|HX90V|HX99|RX0|RX10M2|RX10M3|RX10M4|RX100M4|RX100M5|RX100M5A|RX100M6|WX500))/',
+        Condition => '$$self{Model} !~ /^(ILCA-|ILCE-(7RM2|7M3|7RM3|7RM4|7SM2|6300|6400|6500|9)|DSC-(HX80|HX90V|HX99|RX0|RX10M2|RX10M3|RX10M4|RX100M4|RX100M5|RX100M5A|RX100M6|RX100M7|WX500))/',
         Format => 'int16u',
         PrintConv => 'sprintf("%.0f%%",$val/10.24)',
         PrintConvInv => '$val=~s/ ?%$//; $val * 10.24',
@@ -8386,6 +8386,13 @@ my %isoSetting2010 = (
         Condition => '$$self{Model} =~ /^(ILCA-(68|77M2)|ILCE-(5000|5100|6000|7|7R|7S|QX1)|Lusso)\b/',
         Format => 'int16s[16]',
     },
+    0x034e => {
+        Name => 'LensZoomPosition',
+        Condition => '$$self{Model} =~ /^(DSC-(RX100M5|RX100M5A|RX100M6|RX100M7|RX10M4|HX99)|ILCE-(6400|7M3|7RM3|7RM4))/',
+        Format => 'int16u',
+        PrintConv => 'sprintf("%.0f%%",$val/10.24)',
+        PrintConvInv => '$val=~s/ ?%$//; $val * 10.24',
+    },
     0x0350 => {
         Name => 'VignettingCorrParams',
         Condition => '$$self{Model} =~ /^(ILCE-7M2)/',

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

@@ -3341,7 +3341,7 @@ my %tagLookup = (
 	'lenstype' => { 7 => 0xe2, 8 => 0xd, 9 => 0x1a7, 10 => 0xc, 11 => 0x111, 12 => 0xc, 13 => 0x14f, 14 => 0xd6, 15 => 0xde, 16 => 0xf6, 17 => 0xea, 18 => 0xff, 19 => [0xc,0x97], 20 => 0xe6, 21 => 0x153, 22 => 0xea, 23 => 0xe8, 24 => 0x127, 25 => 0x161, 26 => 0x166, 27 => 0x184, 28 => 0x112, 29 => 0x189, 34 => 0x16, 177 => 0x10c, 178 => 0x49bd, 215 => 0x83, 280 => 0x201, 293 => 0x16, 297 => 0x310, 299 => 0x303, 300 => 0x303, 302 => 0x51, 304 => 0x3405, 329 => 0x0, 330 => 0x0, 331 => 0x1, 332 => 0x1, 333 => 0x1, 335 => 0x0, 376 => 0xa003, 379 => 0x27, 400 => 0xb027, 412 => 0x1896, 414 => 0x18c2, 415 => 0x18f2, 416 => 0x17f6, 418 => 0x109, 419 => 0x109, 428 => 0x608, 429 => 0x62 },
 	'lenstype2' => { 389 => 0x3f7, 412 => 0x1893, 414 => 0x18bf, 415 => 0x18ef, 416 => 0x17f3, 418 => 0x107, 419 => 0x107, 428 => 0x605, 429 => 0x60 },
 	'lenstype3' => { 432 => 0x9 },
-	'lenszoomposition' => { 425 => 0x19, 426 => 0x1e, 429 => [0x342,0x35a] },
+	'lenszoomposition' => { 425 => 0x19, 426 => 0x1e, 429 => [0x342,0x34e,0x35a] },
 	'levelindicator' => { 310 => 0x15 },
 	'levelmeter' => { 362 => ['Lvlm','lvlm'] },
 	'levelorientation' => { 336 => 0x0 },

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 22995 tags, with 15044 unique tag names.
+They contain a total of 22996 tags, with 15044 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
@@ -17629,6 +17629,7 @@ RX10M3/RX10M4/RX100M3/RX100M4/RX100M5/RX100M5A/RX100M6/WX220/WX350, ILCE-7/
     100    DistortionCorrParams                 int16s[16]
     834    LensZoomPosition                     int16u
     842    VignettingCorrParams                 int16s[16]
+    846    LensZoomPosition                     int16u
     848    VignettingCorrParams                 int16s[16]
     858    LensZoomPosition                     int16u
     860    VignettingCorrParams                 int16s[16]
@@ -33589,20 +33590,20 @@ values, may created via the ExifTool configuration file.
                        GPS:GPSTimeStamp
   GPSDestLatitude      GPS:GPSDestLatitude      no
                        GPS:GPSDestLatitudeRef
-  GPSDestLatitudeRef   XMP:GPSDestLatitude      no
+  GPSDestLatitudeRef   XMP-exif:GPSDestLatitude no
   GPSDestLongitude     GPS:GPSDestLongitude     no
                        GPS:GPSDestLongitudeRef
-  GPSDestLongitudeRef  XMP:GPSDestLongitude     no
+  GPSDestLongitudeRef  XMP-exif:GPSDestLongitude no
   GPSLatitude          GPS:GPSLatitude          no
                        GPS:GPSLatitudeRef
   GPSLatitude          QuickTime:GPSCoordinates no
   GPSLatitude          QuickTime:LocationInformation no
-  GPSLatitudeRef       XMP:GPSLatitude          no
+  GPSLatitudeRef       XMP-exif:GPSLatitude     no
   GPSLongitude         GPS:GPSLongitude         no
                        GPS:GPSLongitudeRef
   GPSLongitude         QuickTime:GPSCoordinates no
   GPSLongitude         QuickTime:LocationInformation no
-  GPSLongitudeRef      XMP:GPSLongitude         no
+  GPSLongitudeRef      XMP-exif:GPSLongitude    no
   GPSPosition          GPSLatitude              no
                        GPSLongitude
   HyperfocalDistance   FocalLength              no

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

@@ -130,7 +130,6 @@ sub Add_iCCP($$)
         if (defined $buff and length $buff and WriteProfile($outfile, 'icm', \$buff)) {
             $et->VPrint(0, "Created ICC profile\n");
             delete $$et{ADD_DIRS}{ICC_Profile}; # don't add it again
-            $$et{PNGDoneDir}{ICC_Profile} = 2;
         }
     }
     return 1;
@@ -144,14 +143,15 @@ sub Add_iCCP($$)
 sub DoneDir($$$;$)
 {
     my ($et, $dir, $outBuff, $nonStandard) = @_;
-    $dir = 'IFD0' if $dir eq 'EXIF';
+    my $saveDir = $dir;
+    $dir = 'EXIF' if $dir eq 'IFD0';
     # don't add this directory again unless this is in a non-standard location
-    delete $$et{ADD_DIRS}{$dir} unless $nonStandard;
-    if ($nonStandard and $$et{DEL_GROUP}{$dir}) {
+    if (not $nonStandard) {
+        delete $$et{ADD_DIRS}{$dir};
+        delete $$et{ADD_DIRS}{IFD0} if $dir eq 'EXIF';
+    } elsif ($$et{DEL_GROUP}{$dir} or $$et{DEL_GROUP}{$saveDir}) {
         $et->VPrint(0,"  Deleting non-standard $dir\n");
         $$outBuff = '';
-    } elsif (not $$et{PNGDoneDir}{$dir}) {
-        $$et{PNGDoneDir}{$dir} = 1;   # set flag indicating the directory exists
     }
 }
 
@@ -341,8 +341,6 @@ sub AddChunks($$;@)
             next;
         }
         delete $$et{ADD_DIRS}{$dir};  # don't add again
-        # keep track of the directories that we added
-        $$et{PNGDoneDir}{$dir} = 2 if defined $buff and length $buff;
     }
     return not $err;
 }

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

@@ -3547,10 +3547,11 @@ sub GetNewValueHash($$;$$$$)
 
     if ($writeGroup) {
         # find the new value in the list with the specified write group
-        # (QuickTime and All are special cases because all group1 tags may be updated at once)
-        while ($nvHash and $$nvHash{WriteGroup} ne $writeGroup and
-            $$nvHash{WriteGroup} !~ /^(QuickTime|All)$/)
-        {
+        while ($nvHash and $$nvHash{WriteGroup} ne $writeGroup) {
+            # QuickTime and All are special cases because all group1 tags may be updated at once
+            last if $$nvHash{WriteGroup} =~ /^(QuickTime|All)$/;
+            # replace existing entry if WriteGroup is 'All' (avoids confusion of forum10349)
+            last if $$tagInfo{WriteGroup} and $$tagInfo{WriteGroup} eq 'All';
             $nvHash = $$nvHash{Next};
         }
     }

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

@@ -49,7 +49,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 require Exporter;
 
-$VERSION = '3.24';
+$VERSION = '3.25';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeXML UnescapeXML);
 
@@ -2236,7 +2236,7 @@ my %sPantryItem = (
     # get latitude/logitude reference from XMP lat/long tags
     # (used to set EXIF GPS position from XMP tags)
     GPSLatitudeRef => {
-        Require => 'XMP:GPSLatitude',
+        Require => 'XMP-exif:GPSLatitude',
         # Note: Do not Inihibit based on EXIF:GPSLatitudeRef (see forum10192)
         ValueConv => q{
             IsFloat($val[0]) and return $val[0] < 0 ? "S" : "N";
@@ -2246,7 +2246,7 @@ my %sPantryItem = (
         PrintConv => { N => 'North', S => 'South' },
     },
     GPSLongitudeRef => {
-        Require => 'XMP:GPSLongitude',
+        Require => 'XMP-exif:GPSLongitude',
         ValueConv => q{
             IsFloat($val[0]) and return $val[0] < 0 ? "W" : "E";
             $val[0] =~ /^.*([EW])/;
@@ -2255,7 +2255,7 @@ my %sPantryItem = (
         PrintConv => { E => 'East', W => 'West' },
     },
     GPSDestLatitudeRef => {
-        Require => 'XMP:GPSDestLatitude',
+        Require => 'XMP-exif:GPSDestLatitude',
         ValueConv => q{
             IsFloat($val[0]) and return $val[0] < 0 ? "S" : "N";
             $val[0] =~ /^.*([NS])/;
@@ -2264,7 +2264,7 @@ my %sPantryItem = (
         PrintConv => { N => 'North', S => 'South' },
     },
     GPSDestLongitudeRef => {
-        Require => 'XMP:GPSDestLongitude',
+        Require => 'XMP-exif:GPSDestLongitude',
         ValueConv => q{
             IsFloat($val[0]) and return $val[0] < 0 ? "W" : "E";
             $val[0] =~ /^.*([EW])/;

data/bin/perl-Image-ExifTool.spec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 11.60.0
+  version: 11.61.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool