exiftool_vendored 11.88.0 → 11.89.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16ac19b072446e8aa339ead73fcf30667099de1e
-  data.tar.gz: b0af8e8ed6c32171b6a9cd49e33b1053fd1e6c20
+  metadata.gz: 0d3946a9b1b7c50a6864746de47d3c8a0818df3c
+  data.tar.gz: 71ff7c97951c9a108372db26f1192cea9eca2002
 SHA512:
-  metadata.gz: 2f000720df7aede27a5e7d5c0b217711277d942ef3ba9888843f25116ceec81d508fa05dcfc959f4be82b646eafde499decef831ab5b269aca28d85ebda89f99
-  data.tar.gz: 032e0cc3dcf21e0acbdf44829008781976beb2477c96fc1730b4ee912423d7d166e8aae6e861d74ca3d16864a1622107aa8061bd7adb4809a72c2ae3aa20c0ab
+  metadata.gz: 13d128e73009d6d931223324a9f54d4692da494db474d2030c6b7b8fb00f96a180ef0cbec2e788ff9440d4b6c7e875a620600766b885aa9957fecd4d8b5dc2cf
+  data.tar.gz: f233de0cbbfc34b207ecb59e9ac8d7247e338ec93443ce8278c1096b549d894db3a5b2767d0055064f1d90233ef386fea79337a2206ec38122c58d172b0ace28

data/bin/Changes

@@ -7,6 +7,16 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 11.85. (Other versions are
 considered development releases, and are not uploaded to CPAN.)
 
+Feb. 25, 2020 - Version 11.89
+
+  - Added support for Exif 2.32 for XMP
+  - Recognize the HIF file extension
+  - Improved verbose output for QuickTime iref items
+  - Patched to use same byte ordering as IFD0 by default when creating new GPS
+    metadata in Canon CR3 files
+  - Patched to add missing newline that could occur in XMP with the API Compact
+    Shorthand option
+
 Feb. 20, 2020 - Version 11.88
 
   - Added write support for new Google depth-map XMP tags

data/bin/META.json

@@ -47,6 +47,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "11.88",
+   "version" : "11.89",
    "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.88'
+version: '11.89'
 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.88.tar.gz | tar -xf -
-  cd Image-ExifTool-11.88
+  gzip -dc Image-ExifTool-11.89.tar.gz | tar -xf -
+  cd Image-ExifTool-11.89
   ./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.88';
+my $version = '11.89';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -5202,7 +5202,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 11.88 --
+    -- Generated by ExifTool 11.89 --
     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

@@ -28,7 +28,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %mimeType $swapBytes $swapWords $currentByteOrder %unpackStd
             %jpegMarker %specialTags %fileTypeLookup $testLen);
 
-$VERSION = '11.88';
+$VERSION = '11.89';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -110,7 +110,7 @@ sub CheckBinaryData($$$);
 sub WriteTIFF($$$);
 sub PackUTF8(@);
 sub UnpackUTF8($);
-sub SetPreferredByteOrder($);
+sub SetPreferredByteOrder($;$);
 sub CopyBlock($$$);
 sub CopyFileAttrs($$$);
 sub TimeNow(;$$);
@@ -319,6 +319,7 @@ my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
     HDR  => ['HDR',  'Radiance RGBE High Dynamic Range'],
     HEIC => ['MOV',  'High Efficiency Image Format still image'],
     HEIF => ['MOV',  'High Efficiency Image Format'],
+    HIF  =>  'HEIF',
     HTM  =>  'HTML',
     HTML => ['HTML', 'HyperText Markup Language'],
     ICAL =>  'ICS',
@@ -2098,6 +2099,7 @@ sub Options($$;@)
                     /^(.*:)?([-\w?*]*)#?$/ or next;
                     push @{$$options{$param}}, lc($2) if $2;
                     next unless $1;
