exiftool_vendored 11.79.0 → 11.80.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c5d7697ab503656431405bee98df6543291a04e
-  data.tar.gz: c85b5373e9273395de8f0eedf0ec75813f197568
+  metadata.gz: 31e5c0c123db980d212dfb83add8dd6fa6134d00
+  data.tar.gz: 551490100ae182f14dc7096534861c60b0e5aed9
 SHA512:
-  metadata.gz: 190d023af7d59ea2c41e2d43b2f252e8048bc3618d5e7e85e7bd0a6623ea9f2c85f0e010154a0bb49a2d9ca46acd4912415957e7eb88ed25011a9ae133bdad60
-  data.tar.gz: 05f098d6d3265adf42ea4669a554d84b55b6d1213fce9dbe31fb9df174298323d668b9cf86df1245bacb2b6ea370d4fc1e2a50d22a0be4b967b194a26f3888e6
+  metadata.gz: b1ab651417aea07d82635d2152192dfb48f566d088fe36d717066ef5ab26e0d288501c7c331597f2d7fda28cd8fd513c42b2456cc59aca197917fa7790e1a643
+  data.tar.gz: 427b08f65545027e38e3078e50e8dab78adb4de80a3cd64094a0171556092ec9250b4049a5f6d6878664ba9bbf6582a78066e9a76eb399165b114fbd426de974

data/bin/Changes

@@ -7,6 +7,19 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 11.70. (Other versions are
 considered development releases, and are not uploaded to CPAN.)
 
+Dec. 17, 2019 - Version 11.80
+
+  - Added a new Canon LensType
+  - Added a new Nikon Z LensID (thanks LibRaw)
+  - Added a few new Sony LensType values (thanks Jos Roost)
+  - Attempt to improve reliability of Samsung DepthMapWidth/Height decoding
+  - Updated a number of Canon-mount Tamron lens names to include the Tamron
+    model number
+  - Patched MOV/MP4 writer to allow a small amount of garbage at the end of a
+    file to be deleted when writing with the -m option
+  - Fixed bug where some Composite tags may not have taken priority over other
+    tags as they should have
+
 Dec. 12, 2019 - Version 11.79
 
   - Added support for AVIF files

data/bin/META.json

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

data/bin/README

@@ -105,8 +105,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.79.tar.gz | tar -xf -
-  cd Image-ExifTool-11.79
+  gzip -dc Image-ExifTool-11.80.tar.gz | tar -xf -
+  cd Image-ExifTool-11.80
   ./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.79';
+my $version = '11.80';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -4481,15 +4481,15 @@ C<-1IPTC:City>).  Use the B<-listg> option to list available group names by
 family.
 
 A special tag name of C<All> may be used to indicate all meta information
-(ie. B<-All>). This is particularly useful when a group name is specified to
-extract all information in a group (but beware that unless the B<-a> option
-is also used, some tags in the group may be suppressed by same-named tags in
-other groups).  The wildcard characters C<?> and C<*> may be used in a tag
-name to match any single character and zero or more characters respectively.
- These may not be used in a group name, with the exception that a group name
-of C<*> (or C<All>) may be used to extract all instances of a tag (as if
-B<-a> was used). Note that arguments containing wildcards must be quoted on
-the command line of most systems to prevent shell globbing.
+(ie. B<-All>).  This is particularly useful when a group name is specified
+to extract all information in a group (but beware that unless the B<-a>
+option is also used, some tags in the group may be suppressed by same-named
+tags in other groups).  The wildcard characters C<?> and C<*> may be used in
+a tag name to match any single character and zero or more characters
+respectively. These may not be used in a group name, with the exception that
+a group name of C<*> (or C<All>) may be used to extract all instances of a
+tag (as if B<-a> was used).  Note that arguments containing wildcards must
+be quoted on the command line of most systems to prevent shell globbing.
 
 A C<#> may be appended to the tag name to disable the print conversion on a
 per-tag basis (see the B<-n> option).  This may also be used when writing or
@@ -4745,6 +4745,16 @@ in a string.  Another difference is that a minor warning is generated if a
 tag doesn't exist when interpolating its value in a string (with C<$>), but
 isn't when copying the tag directly.
 
+Finally, the behaviour is different when a destination tag or group of
+C<All> is used.  When copying directly, a destination group and/or tag name
+of C<All> writes to the same family 1 group and/or tag name as the source. 
+But when interpolated in a string, the identity of the source tags are lost
+and the value is written to all possible groups/tags.  For example, the
+string form must be used in the following command since the intent is to set
+the value of all existing date/time tags from C<CreateDate>:
+
+    exiftool "-time:all<$createdate" -wm w FILE
+
 =item B<-x> I<TAG> (B<-exclude>)
 
 Exclude the specified tag.  There may be multiple B<-x> options.  This has
@@ -5180,7 +5190,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 11.79 --
+    -- Generated by ExifTool 11.80 --
     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 $testLen);
 
-$VERSION = '11.79';
+$VERSION = '11.80';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -3401,7 +3401,8 @@ sub BuildCompositeTags($)
     my $compTable = GetTagTable('Image::ExifTool::Composite');
     my @tagList = sort keys %$compTable;
     my $rawValue = $$self{VALUE};
-    my (%tagsUsed, %cache, $allBuilt);
+    my $compKeys = $$self{COMP_KEYS};
+    my (%cache, $allBuilt);
 
     for (;;) {
         my (%notBuilt, $tag, @deferredTags);
@@ -3503,6 +3504,11 @@ COMPOSITE_TAG:
                 if ($docNum) {
                     if ($found) {
                         $$self{DOC_NUM} = $docNum;
+                        # save pointers to all used tag keys
+                        foreach (keys %tagKey) {
+                            $$compKeys{$_} or $$compKeys{$_} = [ ];
+                            push @{$$compKeys{$tagKey{$_}}}, [ \%tagKey, $_ ];
+                        }
                         $self->FoundTag($tagInfo, \%tagKey);
                         delete $$self{DOC_NUM};
                     }
@@ -3516,19 +3522,14 @@ COMPOSITE_TAG:
                         # can be replaced (also eliminates keys with
                         # instance numbers which can't be replaced either)
                         next unless $compositeID{$tagKey{$_}};
-                        my $keyRef = \$tagKey{$_};
-                        $tagsUsed{$$keyRef} or $tagsUsed{$$keyRef} = [ ];
-                        push @{$tagsUsed{$$keyRef}}, $keyRef;
+                    }
+                    # save pointers to all used tag keys
+                    foreach (keys %tagKey) {
+                        $$compKeys{$_} or $$compKeys{$_} = [ ];
+                        push @{$$compKeys{$tagKey{$_}}}, [ \%tagKey, $_ ];
                     }
                     # save reference to tag key lookup as value for Composite tag
                     my $key = $self->FoundTag($tagInfo, \%tagKey);
-                    # check to see if we just replaced one of the tag keys we Require'd
-                    if (defined $key and $tagsUsed{$key}) {
-                        foreach (@{$tagsUsed{$key}}) {
-                            $$_ = $$self{MOVED_KEY};    # replace with new tag key
-                        }
-                        delete $tagsUsed{$key};         # can't be replaced again
-                    }
                 } elsif (not defined $found) {
                     delete $notBuilt{$tagName}; # tag can't be built anyway
                 }
@@ -3733,6 +3734,7 @@ sub Init($)
     $$self{WRITTEN}    = { };       # list of tags written (selected tags only)
     $$self{FORCE_WRITE}= { };       # ForceWrite lookup (set from ForceWrite tag)
     $$self{FOUND_DIR}  = { };       # hash of directory names found in file
+    $$self{COMP_KEYS}  = { };       # lookup for tag keys used in Composite tags
     $$self{PATH}       = [ ];       # current subdirectory path in file when reading
     $$self{NUM_FOUND}  = 0;         # total number of tags found (incl. duplicates)
     $$self{CHANGED}    = 0;         # number of tags changed (writer only)
@@ -7867,10 +7869,12 @@ sub FoundTag($$$;@)
         } else {
             $priority = 1;  # the normal default
         }
-        if ($priority >= $oldPriority and not $$self{DOC_NUM} and not $noListDel) {
+        if ($priority >= $oldPriority and (not $$self{DOC_NUM} or
+            ($$self{TAG_EXTRA}{$tag} and $$self{TAG_EXTRA}{$tag}{G3} and
+             $$self{DOC_NUM} eq $$self{TAG_EXTRA}{$tag}{G3})) and not $noListDel)
+        {
             # move existing tag out of the way since this tag is higher priority
             # (NOTE: any new members added here must also be added to DeleteTag())
-            $$self{MOVED_KEY} = $nextTag;  # used in BuildCompositeTags()
             $$self{PRIORITY}{$nextTag} = $$self{PRIORITY}{$tag};
             $$valueHash{$nextTag} = $$valueHash{$tag};
             $$self{FILE_ORDER}{$nextTag} = $$self{FILE_ORDER}{$tag};
@@ -7884,6 +7888,12 @@ sub FoundTag($$$;@)
             delete $$self{BOTH}{$tag};
             # update tag key for list if necessary
             $$self{LIST_TAGS}{$oldInfo} = $nextTag if $$self{LIST_TAGS}{$oldInfo};
+            # update this key if used in a Composite tag
+            if ($$self{COMP_KEYS}{$tag}) {
+                $$_[0]{$$_[1]} = $nextTag foreach @{$$self{COMP_KEYS}{$tag}};
+                $$self{COMP_KEYS}{$nextTag} = $$self{COMP_KEYS}{$tag};
+                delete $$self{COMP_KEYS}{$tag};
+            }
         } else {
             $tag = $nextTag;        # don't override the existing tag
         }
@@ -8338,7 +8348,8 @@ sub ProcessBinaryData($$$)
         # hook to allow format, etc to be set dynamically
         if (defined $$tagInfo{Hook}) {
             my $oldVarSize = $varSize;
-            #### eval Hook ($format, $varSize, $size)
+            my $pos = $entry + $offset;
+            #### eval Hook ($format, $varSize, $size, $dataPt, $pos)
             eval $$tagInfo{Hook};
             # save variable size data if required for writing (in case changed by Hook)
             if ($$dirInfo{VarFormatData}) {

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.29';
+$VERSION = '4.30';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -184,7 +184,7 @@ $VERSION = '4.29';
     36 => 'Canon EF 38-76mm f/4.5-5.6', #32
     37 => 'Canon EF 35-80mm f/4-5.6 or Tamron Lens', #32
     37.1 => 'Tamron 70-200mm f/2.8 Di LD IF Macro', #PH
-    37.2 => 'Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro Model A20', #38
+    37.2 => 'Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro (A20)', #38
     37.3 => 'Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical [IF]', #34
     37.4 => 'Tamron AF 18-270mm f/3.5-6.3 Di II VC LD Aspherical [IF] Macro', #forum2937
     38 => 'Canon EF 80-200mm f/4.5-5.6', #32
@@ -192,7 +192,7 @@ $VERSION = '4.29';
     40 => 'Canon EF 28-80mm f/3.5-5.6',
     41 => 'Canon EF 28-90mm f/4-5.6', #32
     42 => 'Canon EF 28-200mm f/3.5-5.6 or Tamron Lens', #32
-    42.1 => 'Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro Model A20', #15
+    42.1 => 'Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro (A20)', #15
     43 => 'Canon EF 28-105mm f/4-5.6', #10
     44 => 'Canon EF 90-300mm f/4.5-5.6', #32
     45 => 'Canon EF-S 18-55mm f/3.5-5.6 [II]', #PH (same ID for version II, ref 20)
@@ -220,13 +220,13 @@ $VERSION = '4.29';
     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 or other Tamron Lens', #IB (A043)
-    117.1 => 'Tamron SP 35mm f/1.4 Di USD', #https://github.com/Exiv2/exiv2/issues/1064
+    117 => 'Tamron 35-150mm f/2.8-4.0 Di VC OSD (A043) or other Tamron Lens', #IB
+    117.1 => 'Tamron SP 35mm f/1.4 Di USD (F045)', #Exiv2#1064
     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
     127 => 'Canon TS-E 90mm f/2.8 or Tamron Lens', #15
-    127.1 => 'Tamron 18-200mm f/3.5-6.3 Di II VC', #TomLachecki (model B018)
+    127.1 => 'Tamron 18-200mm f/3.5-6.3 Di II VC (B018)', #TomLachecki
     129 => 'Canon EF 300mm f/2.8L USM', #32
     130 => 'Canon EF 50mm f/1.0L USM', #10/15
     131 => 'Canon EF 28-80mm f/2.8-4L USM or Sigma Lens', #32
@@ -244,7 +244,7 @@ $VERSION = '4.29';
     134 => 'Canon EF 600mm f/4L IS USM', #15
     135 => 'Canon EF 200mm f/1.8L USM',
     136 => 'Canon EF 300mm f/2.8L USM',
-    136.1 => 'Tamron SP 15-30mm f/2.8 Di VC USD', #TomLachecki (model A012)
+    136.1 => 'Tamron SP 15-30mm f/2.8 Di VC USD (A012)', #TomLachecki
     137 => 'Canon EF 85mm f/1.2L USM or Sigma or Tamron Lens', #10
     137.1 => 'Sigma 18-50mm f/2.8-4.5 DC OS HSM', #PH
     137.2 => 'Sigma 50-200mm f/4-5.6 DC OS HSM', #PH
@@ -254,10 +254,10 @@ $VERSION = '4.29';
     137.6 => 'Sigma 17-70mm f/2.8-4 DC Macro OS HSM | C', #forum2819 (Contemporary version has this ID - PH)
     137.7 => 'Sigma 17-50mm f/2.8 OS HSM', #47
     137.8 => 'Sigma 18-200mm f/3.5-6.3 DC OS HSM [II]', #PH
-    137.9 => 'Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD', #(model B008)forum3090
+    137.9 => 'Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD (B008)', #forum3090
    '137.10' => 'Sigma 8-16mm f/4.5-5.6 DC HSM', #50-Zwielicht
-   '137.11' => 'Tamron SP 17-50mm f/2.8 XR Di II VC', #50 (model B005)
-   '137.12' => 'Tamron SP 60mm f/2 Macro Di II', #50 (model G005)
+   '137.11' => 'Tamron SP 17-50mm f/2.8 XR Di II VC (B005)', #50
+   '137.12' => 'Tamron SP 60mm f/2 Macro Di II (G005)', #50
    '137.13' => 'Sigma 10-20mm f/3.5 EX DC HSM', #Gerald Erdmann
    '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
@@ -292,7 +292,7 @@ $VERSION = '4.29';
     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',
-    153.3 => 'Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF] Macro Model A14', #15
+    153.3 => 'Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF] Macro (A14)', #15
     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
@@ -301,8 +301,8 @@ $VERSION = '4.29';
     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',
-    156.1 => 'Tamron SP 70-300mm f/4-5.6 Di VC USD', #PH (model A005)
-    156.2 => 'Tamron SP AF 28-105mm f/2.8 LD Aspherical IF', #JR (Model 176D)
+    156.1 => 'Tamron SP 70-300mm f/4-5.6 Di VC USD (A005)', #PH
+    156.2 => 'Tamron SP AF 28-105mm f/2.8 LD Aspherical IF (176D)', #JR
     160 => 'Canon EF 20-35mm f/3.5-4.5 USM or Tamron or Tokina Lens',
     160.1 => 'Tamron AF 19-35mm f/3.5-4.5', #44
     160.2 => 'Tokina AT-X 124 AF Pro DX 12-24mm f/4', #49
@@ -315,7 +315,7 @@ $VERSION = '4.29';
     161.3 => 'Sigma 24-60mm f/2.8 EX DG', #PH (http://www.lensrentals.com/blog/2012/08/canon-illumination-correction-and-third-party-lenses)
     161.4 => 'Tamron AF 17-50mm f/2.8 Di-II LD Aspherical', #40
     161.5 => 'Tamron 90mm f/2.8',
-    161.6 => 'Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical IF', #IB (A05)
+    161.6 => 'Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical IF (A05)', #IB
     161.7 => 'Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro', #IB/NJ
     161.8 => 'Tokina AT-X 24-70mm f/2.8 PRO FX (IF)', #IB
     162 => 'Canon EF 200mm f/2.8L USM', #32
@@ -419,10 +419,10 @@ $VERSION = '4.29';
     211 => 'Canon EF 28-200mm f/3.5-5.6 USM', #15
     212 => 'Canon EF 28-105mm f/4-5.6 USM', #15
     213 => 'Canon EF 90-300mm f/4.5-5.6 USM or Tamron Lens',
-    213.1 => 'Tamron SP 150-600mm f/5-6.3 Di VC USD', #topic5565 (model A011)
-    213.2 => 'Tamron 16-300mm f/3.5-6.3 Di II VC PZD Macro', #PH (model B016)
-    213.3 => 'Tamron SP 35mm f/1.8 Di VC USD', #PH (model F012)
-    213.4 => 'Tamron SP 45mm f/1.8 Di VC USD', #PH (model F013)
+    213.1 => 'Tamron SP 150-600mm f/5-6.3 Di VC USD (A011)', #forum5565
+    213.2 => 'Tamron 16-300mm f/3.5-6.3 Di II VC PZD Macro (B016)', #PH
+    213.3 => 'Tamron SP 35mm f/1.8 Di VC USD (F012)', #PH
+    213.4 => 'Tamron SP 45mm f/1.8 Di VC USD (F013)', #PH
     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
@@ -503,7 +503,7 @@ $VERSION = '4.29';
     493.1 => 'Canon EF 24-105mm f/4L IS USM', #PH (should recheck this)
     494 => 'Canon EF 600mm f/4L IS II USM', #PH
     495 => 'Canon EF 24-70mm f/2.8L II USM or Sigma Lens', #PH
-    495.1 => 'Sigma 24-70mm F2.8 DG OS HSM | A', #IB (017)
+    495.1 => 'Sigma 24-70mm f/2.8 DG OS HSM | A', #IB (017)
     496 => 'Canon EF 200-400mm f/4L IS USM', #PH
     499 => 'Canon EF 200-400mm f/4L IS USM + 1.4x', #50
     502 => 'Canon EF 28mm f/2.8 IS USM or Tamron Lens', #PH
@@ -514,15 +514,16 @@ $VERSION = '4.29';
     506 => 'Canon EF 400mm f/4 DO IS II USM', #42
     507 => 'Canon EF 16-35mm f/4L IS USM', #42
     508 => 'Canon EF 11-24mm f/4L USM or Tamron Lens', #PH
-    508.1 => 'Tamron 10-24mm f/3.5-4.5 Di II VC HLD', #PH (B023)
-    624 => 'Sigma 70-200mm F2.8 DG OS HSM | S', #IB (018)
+    508.1 => 'Tamron 10-24mm f/3.5-4.5 Di II VC HLD (B023)', #PH
+    624 => 'Sigma 70-200mm f/2.8 DG OS HSM | S', #IB (018)
     747 => 'Canon EF 100-400mm f/4.5-5.6L IS II USM or Tamron Lens', #JR
     747.1 => 'Tamron SP 150-600mm f/5-6.3 Di VC USD G2', #50
     748 => 'Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x or Tamron Lens', #JR (1.4x Mk III)
     748.1 => 'Tamron 100-400mm f/4.5-6.3 Di VC USD A035E + 1.4x', #IB
     748.2 => 'Tamron 70-210mm f/4 Di VC USD (A034) + 2x', #IB
     749 => 'Tamron 100-400mm f/4.5-6.3 Di VC USD A035E + 2x', #IB
-    750 => 'Canon EF 35mm f/1.4L II USM', #42
+    750 => 'Canon EF 35mm f/1.4L II USM or Tamron Lens', #42
+    750.1 => 'Tamron SP 85mm f/1.8 Di VC USD (F016)', #Exiv2#1072
     751 => 'Canon EF 16-35mm f/2.8L III USM', #42
     752 => 'Canon EF 24-105mm f/4L IS II USM', #42
     753 => 'Canon EF 85mm f/1.4L IS USM', #42

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

@@ -61,7 +61,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.75';
+$VERSION = '3.76';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -4493,6 +4493,7 @@ my %nikonFocalConversions = (
             12 => 'Nikkor Z DX 50-250mm f/4.5-6.3 VR',
             13 => 'Nikkor Z 24-70mm f/2.8 S',
             14 => 'Nikkor Z 85mm f/1.8 S',
+            15 => 'Nikkor Z 24mm f/1.8 S', #IB
         },
     },
     0x36 => {

data/bin/lib/Image/ExifTool/README

@@ -910,13 +910,15 @@ numerical, and generated automatically otherwise.
 
   Hook          : [BinaryData tags only] Expression to be evaluated when
                   extracting tag to allow dynamic Format, etc for BinaryData
-                  tags.  May access $self, and $size (the full size of the
-                  binary data block), and assign a new value to $format to
-                  dynamically set the tag format, and/or increment $varSize to
-                  add a byte offset to subsequent tags.  $varSize may be set to
-                  a large number to effectively abort processing of the
-                  directory after this tag.  Must have corresponding DATAMEMBER
-                  entry in writable tables.  Must not have Unknown set.
+                  tags.  May access $self, $size (the full size of the binary
+                  data record), $dataPt (reference to the data block), and $pos
+                  (position of this tag in the data block), and assign a new
+                  value to $format to dynamically set the tag format, and/or
+                  increment $varSize to add a byte offset to subsequent tags. 
+                  $varSize may be set to a large number to effectively abort
+                  processing of the directory after this tag.  Must have
+                  corresponding DATAMEMBER entry in writable tables.  Must not
+                  have Unknown set.
 
   LargeTag      : [BinaryData tags only] Flag to indicate that the data for this
                   tag is large, and that it shouldn't be stored in the %val

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.47';
+$VERSION = '1.48';
 
 sub WriteSTMN($$$);
 sub ProcessINFO($$$);
@@ -1001,35 +1001,34 @@ my %formatMinMax = (
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     FIRST_ENTRY => 0,
     FORMAT => 'int32u',
-    NOTES => 'These tags tested only for DualShotVersion numbers 1, 4 and 5.',
-    0 => {
-        Name => 'DualShotVersion',
-        Format => 'int16u',
-        RawConv => '$$self{DualShotVersion} = $val',
-    },
-    9 => {
-        Name => 'DepthMapWidth',
-        Condition => '$$self{DualShotVersion} < 4',
-    },
-    10 => {
-        Name => 'DepthMapHeight',
-        Condition => '$$self{DualShotVersion} < 4',
+    # This is a pain, but the DepthMapWidth/Height move around in this record.
+    # In all of my samples so far, the bytes "01 00 ff ff" precede these tags.
+    # I have seen this byte sequence at offsets 32, 60, 64 and 68, so look for
+    # it in bytes 32-95, and use its location to adjust the tag positions
+    8 => {
+        Name => 'DualShotDummy',
+        Format => 'undef[64]',
+        Hidden => 1,
+        Hook => q{
+            if ($size >= 96) {
+                my $tmp = substr($$dataPt, $pos, 64);
+                if ($tmp =~ /\x01\0\xff\xff/g and not pos($tmp) % 4) {
+                    $$self{DepthMapTagPos} = pos($tmp);
+                    $varSize += $$self{DepthMapTagPos} - 32;
+                }
+            }
+        },
+        RawConv => 'undef', # not a real tag
     },
     16 => {
         Name => 'DepthMapWidth',
-        Condition => '$$self{DualShotVersion} == 4',
+        Condition => '$$self{DepthMapTagPos}',
+        Notes => 'index varies depending on model',
     },
     17 => {
         Name => 'DepthMapHeight',
-        Condition => '$$self{DualShotVersion} == 4',
-    },
-    18 => {
-        Name => 'DepthMapWidth',
-        Condition => '$$self{DualShotVersion} > 4',
-    },
-    19 => {
-        Name => 'DepthMapHeight',
-        Condition => '$$self{DualShotVersion} > 4',
+        Condition => '$$self{DepthMapTagPos}',
+        Notes => 'index varies depending on model',
     },
 );
 

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.18';
+$VERSION = '3.19';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -176,6 +176,7 @@ sub PrintInvLensSpec($;$$);
     49457 => 'Tamron 28-75mm F2.8 Di III RXD', #JR (Model A036)
     49458 => 'Tamron 17-28mm F2.8 Di III RXD', #JR (Model A046)
     49459 => 'Tamron 35mm F2.8 Di III OSD M1:2', #IB (Model F053)
+    49460 => 'Tamron 24mm F2.8 Di III OSD M1:2', #JR (Model F051)
 
     49712 => 'Tokina FiRIN 20mm F2 FE AF',       # (firmware Ver.01)
     49713 => 'Tokina FiRIN 100mm F2.8 FE MACRO', # (firmware Ver.01)
@@ -215,6 +216,7 @@ sub PrintInvLensSpec($;$$);
     50999 => 'Voigtlander COLOR-SKOPAR 21mm F3.5 Aspherical', #IB
     51000 => 'Voigtlander NOKTON 50mm F1.2 Aspherical', #JR
     51001 => 'Voigtlander NOKTON 21mm F1.4 Aspherical', #JR
+    51002 => 'Voigtlander APO-LANTHAR 50mm F2 Aspherical', #JR
 
     # lenses listed in the Sigma MC-11 list, but not yet seen:
     # 504xx => 'Sigma 18-200mm F3.5-6.3 DC MACRO OS HSM | C + MC-11', # (014)
@@ -225,6 +227,7 @@ sub PrintInvLensSpec($;$$);
     51505.1 => 'Samyang AF 35mm F2.8', #PH (also 32794)
     51507 => 'Samyang AF 35mm F1.4', #IB
     51508 => 'Samyang AF 45mm F1.8',
+    51510 => 'Samyang AF 18mm F2.8', #JR
 );
 
 # ExposureProgram values (ref PH, mainly decoded from A200)

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

@@ -7422,7 +7422,6 @@ my %tagExists = (
 	'dualcameraimage' => 1,
 	'dualcameraimagename' => 1,
 	'dualshotextra' => 1,
-	'dualshotversion' => 1,
 	'ducky' => 1,
 	'duedate' => 1,
 	'dummycolsleft' => 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 23197 tags, with 15164 unique tag names.
+They contain a total of 23192 tags, with 15163 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
@@ -16054,17 +16054,10 @@ as the Galaxy S4 and Tab S.
 
 =head3 Samsung DualShotExtra Tags
 
-These tags tested only for DualShotVersion numbers 1, 4 and 5.
-
   Index4   Tag Name                             Writable
   ------   --------                             --------
-      0    DualShotVersion                      no
-      9    DepthMapWidth                        no
-     10    DepthMapHeight                       no
      16    DepthMapWidth                        no
      17    DepthMapHeight                       no
-     18    DepthMapWidth                        no
-     19    DepthMapHeight                       no
 
 =head3 Samsung SingleShotMeta Tags
 

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

@@ -82,6 +82,8 @@ my %qtFormat = (
 );
 my $undLang = 0x55c4;   # numeric code for default ('und') language
 
+my $maxReadLen = 100000000; # maximum size of atom to read into memory (100 MB)
+
 # boxes that may exist in an "empty" Meta box:
 my %emptyMeta = (
     hdlr => 'Handler', 'keys' => 'Keys', lang => 'Language', ctry => 'Country', free => 'Free',
@@ -849,17 +851,35 @@ sub WriteQuickTime($$$)
         }
 
         # read the atom data
+        my $got;
         if (not $size) {
             $buff = '';
-        } elsif ($size > 100000000) {
-            my $mb = int($size / 0x100000 + 0.5);
-            $tag = PrintableTagID($tag,3);
-            $et->Error("'${tag}' atom is too large for rewriting ($mb MB)");
-            return $rtnVal;
-        } elsif ($raf->Read($buff, $size) != $size) {
-            $tag = PrintableTagID($tag,3);
-            $et->Error("Truncated $tag atom");
-            return $rtnVal;
+            $got = 0;
+        } else {
+            # read the atom data (but only first 64kB if data is huge)
+            $got = $raf->Read($buff, $size > $maxReadLen ? 0x10000 : $size);
+        }
+        if ($got != $size) {
+            # ignore up to 256 bytes of garbage at end of file
+            if ($got <= 256 and $size >= 1024 and $tag ne 'mdat') {
+                my $bytes = $got + length $hdr;
+                if ($$et{OPTIONS}{IgnoreMinorErrors}) {
+                    $et->Warn("Deleted garbage at end of file ($bytes bytes)");
+                    $buff = $hdr = '';
+                } else {
+                    $et->Error("Possible garbage at end of file ($bytes bytes)", 1);
+                    return $rtnVal;
+                }
+            } else {
+                $tag = PrintableTagID($tag,3);
+                if ($size > $maxReadLen and $got == 0x10000) {
+                    my $mb = int($size / 0x100000 + 0.5);
+                    $et->Error("'${tag}' atom is too large for rewriting ($mb MB)");
+                } else {
+                    $et->Error("Truncated '${tag}' atom");
+                }
+                return $rtnVal;
+            }
         }
         # save the handler type for this track
         if ($tag eq 'hdlr' and length $buff >= 12) {

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

@@ -859,7 +859,7 @@ sub WriteXMP($$;$)
 #
     if (%{$$et{DEL_GROUP}} and (grep /^XMP-.+$/, keys %{$$et{DEL_GROUP}} or
         # (logic is a bit more complex for group names in exiftool XML files)
-        grep m{^http://ns.exiftool.ca/}, values %nsUsed))
+        grep m{^http://ns.exiftool.(?:ca|org)/}, values %nsUsed))
     {
         my $del = $$et{DEL_GROUP};
         my $path;
@@ -870,7 +870,7 @@ sub WriteXMP($$;$)
             $ns = $stdXlatNS{$ns} if $stdXlatNS{$ns};
             my ($grp, @g);
             # no "XMP-" added to most groups in exiftool RDF/XML output file
-            if ($nsUsed{$ns} and (@g = ($nsUsed{$ns} =~ m{^http://ns.exiftool.ca/(.*?)/(.*?)/}))) {
+            if ($nsUsed{$ns} and (@g = ($nsUsed{$ns} =~ m{^http://ns.exiftool.(?:ca|org)/(.*?)/(.*?)/}))) {
                 if ($g[1] =~ /^\d/) {
                     $grp = "XML-$g[0]";
                     #(all XML-* groups stored as uppercase DEL_GROUP key)
@@ -1461,7 +1461,7 @@ sub WriteXMP($$;$)
             my @ns = sort keys %nsCur;
             $long[-2] .= "$nl$sp<$prop rdf:about='${about}'";
             # generate et:toolkit attribute if this is an exiftool RDF/XML output file
-            if (@ns and $nsCur{$ns[0]} =~ m{^http://ns.exiftool.ca/}) {
+            if (@ns and $nsCur{$ns[0]} =~ m{^http://ns.exiftool.(?:ca|org)/}) {
                 $long[-2] .= "\n$sp${sp}xmlns:et='http://ns.exiftool.ca/1.0/'" .
                             " et:toolkit='Image::ExifTool $Image::ExifTool::VERSION'";
             }

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

@@ -186,7 +186,7 @@ my %xmpNS = (
 );
 
 # build reverse namespace lookup
-my %uri2ns;
+my %uri2ns = ( 'http://ns.exiftool.org/1.0/' => 'et' ); # (allow exiftool.org as well as exiftool.ca)
 {
     my $ns;
     foreach $ns (keys %nsURI) {
@@ -3103,7 +3103,7 @@ NoLoop:
 
         # add tag Namespace entry for tags in variable-namespace tables
         $$tagInfo{Namespace} = $xns if $xns;
-        if ($$et{curURI}{$ns} and $$et{curURI}{$ns} =~ m{^http://ns.exiftool.ca/(.*?)/(.*?)/}) {
+        if ($$et{curURI}{$ns} and $$et{curURI}{$ns} =~ m{^http://ns.exiftool.(?:ca|org)/(.*?)/(.*?)/}) {
             my %grps = ( 0 => $1, 1 => $2 );
             # apply a little magic to recover original group names
             # from this exiftool-written RDF/XML file

data/bin/perl-Image-ExifTool.spec

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

metadata

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