exiftool_vendored 11.44.0 → 11.47.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8821d7513aaf314f339b7a91ac998b1899cfa3a3
-  data.tar.gz: c460b841e3635d239c4f729c80d35189735f10d2
+  metadata.gz: 04eb85989f4a38928c79a180c772d512edf2b8c9
+  data.tar.gz: 9835759f399b1a7beecad1c210026b90126ed996
 SHA512:
-  metadata.gz: 7977e9ee35fd78efaf300f0c62c3ed916bb9be1e2fb5b79d453675677c1f04f5a9d80b4bc0469be95fda9bc8d30b6c2592613341b72aba976539f2471717bcc4
-  data.tar.gz: 13b09672b1bb4ee71951b5e9fb64170589f4fea3b5ad3fee065d92973ab25f002917eaddafd8c223ba45a31c9f822b7d52dce211b986cc314045b4c3293e2c99
+  metadata.gz: 79945cb02e7f1a35e654fce3540c6f0039f191e447d9437ac1e783639adb0fb89488ab3d23e1a72e077b1b1b30af68e9c3113c09e5fbf4dc75cd0762c4576814
+  data.tar.gz: c1dca4b4c42f8d18c98d7069488a616f8e4a14cb7375317ae2880ba7dbbe2de9108c2de02d25ae7809a09f356dba5615d501de1938e4441cc4c88040861c54f0

data/bin/Changes

@@ -7,6 +7,43 @@ RSS feed: http://owl.phy.queensu.ca/~phil/exiftool/rss.xml
 Note: The most recent production release is Version 11.30. (Other versions are
 considered development releases, and are not uploaded to CPAN.)
 
+May 31, 2019 - Version 11.47
+
+  - Fixed problem which resulted in a warning for one of the CanonVRD tests on
+    some platforms
+
+May 31, 2019 - Version 11.46 - "CR3 update"
+
+  - Added ability to write CanonVRD tags in CR3 images
+  - Decode a couple more tags from Canon CR3 images
+  - Enhanced Validate option to check for duplicate QuickTime atoms
+  - Relaxed contraints when writing IPTC date tags to allow use of separators
+    other than a colon
+  - Fixed CR3 writing to update CTBO table with any changed offsets or sizes
+    (although this table doesn't seem to be used by any RAW viewer, it may be
+    used in-camera to improve response time when browsing images)
+
+May 29, 2019 - Version 11.45
+
+  - CORRUPTION WARNING: Patched problem where Canon DPP would destroy a CR3
+    image if the file had previously been edited by DPP then Exiftool
+    (If you have edited any CR3 images with ExifTool that had been previously
+    edited by DPP, then re-edit with ExifTool 11.45 or later to restructure the
+    file so DPP doesn't destroy it if used to edit the file later)
+  - Added ability to create and delete QuickTime Keys tags
+  - Added sample config file (mini0806.config) to generate GPS tags from
+    subtitle Text in Mini 0806 dashcam videos
+  - Added new Canon and Nikon lenses (thanks LibRaw)
+  - Added a new Olympus CameraType (thanks LibRaw)
+  - Decode CanonVRD tags from CR3 images
+  - Improved handling of QuickTime language tags when writing
+  - Fixed bug introduced in 11.38 which could cause "Use of uninitialized value"
+    runtime warning when reading XMP GPS tags
+  - Fixed bug where QuickTime tags could be written when another group was
+    specified
+  - API Changes:
+      - Added QuickTimeHandler option
+
 May 21, 2019 - Version 11.44
 
   - Added ability to extract XMP as a block from XMP files

data/bin/MANIFEST

@@ -22,6 +22,7 @@ config_files/dji.config
 config_files/example.config
 config_files/fotoware.config
 config_files/gps2utm.config
+config_files/mini0806.config
 config_files/nksc.config
 config_files/photoshop_paths.config
 config_files/picasa_faces.config
@@ -444,6 +445,8 @@ t/CanonVRD_19.out
 t/CanonVRD_2.out
 t/CanonVRD_20.out
 t/CanonVRD_21.out
+t/CanonVRD_22.out
+t/CanonVRD_24.out
 t/CanonVRD_3.out
 t/CanonVRD_4.out
 t/CanonVRD_5.out
@@ -736,6 +739,7 @@ t/QuickTime.t
 t/QuickTime_10.out
 t/QuickTime_11.out
 t/QuickTime_12.out
+t/QuickTime_13.out
 t/QuickTime_2.out
 t/QuickTime_3.out
 t/QuickTime_4.out

data/bin/META.json

@@ -47,5 +47,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "11.44"
+   "version" : "11.47"
 }

data/bin/META.yml

@@ -28,4 +28,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 11.44
+version: 11.47

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.44.tar.gz | tar -xf -
-  cd Image-ExifTool-11.44
+  gzip -dc Image-ExifTool-11.47.tar.gz | tar -xf -
+  cd Image-ExifTool-11.47
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 
@@ -195,6 +195,7 @@ distribution package:
     example.config            - General example showing config features
     fotoware.config           - Definitions for writing Fotoware XMP tags
     gps2utm.config            - Generate UTM coordinate tags from GPS info
+    mini0806.config           - Composite tags for GPS in Mini 0806 videos
     nksc.config               - Decode tags in Nikon ViewNX NKSC files
     photoshop_paths.config    - For extracting or copying Photoshop paths
     picasa_faces.config       - Convert from Picasa to MWG/MP face regions

data/bin/config_files/example.config

@@ -344,6 +344,11 @@ use Image::ExifTool::MIE;
     TTT => 'JPEG',
 );
 
+# Change default location for writing QuickTime tags so Keys is preferred
+# (by default, the PREFERRED levels are: ItemList=2, UserData=1, Keys=0)
+use Image::ExifTool::QuickTime;
+$Image::ExifTool::QuickTime::Keys{PREFERRED} = 3;
+
 # Specify default ExifTool option values
 # (see the Options function documentation for available options)
 %Image::ExifTool::UserDefined::Options = (

data/bin/config_files/mini0806.config

@@ -0,0 +1,99 @@
+#------------------------------------------------------------------------------
+# File:         mini0806.config
+#
+# Description:  This config file defines Composite tags to convert embedded
+#               metadata in Mini 0806 dashcam videos
+#
+# Usage:        exiftool -config mini0806.config -ee FILE
+#
+#               Example command to create .gpx log file from Mini 0806 video
+#               (requires gpx.fmt available in the full Exiftool distribution):
+#
+#               exiftool -config mini0806.config -p gpx.fmt -ee FILE
+#
+# Requires:     ExifTool version 10.75 or later
+#
+# Revisions:    2019/05/28 - P. Harvey Created
+#------------------------------------------------------------------------------
+
+%Image::ExifTool::UserDefined = (
+    'Image::ExifTool::Composite' => {
+        GROUPS => { 2 => 'Location' },
+#
+# Example embedded "Text" from a Mini 0806 MOV video:
+#
+#   "A,270519,201555.000,3356.8925,N,08420.2071,W,000.0,331.0M,+01.84,-09.80,-00.61;\n"
+#
+# Note: SubDoc flag is set for all these tags so they will be generated for
+#       all embedded documents
+#
+        GPSDateTime => {
+            Description => 'GPS Date/Time',
+            Groups => { 2 => 'Time' },
+            SubDoc => 1,
+            Require => 'Text',
+            RawConv => q{
+                if ($val[0] =~ /^A,(\d{2})(\d{2})(\d{2}),(\d{2})(\d{2})(\d{2}(\.\d+)?)/) {
+                    return "20$3:$2:$1 $4:$5:$6Z";
+                } else {
+                    return undef;
+                }
+            },
+            PrintConv => '$self->ConvertDateTime($val)',
+        },
+        GPSLatitude => {
+            SubDoc => 1,
+            Require => 'Text',
+            RawConv => q{
+                if ($val[0] =~ /^A,.*?,.*?,(\d{2})(\d+\.\d+),([NS])/) {
+                    return ($1 + $2/60) * ($3 eq 'S' ? -1 : 1);
+                } else {
+                    return undef;
+                }
+            },
+            PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")',
+        },
+        GPSLongitude => {
+            SubDoc => 1,
+            Require => 'Text',
+            RawConv => q{
+                if ($val[0] =~ /^A,.*?,.*?,.*?,.*?,(\d{3})(\d+\.\d+),([EW])/) {
+                    return ($1 + $2/60) * ($3 eq 'W' ? -1 : 1);
+                } else {
+                    return undef;
+                }
+            },
+            PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")',
+        },
+        GPSAltitude => {
+            SubDoc => 1,
+            Require => 'Text',
+            RawConv => q{
+                my @a = split ',', $val[0];
+                return undef unless $a[0] eq 'A' and $a[8] =~ s/M$//;
+                return $a[8];
+            },
+            PrintConv => '"$val m"',
+        },
+        GPSSpeed => {
+            SubDoc => 1,
+            Require => 'Text',
+            RawConv => q{
+                my @a = split ',', $val[0];
+                return undef unless $a[0] eq 'A' and $a[7] =~ /^\d+\.\d+$/;
+                return $a[7]; # (NC)
+            },
+        },
+        Accelerometer => {
+            SubDoc => 1,
+            Require => 'Text',
+            RawConv => q{
+                my @a = split ',', $val[0];
+                return undef unless $a[11] =~ s/;\s*$//;
+                return "$a[9] $a[10] $a[11]";
+            },
+        },
+    },
+);
+
+1;  #end

data/bin/exiftool

@@ -12,7 +12,7 @@
 use strict;
 require 5.004;
 
-my $version = '11.44';
+my $version = '11.47';
 
 # 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.44 --
+    -- Generated by ExifTool 11.47 --
     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.44';
+$VERSION = '11.47';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -942,10 +942,12 @@ my %processType = map { $_ => 1 } qw(JPEG TIFF XMP AIFF EXE Font PS Real VCard);
     maccroatian => 'MacCroatian', cp10082 => 'MacCroatian',
 );
 
-# default group priority for writing
+# default family 0 group priority for writing
 # (NOTE: tags in groups not specified here will not be written unless
 #  overridden by the module or specified when writing)
-my @defaultWriteGroups = qw(EXIF IPTC XMP MakerNotes Photoshop ICC_Profile CanonVRD Adobe);
+my @defaultWriteGroups = qw(
+    EXIF IPTC XMP MakerNotes QuickTime Photoshop ICC_Profile CanonVRD Adobe
+);
 
 # group hash for ExifTool-generated tags
 my %allGroupsExifTool = ( 0 => 'ExifTool', 1 => 'ExifTool', 2 => 'ExifTool' );
@@ -2144,6 +2146,7 @@ sub ClearOptions($)
         Password    => undef,   # password for password-protected PDF documents
         PNGEarlyXMP => undef,   # write XMP in PNG images before IDAT chunk
         PrintConv   => 1,       # flag to enable print conversion
+        QuickTimeHandler => undef,  # flag to add mdir Handler to newly created Meta box
         QuickTimeUTC=> undef,   # assume that QuickTime date/time tags are stored as UTC
         RequestAll  => undef,   # extract all tags that must be specifically requested
         RequestTags => undef,   # extra tags to request (on top of those in the tag list)
@@ -2961,6 +2964,7 @@ sub GetValue($$;$)
                     my $oldFilter = $$self{OPTIONS}{Filter};
                     delete $$self{OPTIONS}{Filter};
                     foreach (keys %$val) {
+                        next unless defined $$val{$_};
                         $raw[$_] = $$rawValue{$$val{$_}};
                         ($val[$_], $prt[$_]) = $self->GetValue($$val{$_}, 'Both');
                         next if defined $val[$_] or not $$tagInfo{Require}{$_};
@@ -3289,13 +3293,14 @@ sub SetNewGroups($;@)
     local $_;
     my ($self, @groups) = @_;
     @groups or @groups = @defaultWriteGroups;
-    my $count = @groups;
+    my $count = @groups * 10;
     my %priority;
     foreach (@groups) {
-        $priority{lc($_)} = $count--;
+        $priority{lc($_)} = $count;
+        $count -= 10;
     }
-    $priority{file} = 10;       # 'File' group is always written (Comment)
-    $priority{composite} = 10;  # 'Composite' group is always written
+    $priority{file} = 500;      # 'File' group is always written (Comment)
+    $priority{composite} = 500; # 'Composite' group is always written
     # set write priority (higher # is higher priority)
     $$self{WRITE_PRIORITY} = \%priority;
     $$self{WRITE_GROUPS} = \@groups;

data/bin/lib/Image/ExifTool.pod

@@ -814,6 +814,13 @@ a warning to be issued if standard XMP is found after the IDAT chunk.
 Flag to enable automatic print conversion.  Also enables inverse
 print conversion for writing.  Default is 1.
 
+=item QuickTimeHandler
+
+Flag set to add an 'mdir' Handler to a newly created Meta box when adding
+QuickTime ItemList tags.  Adobe Bridge does not add this Handler, but it is
+commonly found in samples from other software, so it is possible that this
+could affect the interoperability of ItemList tags.  Default is undef.
+
 =item QuickTimeUTC
 
 Flag set to assume that QuickTime date/time values are stored as UTC,
@@ -1860,8 +1867,9 @@ Set the order of the preferred groups when adding new information.  In
 subsequent calls to L</SetNewValue>, new information will be created in the
 first valid group of this list.  This has an impact only if the group is not
 specified when calling L</SetNewValue> and if the tag name exists in more
-than one group.  The default order is EXIF, IPTC then XMP.  Any family 0
-group name may be used.  Case is not significant.
+than one group.  The default order is EXIF, IPTC, XMP, MakerNotes,
+QuickTime, Photoshop, ICC_Profile, CanonVRD, Adobe.  Any family 0 group name
+may be used.  Case is not significant.
 
     $exifTool->SetNewGroups('XMP','EXIF','IPTC');
 

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

@@ -67,6 +67,7 @@
 #              51) http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,4110.0.html
 #              52) Kai Harrekilde-Petersen private communication
 #              53) Anton Reiser private communication
+#              54) https://github.com/lclevy/canon_cr3
 #              IB) Iliah Borg private communication (LibRaw)
 #              JD) Jens Duttke private communication
 #              JR) Jos Roost private communication
@@ -87,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.12';
+$VERSION = '4.14';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -427,7 +428,8 @@ $VERSION = '4.12';
     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
-    251 => 'Canon EF 70-200mm f/2.8L IS II USM',
+    250.3 => 'Tokina Opera 16-28mm f/2.8 FF', #IB
+    251 => 'Canon EF 70-200mm f/2.8L IS II USM', # (also version III, ref IB. May be distinguised by EXIF:LensModel "EF70-200mm f/2.8L IS III USM" -- add extra logic to LensID?)
     252 => 'Canon EF 70-200mm f/2.8L IS II USM + 1.4x', #50 (1.4x Mk II)
     253 => 'Canon EF 70-200mm f/2.8L IS II USM + 2x', #PH (NC)
     # 253.1 => 'Tamron SP 70-200mm f/2.8 Di VC USD G2 (A025) + 2x', #forum9367
@@ -8396,7 +8398,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
+    #        index: 1=XMP, 2=PRVW, 3=mdat, 4=?, 5=?
     CMT1 => { # (CR3 files)
         Name => 'IFD0',
         SubDirectory => {
@@ -8442,6 +8444,18 @@ my %filterConv = (
     },
 );
 
+# Canon top-level uuid atoms (ref PH, written by DPP4)
+%Image::ExifTool::Canon::uuid2 = (
+    WRITE_PROC => 'Image::ExifTool::QuickTime::WriteQuickTime',
+    CNOP => {
+        Name => 'CanonVRD',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::CanonVRD::Main',
+            WriteProc => 'Image::ExifTool::CanonVRD::WriteCanonDR4',
+        },
+    },
+);
+
 %Image::ExifTool::Canon::UnknownIFD = (
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
 );
@@ -8452,10 +8466,30 @@ my %filterConv = (
     # CCDT - int32u[3]: 0. 0, 1. decoder type?, 2. 0, 3. index
 );
 
+# 'CMP1' atom information (ref 54, CR3 files)
+%Image::ExifTool::Canon::CMP1 = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 0 => 'MakerNotes', 1 => 'Canon', 2 => 'Image' },
+    FORMAT => 'int16u',
+    FIRST_ENTRY => 0,
+    PRIORITY => 0,
+    8  => { Name => 'ImageWidth',  Format => 'int32u' },
+    10 => { Name => 'ImageHeight', Format => 'int32u' },
+    # (the rest of the documented tags don't seem to produced good values with my samples - PH)
+);
+
 # 'CDI1' atom information (ref PH, CR3 files)
 %Image::ExifTool::Canon::CDI1 = (
-    GROUPS => { 0 => 'QuickTime', 1 => 'Canon', 2 => 'Image' },
-    # IAD1 - 32/48 bytes
+    GROUPS => { 0 => 'MakerNotes', 1 => 'Canon', 2 => 'Image' },
+    IAD1 => { Name => 'IAD1', SubDirectory => { TagTable => 'Image::ExifTool::Canon::IAD1' } },
+);
+
+# 'IAD1' atom information (ref 54, CR3 files)
+%Image::ExifTool::Canon::IAD1 = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 0 => 'MakerNotes', 1 => 'Canon', 2 => 'Image' },
+    FORMAT => 'int16u',
+    FIRST_ENTRY => 0,
 );
 
 # Canon Timed MetaData (ref PH, CR3 files)

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

@@ -23,7 +23,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Canon;
 
-$VERSION = '1.32';
+$VERSION = '1.33';
 
 sub ProcessCanonVRD($$;$);
 sub WriteCanonVRD($$;$);
@@ -1954,6 +1954,28 @@ sub WriteCanonVRD($$;$)
     return $val;
 }
 
+#------------------------------------------------------------------------------
+# Write DR4-type CanonVRD edit record
+# Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
+# Returns: VRD data block (may be empty if deleted, of undef on error)
+sub WriteCanonDR4($$;$)
+{
+    my ($et, $dirInfo, $tagTablePtr) = @_;
+    $et or return 1;    # allow dummy access
+    my $nvHash = $et->GetNewValueHash($Image::ExifTool::Extra{CanonDR4});
+    my $val = $et->GetNewValue($nvHash);
+    if (defined $val) {
+        return undef unless $et->IsOverwriting($nvHash, $val);
+        $et->VPrint(0, "  Writing CanonDR4 as a block\n");
+        ++$$et{CHANGED};
+        return WrapDR4($val);
+    }
+    my $buff = '';
+    $$dirInfo{OutFile} = \$buff;
+    return $buff if ProcessCanonVRD($et, $dirInfo, $tagTablePtr) > 0;
+    return undef;
+}
+
 #------------------------------------------------------------------------------
 # Read/write CanonVRD information (from VRD file or VRD trailer)
 # Inputs: 0) ExifTool object reference, 1) dirInfo reference
@@ -2015,7 +2037,7 @@ sub ProcessCanonVRD($$;$)
         # (so we must disable all Write() calls for this case)
         $dataPt = $outfile;
     }
-    if ($fromFile) {
+    if ($fromFile or $$dirInfo{DirStart}) {
         $dataPt = \$buff unless $dataPt;
         # read VRD data into memory if necessary
         unless ($raf->Read($$dataPt, $dirLen) == $dirLen) {