exiftool_vendored 11.61.0 → 11.62.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65ea2b4bc54696ca9b8ded4b82cf20b63ccac35e
-  data.tar.gz: 2b940fd9b9756a41daf9b513c0cd8c6d2477a286
+  metadata.gz: fc94cfa90b14193e0341f4f89a55df3d76ce0d6e
+  data.tar.gz: 30ee5059a3860f00728a1b494a1e2c2214dbb53c
 SHA512:
-  metadata.gz: '08d346325378140b1eec45335a4c49b03bb1368c7eece40ffa62f4c252e6fda781e1feab4e339c86e8431f827e6eab8339c9f9c6a63944587d2f04ac5124b685'
-  data.tar.gz: b1fb4d3bd28b6561c247c5376d95a54b43c8af0a8c86c2ccb264edbb7b309ff75dc95c29344fe28c21055338ef5b6422ae9edb691ae3a9257ccc1b4e4ff60f02
+  metadata.gz: 7038421428a12c1241859e9b4618fb793b27402551223e6a75fa579fe8431176be2a50c55cfabcdffb1a2762f25bd3048966d708b93f8b58992b7778c2b90d56
+  data.tar.gz: b1a513de8056df7f840c39711a016558da24058a6d3cd5bc7c38839e02e717c10b6c28935d6d868d416f7071ae33f6d6f806ef2adb8794c2e162bceecd4b9298

data/bin/Changes

@@ -7,20 +7,31 @@ 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. 15, 2019 - Version 11.62
+
+  - Added a number of new Canon, Pentax, Sony and Sigma lenses (thanks LibRaw)
+  - Removed some extraneous verbose warnings when geotagging
+  - Removed Minolta LensType value for a non-existent lens (thanks LibRaw)
+  - Patched problem writing some simple qualified XMP values
+  - Patched to avoid writing files in Windows with Unicode surrogate characters
+    in their name unless the -overwrite_original_in_place option is used
+  - Fixed an incorrect Pentax LensType (thanks LibRaw)
+  - Fixed family 2 group names of some XMP-exifEX and XMP Composite tags
+
 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 few new 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
+  - Patched to avoid problems overriding new values when writing thumbnail and
+    preview images
 
 July 30, 2019 - Version 11.60
 

data/bin/META.json

@@ -47,6 +47,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "11.61",
+   "version" : "11.62",
    "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.61'
+version: '11.62'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

data/bin/README

@@ -76,7 +76,7 @@ See html/index.html for more details about ExifTool features.
 
 ExifTool can be downloaded from
 
-  http://owl.phy.queensu.ca/~phil/exiftool/
+  https://owl.phy.queensu.ca/~phil/exiftool/
 
 RUNNING
 
@@ -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.61.tar.gz | tar -xf -
-  cd Image-ExifTool-11.61
+  gzip -dc Image-ExifTool-11.62.tar.gz | tar -xf -
+  cd Image-ExifTool-11.62
   ./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.61';
+my $version = '11.62';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -3500,7 +3500,7 @@ sub ScanDir($$;$)
 {
     local $_;
     my ($et, $dir, $list) = @_;
-    my (@fileList, $done, $file, $utf8Name);
+    my (@fileList, $done, $file, $utf8Name, $winSurrogate);
     my $enc = $et->Options('CharsetFileName');
     # recode as UTF-8 if necessary
     if ($enc) {
@@ -3529,6 +3529,7 @@ sub ScanDir($$;$)
                     chomp $evalWarning;
                     $evalWarning =~ s/ at .*//s;
                     Warn "Warning: [Win32::FindFile] $evalWarning - $dir\n";
+                    $winSurrogate = 1 if $evalWarning =~ /surrogate/;
                 } else {
                     $et->Options(CharsetFileName => 'UTF8');    # now using UTF8
                     $utf8Name = 1;  # ReadDir returns UTF-8 file names
@@ -3568,6 +3569,16 @@ sub ScanDir($$;$)
             ScanDir($et, $path, $list);
             next;
         }
+        # Windows patch to avoid replacing filename containing Unicode surrogate with 8.3 name
+        if ($winSurrogate and $isWriting and
+            (not $overwriteOrig or $overwriteOrig != 2) and
+            not $doSetFileName and $file =~ /~/)   # (8.3 name will contain a tilde)
+        {
+            Warn("Not writing $path\n");
+            WarnOnce("Use -overwrite_original_in_place to write files with Unicode surrogate characters\n");
+            ++$countBad;
+            next;
+        }
         # apply rules from -ext options
         my $accepted;
         if ($filterFlag) {
@@ -5157,7 +5168,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 11.61 --
+    -- Generated by ExifTool 11.62 --
     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.61';
+$VERSION = '11.62';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -4638,6 +4638,7 @@ sub AddCompositeTags($;$)
             }
         }
         # make sure new TagID is unique by adding index if necessary
+        # (could only happen for UserDefined tags now that module name is added to tag ID)
         my $n = 0;
         while ($$compTable{$new}) {
             $new =~ s/-\d+$// if $n++;

data/bin/lib/Image/ExifTool.pod

@@ -531,8 +531,11 @@ without recoding.  Default is 0.
 
 Comma-delimited list of settings for writing compact XMP.  Below is a list
 of available settings.  Note that 'NoPadding' effects only embedded XMP
-since padding is never written for stand-alone XMP files.  Case is not
-significant.  Default is undef.
+since padding is never written for stand-alone XMP files.  Also note that
+'OneDesc' is not recommended when writing XMP larger than 64 kB to a JPG
+file because it interferes with ExifTool's technique of splitting off the
+large description elements into the extended XMP.  Case is not significant
+for any of these options.  Default is undef.
 
   NoPadding - Avoid 2 kB of recommended padding at end of XMP
   NoIndent  - Avoid spaces to indent lines for readability
@@ -1512,8 +1515,8 @@ Flag to replace the previous new values for this tag (ie. replace the values
 set in previous calls to L</SetNewValue>).  This option is most commonly
 used to replace previously-set new values for list-type tags.  Valid values
 are 0 (set new value normally -- adds to new values for list-type tags), 1
-(reset previous new values for this tag and replace with the specified new
-value) or 2 (reset previous new values only).
+(reset any previous new values before setting new value) or 2 (reset
+previous new values only; new value argument is ignored).
 
 =item Shift
 

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.20';
+$VERSION = '4.21';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -146,11 +146,13 @@ $VERSION = '4.20';
     26.3 => 'Tamron SP AF 180mm f/3.5 Di Macro', #15
     26.4 => 'Carl Zeiss Planar T* 50mm f/1.4', #PH
     26.5 => 'Voigtlander APO Lanthar 125mm F2.5 SL Macro', #JR
+    26.6 => 'Carl Zeiss Planar T 85mm f/1.4 ZE', #IB
     27 => 'Canon EF 35-80mm f/4-5.6', #32
     # 27 => 'Carl Zeiss Distagon T* 28mm f/2 ZF', #PH (must be with an adapter, because the ZF version is a Nikon mount)
     # 27 => 'EMF adapter for Canon EOS digital cameras', #50 (reports MaxFocalLength of 65535)
     # 27 => optix adapter
     # 27 => Venus Optics Laowa 12mm f2.8 Zero-D or 105mm f2 (T3.2) Smooth Trans Focus (ref IB)
+    # 27 => Venus Optics Laowa 105mm f2 STF (ref IB)
     28 => 'Canon EF 80-200mm f/4.5-5.6 or Tamron Lens', #32
     28.1 => 'Tamron SP AF 28-105mm f/2.8 LD Aspherical IF', #15
     28.2 => 'Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro', #4
@@ -197,6 +199,7 @@ $VERSION = '4.20';
     46 => 'Canon EF 28-90mm f/4-5.6', #32
     47 => 'Zeiss Milvus 35mm f/2 or 50mm f/2', #IB
     47.1 => 'Zeiss Milvus 50mm f/2 Makro', #IB
+    47.2 => 'Zeiss Milvus 135mm f/2 ZE', #IB
     48 => 'Canon EF-S 18-55mm f/3.5-5.6 IS', #20
     49 => 'Canon EF-S 55-250mm f/4-5.6 IS', #23
     50 => 'Canon EF-S 18-200mm f/3.5-5.6 IS',
@@ -214,6 +217,10 @@ $VERSION = '4.20';
     103.1 => 'Rokinon SP 14mm f/2.4', #IB
     103.2 => 'Rokinon AF 14mm f/2.8 EF', #IB
     106 => 'Rokinon SP / Samyang XP 35mm f/1.2', #IB
+    112 => 'Sigma 28mm f/1.5 FF High-speed Prime or other Sigma Lens', #IB
+    112.1 => 'Sigma 40mm f/1.5 FF High-speed Prime', #IB
+    112.2 => 'Sigma 105mm f/1.5 FF High-speed Prime', #IB
+    117 => 'Tamron 35-150mm f/2.8-4.0 Di VC OSD', #IB (A043)
     124 => 'Canon MP-E 65mm f/2.8 1-5x Macro Photo', #9
     125 => 'Canon TS-E 24mm f/3.5L',
     126 => 'Canon TS-E 45mm f/2.8', #15
@@ -230,6 +237,7 @@ $VERSION = '4.20';
            # 'Sigma APO 120-300mm f/2.8 EX DG HSM + 2x', #15
     131.6 => 'Sigma 4.5mm f/2.8 EX DC HSM Circular Fisheye', #PH
     131.7 => 'Sigma 70-200mm f/2.8 APO EX HSM', #PH (http://www.lensrentals.com/blog/2012/08/canon-illumination-correction-and-third-party-lenses)
+    131.8 => 'Sigma 28-70mm f/2.8-4 DG', #IB
     132 => 'Canon EF 1200mm f/5.6L USM', #32
     134 => 'Canon EF 600mm f/4L IS USM', #15
     135 => 'Canon EF 200mm f/1.8L USM',
@@ -251,6 +259,7 @@ $VERSION = '4.20';
    '137.14' => 'Tamron SP 24-70mm f/2.8 Di VC USD', #PH
    '137.15' => 'Sigma 18-35mm f/1.8 DC HSM', #David Monro
    '137.16' => 'Sigma 12-24mm f/4.5-5.6 DG HSM II', #IB
+   '137.17' => 'Sigma 70-300mm f/4-5.6 DG OS', #IB
     138 => 'Canon EF 28-80mm f/2.8-4L', #32
     139 => 'Canon EF 400mm f/2.8L USM',
     140 => 'Canon EF 500mm f/4.5L USM', #32
@@ -276,6 +285,7 @@ $VERSION = '4.20';
     152.2 => 'Sigma 14mm f/2.8 EX Aspherical HSM', #15
     152.3 => 'Sigma 10-20mm f/4-5.6', #14
     152.4 => 'Sigma 100-300mm f/4', # (ref Bozi)
+    152.5 => 'Sigma 300-800mm f/5.6 APO EX DG HSM', #IB
     153 => 'Canon EF 35-350mm f/3.5-5.6L USM or Sigma or Tamron Lens', #PH
     153.1 => 'Sigma 50-500mm f/4-6.3 APO HSM EX', #15
     153.2 => 'Tamron AF 28-300mm f/3.5-6.3 XR LD Aspherical [IF] Macro',
@@ -283,6 +293,8 @@ $VERSION = '4.20';
     153.4 => 'Tamron 18-250mm f/3.5-6.3 Di II LD Aspherical [IF] Macro', #PH
     154 => 'Canon EF 20mm f/2.8 USM or Zeiss Lens', #15
     154.1 => 'Zeiss Milvus 21mm f/2.8', #IB
+    154.2 => 'Zeiss Milvus 15mm f/2.8 ZE', #IB
+    154.3 => 'Zeiss Milvus 18mm f/2.8 ZE', #IB
     155 => 'Canon EF 85mm f/1.8 USM or Sigma Lens',
     155.1 => 'Sigma 14mm f/1.8 DG HSM | A', #IB (A017)
     156 => 'Canon EF 28-105mm f/3.5-4.5 USM or Tamron Lens',
@@ -320,18 +332,29 @@ $VERSION = '4.20';
     169.6 => 'Sigma 30mm f/1.4 EX DC HSM', #Rodolfo Borges
     169.7 => 'Sigma 35mm f/1.4 DG HSM', #PH (also "| A" version, ref 50)
     169.8 => 'Sigma 35mm f/1.5 FF High-Speed Prime | 017', #IB
-    170 => 'Canon EF 200mm f/2.8L II USM', #9
+    169.9 => 'Sigma 70mm f/2.8 Macro EX DG', #IB
+    170 => 'Canon EF 200mm f/2.8L II USM or Sigma Lens', #9
+    170.1 => 'Sigma 300mm f/2.8 APO EX DG HSM', #IB
+    170.2 => 'Sigma 800mm f/5.6 APO EX DG HSM', #IB
     171 => 'Canon EF 300mm f/4L USM', #15
     172 => 'Canon EF 400mm f/5.6L USM or Sigma Lens', #32
     172.1 =>'Sigma 150-600mm f/5-6.3 DG OS HSM | S', #50
+    172.2 => 'Sigma 500mm f/4.5 APO EX DG HSM', #IB
     173 => 'Canon EF 180mm Macro f/3.5L USM or Sigma Lens', #9
     173.1 => 'Sigma 180mm EX HSM Macro f/3.5', #14
     173.2 => 'Sigma APO Macro 150mm f/2.8 EX DG HSM', #14
+    173.3 => 'Sigma 10mm f/2.8 EX DC Fisheye', #IB
+    173.4 => 'Sigma 15mm f/2.8 EX DG Diagonal Fisheye', #IB
     174 => 'Canon EF 135mm f/2L USM or Other Lens', #9
     174.1 => 'Sigma 70-200mm f/2.8 EX DG APO OS HSM', #PH (probably version II of this lens)
     174.2 => 'Sigma 50-500mm f/4.5-6.3 APO DG OS HSM', #forum4031
     174.3 => 'Sigma 150-500mm f/5-6.3 APO DG OS HSM', #47
     174.4 => 'Zeiss Milvus 100mm f/2 Makro', #IB
+    174.5 => 'Sigma APO 50-150mm f/2.8 EX DC OS HSM', #IB
+    174.6 => 'Sigma APO 120-300mm f/2.8 EX DG OS HSM', #IB
+    174.7 => 'Sigma 120-300mm f/2.8 DG OS HSM S013', #IB
+    174.8 => 'Sigma 120-400mm f/4.5-5.6 APO DG OS HSM', #IB
+    174.9 => 'Sigma 200-500mm f/2.8 APO EX DG', #IB
     175 => 'Canon EF 400mm f/2.8L USM', #32
     176 => 'Canon EF 24-85mm f/3.5-4.5 USM',
     177 => 'Canon EF 300mm f/4L IS USM', #9
@@ -375,17 +398,19 @@ $VERSION = '4.20';
     196 => 'Canon EF 75-300mm f/4-5.6 USM', #15/32
     197 => 'Canon EF 75-300mm f/4-5.6 IS USM or Sigma Lens',
     197.1 => 'Sigma 18-300mm f/3.5-6.3 DC Macro OS HS', #50
-    198 => 'Canon EF 50mm f/1.4 USM or Zeiss Lens',
+    198 => 'Canon EF 50mm f/1.4 USM or Other Lens',
     198.1 => 'Zeiss Otus 55mm f/1.4 ZE', #JR (seen only on Sony camera)
     198.2 => 'Zeiss Otus 85mm f/1.4 ZE', #JR (NC)
     198.3 => 'Zeiss Milvus 25mm f/1.4', #IB
     198.4 => 'Zeiss Otus 100mm f/1.4', #IB
+    198.5 => 'Zeiss Milvus 35mm f/1.4 ZE', #IB
+    198.6 => 'Yongnuo YN 35mm f/2', #IB
     199 => 'Canon EF 28-80mm f/3.5-5.6 USM', #32
     200 => 'Canon EF 75-300mm f/4-5.6 USM', #32
     201 => 'Canon EF 28-80mm f/3.5-5.6 USM', #32
     202 => 'Canon EF 28-80mm f/3.5-5.6 USM IV',
     208 => 'Canon EF 22-55mm f/4-5.6 USM', #32
-    209 => 'Canon EF 55-200mm f/4.5-5.6', #32
+    209 => 'Canon EF 55-200mm f/4.5-5.6', #32 (USM mk I version? ref IB)
     210 => 'Canon EF 28-90mm f/4-5.6 USM', #32
     211 => 'Canon EF 28-200mm f/3.5-5.6 USM', #15
     212 => 'Canon EF 28-105mm f/4-5.6 USM', #15
@@ -397,6 +422,7 @@ $VERSION = '4.20';
     214 => 'Canon EF-S 18-55mm f/3.5-5.6 USM', #PH/34
     215 => 'Canon EF 55-200mm f/4.5-5.6 II USM',
     217 => 'Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD', #47
+    220 => 'Yongnuo YN 50mm f/1.8', #IB
     224 => 'Canon EF 70-200mm f/2.8L IS USM', #11
     225 => 'Canon EF 70-200mm f/2.8L IS USM + 1.4x', #11
     226 => 'Canon EF 70-200mm f/2.8L IS USM + 2x', #14
@@ -404,7 +430,8 @@ $VERSION = '4.20';
     228 => 'Canon EF 28-105mm f/3.5-4.5 USM', #32
     229 => 'Canon EF 16-35mm f/2.8L USM', #PH
     230 => 'Canon EF 24-70mm f/2.8L USM', #9
-    231 => 'Canon EF 17-40mm f/4L USM',
+    231 => 'Canon EF 17-40mm f/4L USM or Sigma Lens',
+    231.1 => 'Sigma 12-24mm f/4 DG HSM A016', #IB
     232 => 'Canon EF 70-300mm f/4.5-5.6 DO IS USM', #15
     233 => 'Canon EF 28-300mm f/3.5-5.6L IS USM', #PH
     234 => 'Canon EF-S 17-85mm f/4-5.6 IS USM or Tokina Lens', #19
@@ -428,11 +455,13 @@ $VERSION = '4.20';
     248.1 => 'Sigma 24-35mm f/2 DG HSM | A', #JR
     248.2 => 'Sigma 135mm f/2 FF High-Speed Prime | 017', #IB
     248.3 => 'Sigma 24-35mm f/2.2 FF Zoom | 017', #IB
+    248.4 => 'Sigma 135mm f/1.8 DG HSM A017', #IB
     249 => 'Canon EF 800mm f/5.6L IS USM', #35
     250 => 'Canon EF 24mm f/1.4L II USM or Sigma Lens', #41
     250.1 => 'Sigma 20mm f/1.4 DG HSM | A', #IB
     250.2 => 'Sigma 20mm f/1.5 FF High-Speed Prime | 017', #IB
     250.3 => 'Tokina Opera 16-28mm f/2.8 FF', #IB
+    250.4 => 'Sigma 85mm f/1.4 DG HSM A016', #IB
     251 => 'Canon EF 70-200mm f/2.8L IS II USM',
     251.1 => 'Canon EF 70-200mm f/2.8L IS III USM', #IB
     252 => 'Canon EF 70-200mm f/2.8L IS II USM + 1.4x', #50 (1.4x Mk II)
@@ -451,6 +480,9 @@ $VERSION = '4.20';
     368.5 => 'Sigma 28mm f/1.4 DG HSM | A', #IB (A019)
     368.6 => 'Sigma 150-600mm f/5-6.3 DG OS HSM | S', #50
     368.7 => 'Sigma 85mm f/1.4 DG HSM | A', #IB (016)
+    368.8 => 'Sigma 105mm f/1.4 DG HSM', #IB (A018)
+    368.9 => 'Sigma 14-24mm f/2.8 DG HSM', #IB (A018)
+   '368.10' => 'Sigma 70mm f/2.8 DG Macro', #IB (A018)
     # Note: LensType 488 (0x1e8) is reported as 232 (0xe8) in 7D CameraSettings
     488 => 'Canon EF-S 15-85mm f/3.5-5.6 IS USM', #PH
     489 => 'Canon EF 70-300mm f/4-5.6L IS USM', #Gerald Kapounek

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

@@ -25,7 +25,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:Public);
 
-$VERSION = '1.59';
+$VERSION = '1.60';
 
 sub JITTER() { return 2 }       # maximum time jitter
 
@@ -1135,7 +1135,7 @@ Category:       foreach $category (qw{pos track alt orient atemp}) {
             @r = $et->SetNewValue(GPSDateTime => "$gpsDate $gpsTime", %opts);
         }
     } else {
-        my %opts;
+        my %opts = ( IgnorePermanent => 1 );
         $opts{Replace} = 2 if defined $val; # remove existing new values
         $opts{Group} = $writeGroup if $writeGroup;
 

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.79';
+$VERSION = '2.81';
 
 # Full list of product codes for Sony-compatible Minolta lenses
 # (ref http://www.kb.sony.com/selfservice/documentLink.do?externalId=C1000570)
@@ -251,6 +251,7 @@ $VERSION = '2.79';
     25.5 => 'Sigma 24mm F1.8 EX DG ASP Macro', #Florian Knorn
     # 25 - also seen for an "old Sigma 50mm Macro" (forum2833)
     27 => 'Minolta AF 85mm F1.4 G (D)', # added (D) (ref 13)
+    # 27 => 'Venus Optics Laowa 105mm F2 STF', #IB (NC)
     28 => 'Minolta/Sony AF 100mm F2.8 Macro (D) or Tamron Lens',
     # 28 => 'Sony 100mm F2.8 Macro (SAL100M28)', (ref 18/JR)
     28.1 => 'Tamron SP AF 90mm F2.8 Di Macro', #JD (Model 272E)
@@ -288,8 +289,9 @@ $VERSION = '2.79';
     45 => 'Carl Zeiss Planar T* 85mm F1.4 ZA (SAL85F14Z)', #JR
     46 => 'Carl Zeiss Vario-Sonnar T* DT 16-80mm F3.5-4.5 ZA (SAL1680Z)', #JR
     47 => 'Carl Zeiss Sonnar T* 135mm F1.8 ZA (SAL135F18Z)', #JR
-    48 => 'Carl Zeiss Vario-Sonnar T* 24-70mm F2.8 ZA SSM (SAL2470Z) or ZA SSM II', #11/JR
+    48 => 'Carl Zeiss Vario-Sonnar T* 24-70mm F2.8 ZA SSM (SAL2470Z) or Other Lens', #11/JR
     48.1 => 'Carl Zeiss Vario-Sonnar T* 24-70mm F2.8 ZA SSM II (SAL2470Z2)', #JR
+    48.2 => 'Tamron SP 24-70mm F2.8 Di USD', #IB (A007)
     49 => 'Sony DT 55-200mm F4-5.6 (SAL55200)', #JD/JR
     50 => 'Sony DT 18-250mm F3.5-6.3 (SAL18250)', #11/JR
     51 => 'Sony DT 16-105mm F3.5-5.6 (SAL16105)', #11/JR
@@ -325,15 +327,15 @@ $VERSION = '2.79';
     # was 128.1 => 'Tamron 18-200mm F3.5-6.3',
     128.2 => 'Tamron AF 28-300mm F3.5-6.3 XR Di LD Aspherical [IF] Macro', #JR (Model A061)
     # was 128.2 => 'Tamron 28-300mm F3.5-6.3',
-    128.3 => 'Tamron 80-300mm F3.5-6.3',
-    128.4 => 'Tamron AF 28-200mm F3.8-5.6 XR Di Aspherical [IF] Macro', #JD (Model A031)
+    # (removed -- probably never existed, ref IB) 'Tamron 80-300mm F3.5-6.3',
+    128.3 => 'Tamron AF 28-200mm F3.8-5.6 XR Di Aspherical [IF] Macro', #JD (Model A031)
    # also Tamron AF 28-200mm F3.8-5.6 Aspherical', #IB (Model 71D)
    # and 'Tamron AF 28-200mm F3.8-5.6 LD Aspherical [IF] Super', #IB (Model 171D)
-    128.5 => 'Tamron SP AF 17-35mm F2.8-4 Di LD Aspherical IF', #JD (Model A05)
-    128.6 => 'Sigma AF 50-150mm F2.8 EX DC APO HSM II', #JD
-    128.7 => 'Sigma 10-20mm F3.5 EX DC HSM', #11 (Model 202-205)
-    128.8 => 'Sigma 70-200mm F2.8 II EX DG APO MACRO HSM', #24
-    128.9 => 'Sigma 10mm F2.8 EX DC HSM Fisheye', #Florian Knorn
+    128.4 => 'Tamron SP AF 17-35mm F2.8-4 Di LD Aspherical IF', #JD (Model A05)
+    128.5 => 'Sigma AF 50-150mm F2.8 EX DC APO HSM II', #JD
+    128.6 => 'Sigma 10-20mm F3.5 EX DC HSM', #11 (Model 202-205)
+    128.7 => 'Sigma 70-200mm F2.8 II EX DG APO MACRO HSM', #24
+    128.8 => 'Sigma 10mm F2.8 EX DC HSM Fisheye', #Florian Knorn
     # (yes, '128.10'.  My condolences to typed languages that use this database - PH)
    '128.10' => 'Sigma 50mm F1.4 EX DG HSM', #Florian Knorn (Model A014, ref IB)
    '128.11' => 'Sigma 85mm F1.4 EX DG HSM', #27
@@ -412,10 +414,11 @@ $VERSION = '2.79';
     25521.7 => 'Angenieux AF 28-70mm F2.6', #JD
     25521.8 => 'Tokina AT-X 17 AF 17mm F3.5', #27
     25521.9 => 'Tokina 20-35mm F3.5-4.5 II AF', #IB
-    25531 => 'Minolta AF 28-135mm F4-4.5 or Sigma Lens',
+    25531 => 'Minolta AF 28-135mm F4-4.5 or Other Lens',
     25531.1 => 'Sigma ZOOM-alpha 35-135mm F3.5-4.5', #16
     25531.2 => 'Sigma 28-105mm F2.8-4 Aspherical', #JD
     25531.3 => 'Sigma 28-105mm F4-5.6 UC', #JR
+    25531.4 => 'Tokina AT-X 242 AF 24-200mm F3.5-5.6', #IB
     25541 => 'Minolta AF 35-105mm F3.5-4.5', #13
     25551 => 'Minolta AF 70-210mm F4 Macro or Sigma Lens',
     25551.1 => 'Sigma 70-210mm F4-5.6 APO', #7
@@ -502,7 +505,7 @@ $VERSION = '2.79';
     26241 => 'Minolta AF 35-80mm F4-5.6 Power Zoom',
     26281 => 'Minolta AF 80-200mm F2.8 HS-APO G', #11 ("HS-APO" added, white, probably same as 1, non-HS is 25891 - ref JR)
     26291 => 'Minolta AF 85mm F1.4 New',
-    26311 => 'Minolta/Sony AF 100-300mm F4.5-5.6 APO', #11
+    26311 => 'Minolta/Sony AF 100-300mm F4.5-5.6 APO', #11 (does not exist? https://www.dyxum.com/dforum/lens-data-requested_topic23435_page2.html)
     26321 => 'Minolta AF 24-50mm F4 New',
     26381 => 'Minolta AF 50mm F2.8 Macro New',
     26391 => 'Minolta AF 100mm F2.8 Macro',
@@ -517,6 +520,7 @@ $VERSION = '2.79';
     # - this is the base to which the Canon LensType is added
     30464 => 'Metabones Canon EF Speed Booster', #Metabones (to this, add Canon LensType)
     45671 => 'Tokina 70-210mm F4-5.6', #22
+    45681 => 'Tokina AF 35-200mm F4-5.6 Zoom SD', #IB (model 352)
     45701 => 'Tamron AF 35-135mm F3.5-4.5', #IB (model 40d)
     45711 => 'Vivitar 70-210mm F4.5-5.6', #IB
     45741 => '2x Teleconverter or Tamron or Tokina Lens', #18

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

@@ -39,7 +39,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::APP12;
 
-$VERSION = '2.59';
+$VERSION = '2.60';
 
 sub PrintLensInfo($$$);
 
@@ -1066,6 +1066,7 @@ my %indexInfo = (
     0x1035 => { #6
         Name => 'PreviewImageValid',
         Writable => 'int32u',
+        DelValue => 0,
         PrintConv => { 0 => 'No', 1 => 'Yes' },
     },
     0x1036 => { #6

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

@@ -36,7 +36,7 @@ use vars qw($VERSION %leicaLensTypes);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.05';
+$VERSION = '2.06';
 
 sub ProcessLeicaLEIC($$$);
 sub WhiteBalanceConv($;$$);
@@ -108,7 +108,8 @@ sub WhiteBalanceConv($;$$);
     39 => 'Macro-Elmar-M 90mm f/4',         # 11633/11634
     '39 0' => 'Tele-Elmar-M 135mm f/4 (II)',# 11861
     40 => 'Macro-Adapter M',                # 14409
-    '41 3' => 'Apo-Summicron-M 50mm f/2 Asph', #16
+    41 => 'Apo-Summicron-M 50mm f/2 ASPH.', #IB
+    '41 3' => 'Apo-Summicron-M 50mm f/2 ASPH.', #16
     42 => 'Tri-Elmar-M 28-35-50mm f/4 ASPH.',# 11625
     '42 1' => 'Tri-Elmar-M 28-35-50mm f/4 ASPH. (at 28mm)',
     '42 2' => 'Tri-Elmar-M 28-35-50mm f/4 ASPH. (at 35mm)',
@@ -123,8 +124,9 @@ sub WhiteBalanceConv($;$$);
     50 => 'Elmar-M 24mm f/3.8 ASPH.',       # ? (ref 11)
     51 => 'Super-Elmar-M 21mm f/3.4 Asph',  # ? (ref 16, frameSelectorBits=1)
     '51 2' => 'Super-Elmar-M 14mm f/3.8 Asph', # ? (ref 16)
-    52 => 'Super-Elmar-M 18mm f/3.8 ASPH.', # ? (ref PH/11)
-    '53 2' => 'Apo-Telyt-M 135mm f/3.4', #16
+    52 => 'Apo-Telyt-M 18mm f/3.8 ASPH.', # ? (ref PH/11)
+    53 => 'Apo-Telyt-M 135mm f/3.4',        #IB
+    '53 2' => 'Apo-Telyt-M 135mm f/3.4',    #16
     '53 3' => 'Apo-Summicron-M 50mm f/2 (VI)', #LR
     58 => 'Noctilux-M 75mm f/1.25 ASPH.',   # ? (ref IB)
 );

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

@@ -58,7 +58,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.28';
+$VERSION = '3.29';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -146,7 +146,7 @@ sub DecodeAFPoints($$$$;$);
     '3 44.3' => 'Sigma 17-70mm F2.8-4.5 DC Macro', #(Bart Hickman)
     '3 44.4' => 'Sigma 18-50mm F3.5-5.6 DC', #4
     '3 44.5' => 'Sigma 17-35mm F2.8-4 EX DG', #29
-    '3 44.6' => 'Tamron 35-90mm F4 AF', #12
+    '3 44.6' => 'Tamron 35-90mm F4-5.6 AF', #12 (added "-5.6", ref IB)
     '3 44.7' => 'Sigma AF 18-35mm F3.5-4.5 Aspherical', #29
     '3 46' => 'Sigma or Samsung Lens (3 46)',
     '3 46.1' => 'Sigma APO 70-200mm F2.8 EX',
@@ -306,6 +306,7 @@ sub DecodeAFPoints($$$$;$);
     '8 0' => 'Sigma 50-150mm F2.8 II APO EX DC HSM', #forum2997
     '8 3' => 'Sigma 18-125mm F3.8-5.6 DC HSM', #forum10167
     '8 4' => 'Sigma 50mm F1.4 EX DG HSM', #Artur private communication
+    '8 6' => 'Sigma 4.5mm F2.8 EX DC Fisheye', #IB
     '8 7' => 'Sigma 24-70mm F2.8 IF EX DG HSM', #Exiv2
     '8 8' => 'Sigma 18-250mm F3.5-6.3 DC OS HSM', #27
     '8 11' => 'Sigma 10-20mm F3.5 EX DC HSM', #27
@@ -316,6 +317,7 @@ sub DecodeAFPoints($$$$;$);
     '8 16' => 'Sigma 70-200mm F2.8 EX DG Macro HSM II', #26
     '8 17' => 'Sigma 50-500mm F4.5-6.3 DG OS HSM', #(Heike Herrmann) (also APO, ref 26)
     '8 18' => 'Sigma 8-16mm F4.5-5.6 DC HSM', #forum2998
+    '8 20' => 'Sigma 18-50mm F2.8-4.5 DC HSM', #IB
     '8 21' => 'Sigma 17-50mm F2.8 EX DC OS HSM', #26
     '8 22' => 'Sigma 85mm F1.4 EX DG HSM', #26
     '8 23' => 'Sigma 70-200mm F2.8 APO EX DG OS HSM', #27

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

@@ -19,7 +19,7 @@ use strict;
 use vars qw($VERSION %sigmaLensTypes);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.26';
+$VERSION = '1.27';
 
 # sigma LensType lookup (ref IB)
 %sigmaLensTypes = (
@@ -118,6 +118,8 @@ $VERSION = '1.26';
     0x484 => 'Sigma 8mm F4 EX DG Circular Fisheye',
     0x485 => 'Sigma 8mm F3.5 EX DG Circular Fisheye',
     0x486 => 'Sigma 4.5mm F2.8 EX DC HSM Circular Fisheye',
+    0x504 => 'Sigma 70-300mm F4-5.6 Macro Super', #IB
+    0x505 => 'Sigma APO 70-300mm F4-5.6 Macro Super', #IB
     0x506 => 'Sigma 70-300mm F4-5.6 APO Macro Super II',
     0x507 => 'Sigma 70-300mm F4-5.6 DL Macro Super II',
     0x508 => 'Sigma 70-300mm F4-5.6 DG APO Macro',

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

@@ -1203,7 +1203,9 @@ sub WriteXMP($$;$)
                         $et->Warn("$grp:$$tagInfo{Name} written as a literal because value is not a valid URI", 1);
                         # fall through to write as a string literal
                     }
-                    delete $attrs{'rdf:resource'};  # (remove existing resource if necessary)
+                    # remove existing value and/or resource attribute if they exist
+                    delete $attrs{'rdf:value'};
+                    delete $attrs{'rdf:resource'};
                     $capture{$path} = [ $newValue, \%attrs ];
                     last;
                 }

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

@@ -270,6 +270,7 @@ my %ignorePrintConv = map { $_ => 1 } qw(OTHER BITMASK Notes);
 #           NoFlat => treat flattened tags as 'unsafe'
 #           NoShortcut => true to prevent looking up shortcut tags
 #           ProtectSaved => protect existing new values with a save count greater than this
+#           IgnorePermanent => ignore attempts to delete a permanent tag
 #           CreateGroups => [internal use] createGroups hash ref from related tags
 #           ListOnly => [internal use] set only list or non-list tags
 #           SetTags => [internal use] hash ref to return tagInfo refs of set tags
@@ -891,6 +892,7 @@ TAG: foreach $tagInfo (@matchingTags) {
                 next;
             }
         } elsif ($permanent) {
+            return 0 if $options{IgnorePermanent};
             # can't delete permanent tags, so set them to DelValue or empty string instead
             if (defined $$tagInfo{DelValue}) {
                 $val = $$tagInfo{DelValue};
@@ -1125,6 +1127,9 @@ WriteAlso:
                 undef $evalWarning;
                 #### eval WriteAlso ($val)
                 my $v = eval $$writeAlso{$wtag};
+                # we wanted to do the eval in case there are side effect, but we
+                # don't want to write a value for a tag that is being deleted:
+                undef $v unless defined $val;
                 $@ and $evalWarning = $@;
                 unless ($evalWarning) {
                     ($n,$evalWarning) = $self->SetNewValue($wgrp . $wtag, $v, %opts);

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

@@ -49,7 +49,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 require Exporter;
 
-$VERSION = '3.25';
+$VERSION = '3.26';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeXML UnescapeXML);
 
@@ -2056,10 +2056,11 @@ my %sPantryItem = (
         Writable => 'integer',
     },
     CameraOwnerName     => { Name => 'OwnerName' },
-    BodySerialNumber    => { Name => 'SerialNumber' },
+    BodySerialNumber    => { Name => 'SerialNumber', Groups => { 2 => 'Camera' } },
     LensSpecification => {
         Name => 'LensInfo',
         Writable => 'rational',
+        Groups => { 2 => 'Camera' },
         List => 'Seq',
         RawJoin => 1, # join list into a string before ValueConv
         ValueConv => \&ConvertRationalList,
@@ -2083,9 +2084,9 @@ my %sPantryItem = (
             instead of using the existing XMP-aux:LensInfo
         },
     },
-    LensMake            => { },
-    LensModel           => { },
-    LensSerialNumber    => { },
+    LensMake            => { Groups => { 2 => 'Camera' } },
+    LensModel           => { Groups => { 2 => 'Camera' } },
+    LensSerialNumber    => { Groups => { 2 => 'Camera' } },
     InteroperabilityIndex => {
         Name => 'InteropIndex',
         Description => 'Interoperability Index',
@@ -2237,6 +2238,7 @@ my %sPantryItem = (
     # (used to set EXIF GPS position from XMP tags)
     GPSLatitudeRef => {
         Require => 'XMP-exif:GPSLatitude',
+        Groups => { 2 => 'Location' },
         # Note: Do not Inihibit based on EXIF:GPSLatitudeRef (see forum10192)
         ValueConv => q{
             IsFloat($val[0]) and return $val[0] < 0 ? "S" : "N";
@@ -2247,6 +2249,7 @@ my %sPantryItem = (
     },
     GPSLongitudeRef => {
         Require => 'XMP-exif:GPSLongitude',
+        Groups => { 2 => 'Location' },
         ValueConv => q{
             IsFloat($val[0]) and return $val[0] < 0 ? "W" : "E";
             $val[0] =~ /^.*([EW])/;
@@ -2256,6 +2259,7 @@ my %sPantryItem = (
     },
     GPSDestLatitudeRef => {
         Require => 'XMP-exif:GPSDestLatitude',
+        Groups => { 2 => 'Location' },
         ValueConv => q{
             IsFloat($val[0]) and return $val[0] < 0 ? "S" : "N";
             $val[0] =~ /^.*([NS])/;
@@ -2265,6 +2269,7 @@ my %sPantryItem = (
     },
     GPSDestLongitudeRef => {
         Require => 'XMP-exif:GPSDestLongitude',
+        Groups => { 2 => 'Location' },
         ValueConv => q{
             IsFloat($val[0]) and return $val[0] < 0 ? "W" : "E";
             $val[0] =~ /^.*([EW])/;
@@ -2287,6 +2292,7 @@ my %sPantryItem = (
         Inhibit => {
             6 => 'Composite:LensID',    # don't override existing Composite:LensID
         },
+        Groups => { 2 => 'Camera' },
         ValueConv => '$val',
         PrintConv => 'Image::ExifTool::XMP::PrintLensID($self, @val)',
     },
@@ -2300,6 +2306,7 @@ my %sPantryItem = (
             4 => 'XMP:FlashRedEyeMode',
             5 => 'XMP:Flash', # handle structured flash information too
         },
+        Groups => { 2 => 'Camera' },
         Writable => 1,
         PrintHex => 1,
         SeparateTable => 'EXIF Flash',

data/bin/perl-Image-ExifTool.spec

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

metadata

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