+                    # add requested groups with trailing colon
                     push @{$$options{$param}}, lc($_).':' foreach split /:/, $1;
                 }
             } else {
@@ -7015,8 +7017,13 @@ sub DoProcessTIFF($$;$)
         $$self{EXIF_DATA} = '';
     }
     unless (defined $$self{EXIF_DATA}) {
+        # set default byte order for creating new GPS in CR3 images
+        my $defaultByteOrder;
+        if ($$dirInfo{DirName} and $$dirInfo{DirName} eq 'GPS') {
+            $defaultByteOrder = $$self{SaveExifByteOrder};
+        }
         # create TIFF information from scratch
-        if ($self->SetPreferredByteOrder() eq 'MM') {
+        if ($self->SetPreferredByteOrder($defaultByteOrder) eq 'MM') {
             $$self{EXIF_DATA} = "MM\0\x2a\0\0\0\x08";
         } else {
             $$self{EXIF_DATA} = "II\x2a\0\x08\0\0\0";

data/bin/lib/Image/ExifTool.pod

@@ -536,13 +536,13 @@ 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.
+for any of these options.  Aliases are given in brackets.  Default is undef.
 
-  NoPadding - Avoid 2 kB of recommended padding at end of XMP
-  NoIndent  - Avoid spaces to indent lines for readability
-  NoNewline - Avoid unnecessary newlines
+  NoPadding - Avoid 2 kB of recommended padding at end of XMP (NoPad)
+  NoIndent  - No spaces to indent lines (NoSpace, NoSpaces)
+  NoNewline - Avoid unnecessary newlines (NoNewlines)
   Shorthand - Use XMP Shorthand format
-  OneDesc   - Combine XMP properties into a single rdf:Description
+  OneDesc   - Combine properties into a single rdf:Description (OneDescr)
   AllSpace  - Equivalent to 'NoPadding,NoIndent,NoNewline'
   AllFormat - Equivalent to 'Shorthand,OneDesc'
   All       - Equivalent to 'AllSpace,AllFormat'

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

@@ -318,7 +318,7 @@ When reading, C<struct> tags are extracted only if the L<Struct|../ExifTool.html
 option is used.  Otherwise the corresponding I<Flattened> tags, indicated by
 an underline (C<_>) after the B<Writable> type, are extracted.  When
 copying, by default both structured and flattened tags are available, but
-the flattened tags are considered "unsafe" so they they aren't copied unless
+the flattened tags are considered "unsafe" so they aren't copied unless
 specified explicitly.  The L<Struct|../ExifTool.html#Struct> option may be disabled by setting Struct
 to 0 via the API or with --struct on the command line to copy only flattened
 tags, or enabled by setting Struct to 1 via the API or with -struct on the

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

@@ -45,7 +45,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '2.42';
+$VERSION = '2.43';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -205,6 +205,7 @@ my %ftypLookup = (
     'hevc' => 'High Efficiency Image Format HEVC sequence (.HEICS)', # image/heic-sequence
     'mif1' => 'High Efficiency Image Format still image (.HEIF)', # image/heif
     'msf1' => 'High Efficiency Image Format sequence (.HEIFS)', # image/heif-sequence
+    'heix' => 'High Efficiency Image Format still image (.HEIF)', # image/heif (ref PH, Canon 1DXmkIII)
     'avif' => 'AV1 Image File Format (.AVIF)', # image/avif
     'crx ' => 'Canon Raw (.CRX)', #PH (CR3 or CRM; use Canon CompressorVersion to decide)
 );
@@ -7725,7 +7726,6 @@ sub ParseContentDescribes($$)
     }
     # add all referenced item ID's to a "RefersTo" lookup
     $$et{ItemInfo}{$id}{RefersTo}{$_} = 1 foreach @to;
-    $et->VPrint(1, "$$et{INDENT}  Item $id describes: @to\n") unless $$et{IsWriting};
     return undef;
 }
 
@@ -8558,6 +8558,18 @@ ItemID:         foreach $id (keys %$items) {
                     Format  => $tagInfo ? $$tagInfo{Format} : undef,
                     Index   => $index,
                 );
+                # print iref item ID numbers
+                if ($dirID eq 'iref') {
+                    my ($id, $count, @to);
+                    if ($$et{ItemRefVersion}) {
+                        ($id, $count, @to) = unpack('NnN*', $val) if length $val >= 10;
+                    } else {
+                        ($id, $count, @to) = unpack('nnn*', $val) if length $val >= 6;
+                    }
+                    defined $id or $id = '<err>', $count = 0;
+                    $id .= " (wrong count: $count)" if $count != @to;
+                    $et->VPrint(1, "$$et{INDENT}  Item $id refers to: @to\n");
+                }
             }
             # extract metadata from stream if ExtractEmbedded option is enabled
             if ($eeTag) {

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

@@ -960,6 +960,8 @@ my %formatMinMax = (
    # 0x08e0-name - seen 'Panorama_Shot_Info'
    # 0x08e0 - string, seen 'PanoramaShot'
    # 0x08e1-name - seen 'Motion_Panorama_Info'
+   # 0x0910-name - seen 'Front_Cam_Selfie_Info'
+   # 0x0910 - string, seen 'Front_Cam_Selfie_Info'
    # 0x09e0-name - seen 'Burst_Shot_Info'
    # 0x09e0 - string, seen '489489125'
    # 0x0a01-name - seen 'Image_UTC_Data'

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

@@ -1613,14 +1613,24 @@ my %tagLookup = (
 	'comment' => { 0 => 0x2, 117 => 'Comment', 153 => 'Comment', 296 => 'Comment', 358 => "\xa9cmt", 360 => 'comment', 366 => "\xa9cmt" },
 	'compass' => { 376 => 0x4 },
 	'compilation' => { 358 => 'cpil' },
+	'compimageimagespersequence' => { 469 => [\'CompositeImageExposureTimes','CompositeImageExposureTimesNumberOfImagesInSequences'] },
+	'compimagemaxexposureall' => { 469 => [\'CompositeImageExposureTimes','CompositeImageExposureTimesMaxExposureTimesOfAll'] },
+	'compimagemaxexposureused' => { 469 => [\'CompositeImageExposureTimes','CompositeImageExposureTimesMaxExposureTimesOfUsed'] },
+	'compimageminexposureall' => { 469 => [\'CompositeImageExposureTimes','CompositeImageExposureTimesMinExposureTimesOfAll'] },
+	'compimageminexposureused' => { 469 => [\'CompositeImageExposureTimes','CompositeImageExposureTimesMinExposureTimesOfUsed'] },
+	'compimagenumsequences' => { 469 => [\'CompositeImageExposureTimes','CompositeImageExposureTimesNumberOfSequences'] },
+	'compimagesumexposureall' => { 469 => [\'CompositeImageExposureTimes','CompositeImageExposureTimesSumOfExposureTimesOfAll'] },
+	'compimagesumexposureused' => { 469 => [\'CompositeImageExposureTimes','CompositeImageExposureTimesSumOfExposureTimesOfUsed'] },
+	'compimagetotalexposureperiod' => { 469 => [\'CompositeImageExposureTimes','CompositeImageExposureTimesTotalExposurePeriod'] },
+	'compimagevalues' => { 469 => [\'CompositeImageExposureTimes','CompositeImageExposureTimesValues'] },
 	'complianceprofile' => { 478 => 'complianceProfile' },
 	'componentsconfiguration' => { 116 => 0x9101, 158 => 'Components', 468 => 'ComponentsConfiguration' },
 	'componentversion' => { 94 => 0x80c },
 	'composer' => { 358 => ["\xa9com","\xa9wrt"], 366 => ["\xa9com","\xa9wrt"], 488 => 'composer' },
 	'composerkeywords' => { 366 => "\xa9cok" },
-	'compositeimage' => { 116 => 0xa460 },
-	'compositeimagecount' => { 116 => 0xa461 },
-	'compositeimageexposuretimes' => { 116 => 0xa462 },
+	'compositeimage' => { 116 => 0xa460, 469 => 'CompositeImage' },
+	'compositeimagecount' => { 116 => 0xa461, 469 => 'CompositeImageCount' },
+	'compositeimageexposuretimes' => { 116 => 0xa462, 469 => 'CompositeImageExposureTimes' },
 	'composition' => { 452 => 'Composition' },
 	'compositionadjust' => { 340 => '0.1' },
 	'compositionadjustrotation' => { 340 => 0x7 },

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 23338 tags, with 15293 unique tag names.
+They contain a total of 23351 tags, with 15303 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
@@ -1160,7 +1160,7 @@ When reading, C<struct> tags are extracted only if the Struct (-struct)
 option is used.  Otherwise the corresponding I<Flattened> tags, indicated by
 an underline (C<_>) after the B<Writable> type, are extracted.  When
 copying, by default both structured and flattened tags are available, but
-the flattened tags are considered "unsafe" so they they aren't copied unless
+the flattened tags are considered "unsafe" so they aren't copied unless
 specified explicitly.  The Struct option may be disabled by setting Struct
 to 0 via the API or with --struct on the command line to copy only flattened
 tags, or enabled by setting Struct to 1 via the API or with -struct on the
@@ -2897,6 +2897,19 @@ These tags belong to the ExifTool XMP-exifEX family 1 group.
   SerialNumber                                  string
   CameraElevationAngle                          rational
   OwnerName                                     string
+  CompositeImage                                integer
+  CompositeImageCount                           integer+
+  CompositeImageExposureTimes                   CompImageExp Struct
+  CompImageMaxExposureAll                       rational_
+  CompImageMaxExposureUsed                      rational_
+  CompImageMinExposureAll                       rational_
+  CompImageMinExposureUsed                      rational_
+  CompImageImagesPerSequence                    integer_
+  CompImageNumSequences                         integer_
+  CompImageSumExposureAll                       rational_
+  CompImageSumExposureUsed                      rational_
+  CompImageTotalExposurePeriod                  rational_
+  CompImageValues                               rational_+
   Gamma                                         rational
   Humidity                                      rational
   InteropIndex                                  string
@@ -2915,6 +2928,21 @@ These tags belong to the ExifTool XMP-exifEX family 1 group.
   AmbientTemperature                            rational
   WaterDepth                                    rational
 
+=head3 XMP CompImageExp Struct
+
+  Field Name                                    Writable
+  ----------                                    --------
+  MaxExposureTimesOfAll                         rational
+  MaxExposureTimesOfUsed                        rational
+  MinExposureTimesOfAll                         rational
+  MinExposureTimesOfUsed                        rational
+  NumberOfImagesInSequences                     integer
+  NumberOfSequences                             integer
+  SumOfExposureTimesOfAll                       rational
+  SumOfExposureTimesOfUsed                      rational
+  TotalExposurePeriod                           rational
+  Values                                        rational+
+
 =head3 XMP ExpressionMedia Tags
 
 Microsoft Expression Media namespace tags.  These tags are avoided when

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

@@ -522,6 +522,9 @@ sub WriteExif($$$)
     my $name = $$dirInfo{Name};
     $name = $dirName unless $name and $dirName eq 'MakerNotes' and $name !~ /^MakerNote/;
 
+    # save byte order of existing EXIF
+    $$et{SaveExifByteOrder} = GetByteOrder() if $dirName eq 'IFD0' or $dirName eq 'ExifIFD';
+
     # set encoding for strings
     $strEnc = $et->Options('CharsetEXIF') if $$tagTablePtr{GROUPS}{0} eq 'EXIF';
 

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

@@ -699,7 +699,7 @@ sub CloseProperty($$$$)
         if (length $$short[-1]) {
             if (length $$long[-1]) {
                 # require a new Description if both longhand and shorthand properties
-                $$long[-2] .= ">$pad<$rdfDesc";
+                $$long[-2] .= ">$nl$pad<$rdfDesc";
                 $$short[-1] .= ">$nl";
                 $$long[-1] .= "$pad</$rdfDesc>$nl";
             } else {

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

@@ -4074,7 +4074,7 @@ sub WriteDirectory($$$;$)
                 $self->Warn("Can't write EXIF as a block to $$self{FILE_TYPE} file");
                 last;
             }
-            # this can happen if we call WriteDirectory for an EXIF directory without  going
+            # this can happen if we call WriteDirectory for an EXIF directory without going
             # through WriteTIFF as the WriteProc (which happens if conditionally replacing
             # the EXIF block and the condition fails), but we never want to do a block write
             # in this case because the EXIF block would end up with two TIFF headers
@@ -4798,19 +4798,20 @@ TryLib: for ($lib=$strptimeLib; ; $lib='') {
 
 #------------------------------------------------------------------------------
 # Set byte order according to our current preferences
-# Inputs: 0) ExifTool object ref
+# Inputs: 0) ExifTool object ref, 1) default byte order
 # Returns: new byte order ('II' or 'MM') and sets current byte order
 # Notes: takes the first of the following that is valid:
 #  1) ByteOrder option
 #  2) new value for ExifByteOrder
-#  3) makenote byte order from last file read
-#  4) big endian
-sub SetPreferredByteOrder($)
+#  3) default byte order passed to this routine
+#  4) makenote byte order from last file read
+#  5) big endian
+sub SetPreferredByteOrder($;$)
 {
-    my $self = shift;
+    my ($self, $default) = @_;
     my $byteOrder = $self->Options('ByteOrder') ||
                     $self->GetNewValue('ExifByteOrder') ||
-                    $$self{MAKER_NOTE_BYTE_ORDER} || 'MM';
+                    $default || $$self{MAKER_NOTE_BYTE_ORDER} || 'MM';
     unless (SetByteOrder($byteOrder)) {
         warn "Invalid byte order '${byteOrder}'\n" if $self->Options('Verbose');
         $byteOrder = $$self{MAKER_NOTE_BYTE_ORDER} || 'MM';

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

@@ -49,7 +49,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 require Exporter;
 
-$VERSION = '3.30';
+$VERSION = '3.31';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeXML UnescapeXML);
 
@@ -2118,6 +2118,35 @@ my %sPantryItem = (
     WaterDepth          => { Writable => 'rational' },
     Acceleration        => { Writable => 'rational' },
     CameraElevationAngle=> { Writable => 'rational' },
+    # new in Exif 2.32 (according to the spec, these should use a different namespace
+    # URI, but the same namespace prefix... Exactly how is that supposed to work?!!
+    # -- I'll just stick with the same URI)
+    CompositeImage => { Writable => 'integer',
+        PrintConv => {
+            0 => 'Unknown',
+            1 => 'Not a Composite Image',
+            2 => 'General Composite Image',
+            3 => 'Composite Image Captured While Shooting',
+        },
+    },
+    CompositeImageCount => { List => 'Seq', Writable => 'integer' },
+    CompositeImageExposureTimes => {
+        FlatName => 'CompImage',
+        Struct => {
+            STRUCT_NAME => 'CompImageExp',
+            NAMESPACE => 'exifEX',
+            TotalExposurePeriod     => { Writable => 'rational' },
+            SumOfExposureTimesOfAll => { Writable => 'rational', FlatName => 'SumExposureAll' },
+            SumOfExposureTimesOfUsed=> { Writable => 'rational', FlatName => 'SumExposureUsed' },
+            MaxExposureTimesOfAll   => { Writable => 'rational', FlatName => 'MaxExposureAll' },
+            MaxExposureTimesOfUsed  => { Writable => 'rational', FlatName => 'MaxExposureUsed' },
+            MinExposureTimesOfAll   => { Writable => 'rational', FlatName => 'MinExposureAll'  },
+            MinExposureTimesOfUsed  => { Writable => 'rational', FlatName => 'MinExposureUsed' },
+            NumberOfSequences       => { Writable => 'integer',  FlatName => 'NumSequences' },
+            NumberOfImagesInSequences=>{ Writable => 'integer',  FlatName => 'ImagesPerSequence' },
+            Values =>   { List => 'Seq', Writable => 'rational' },
+        },
+    },
 );
 
 # Auxiliary namespace properties (aux) - not fully documented (ref PH)

data/bin/perl-Image-ExifTool.spec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 11.88.0
+  version: 11.89.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool