exiftool_vendored 9.41.2 → 9.45.0

data/bin/{Image-ExifTool-9.41 → Image-ExifTool-9.45}/lib/Image/ExifTool.pod

@@ -55,7 +55,7 @@ Image::ExifTool - Read and write meta information
 
 ExifTool provides an extensible set of perl modules to read and write meta
 information in a wide variety of files, including the maker note information
-of many digital cameras by various manufacturers such as Canon, Casio,
+of many digital cameras by various manufacturers such as Canon, Casio, FLIR,
 FujiFilm, GE, HP, JVC/Victor, Kodak, Leaf, Minolta/Konica-Minolta, Nikon,
 Olympus/Epson, Panasonic/Leica, Pentax/Asahi, Phase One, Reconyx, Ricoh,
 Samsung, Sanyo, Sigma/Foveon and Sony.
@@ -726,9 +726,9 @@ location.  If this happens, a minor error is issued when the extra XMP is
 encountered, and the file is not written.  Adding the L</IgnoreMinorErrors>
 option causes the XMP after IDAT to be deleted, thus resolving the conflict
 (at the expense of possible metadata loss), and allowing the file to be
-written.  This option is applied automatically when deleting all XMP and
-writing new XMP back in one step.  When reading, this option causes a
-warning to be issued if standard XMP is found after the IDAT chunk.
+written.  The PNGEarlyXMP option is applied automatically when deleting all
+XMP and writing new XMP back in one step.  When reading, this option causes
+a warning to be issued if standard XMP is found after the IDAT chunk.
 
 =item PrintConv
 
@@ -1232,11 +1232,11 @@ a '#' may be appended to the tag name (ie. 'EXIF:Orientation#'), with the
 same effect as setting Type to 'ValueConv'.  Wildcards ('*' and '?') may be
 used in the tag name to assign multiple tags simultaneously.  A tag name of
 '*' is special when deleting information, and will delete an entire group
-even if some individual tags in the group are not writable (unless a family
-2 group is specified, in which case the tags are deleted individually).  Use
-L</GetDeleteGroups> to get a list of deletable group names, and see
-L<Image::ExifTool::TagNames|Image::ExifTool::TagNames> for a complete list
-of tag names.
+even if some individual tags in the group are not writable, but only if a
+single family 0 or 1 group is specified (otherwise the tags are deleted
+individually).  Use L</GetDeleteGroups> to get a list of deletable group
+names, and see L<Image::ExifTool::TagNames|Image::ExifTool::TagNames> for a
+complete list of tag names.
 
 2) [optional] New value for tag.  Undefined to delete tag from file.  May be
 a scalar, scalar reference, list reference to set a list of values, or hash

data/bin/{Image-ExifTool-9.41 → Image-ExifTool-9.45}/lib/Image/ExifTool/BuildTagLookup.pm

@@ -32,7 +32,7 @@ use Image::ExifTool::XMP;
 use Image::ExifTool::Canon;
 use Image::ExifTool::Nikon;
 
-$VERSION = '2.66';
+$VERSION = '2.68';
 @ISA = qw(Exporter);
 
 sub NumbersFirst;
@@ -220,6 +220,14 @@ reason for this is to make the tag names more consistent across different
 types of meta information.  To determine a tag name, either consult this
 documentation or run C<exiftool -s> on a file containing the information in
 question.
+
+(This documentation is the result of years of research, testing and reverse
+engineering, and is the most complete metadata tag list available anywhere
+on the internet.  It is provided not only for ExifTool users, but more
+importantly as a public service to help augment the collective knowledge,
+and is often used as a primary source of information in the development of
+other metadata software.  Please help keep this documentation as accurate
+and complete as possible, and feed back any new discoveries to the source.)
 },
     EXIF => q{
 EXIF stands for "Exchangeable Image File Format".  This type of information
@@ -237,8 +245,8 @@ other tags which are not part of the EXIF specification, but may co-exist
 with EXIF tags in some images.  Tags which are part of the EXIF 2.3
 specification have an underlined B<Tag Name> in the HTML version of this
 documentation.  See
-L<http://www.cipa.jp/english/hyoujunka/kikaku/pdf/DC-008-2012_E.pdf> for the
-official EXIF 2.3 specification.
+L<http://www.cipa.jp/std/documents/e/DC-008-2012_E.pdf> for the official
+EXIF 2.3 specification.
 },
     GPS => q{
 These GPS tags are part of the EXIF standard, and are stored in a separate
@@ -626,8 +634,8 @@ sub new
 # loop through all tables, accumulating TagLookup and TagName information
 #
     my (%tagNameInfo, %id, %longID, %longName, %shortName, %tableNum,
-        %tagLookup, %tagExists, %tableWritable, %sepTable, %structs,
-        %compositeModules, %isPlugin, %flattened, %structLookup);
+        %tagLookup, %tagExists, %noLookup, %tableWritable, %sepTable,
+        %structs, %compositeModules, %isPlugin, %flattened, %structLookup);
     $self->{TAG_NAME_INFO} = \%tagNameInfo;
     $self->{ID_LOOKUP} = \%id;
     $self->{LONG_ID} = \%longID;
@@ -1183,16 +1191,20 @@ TagID:  foreach $tagID (@keys) {
 # add this tag to the tag lookup unless NO_LOOKUP is set or shortcut or plug-in tag
 #
                 next if $shortcut or $isPlugin;
-                next if $$vars{NO_LOOKUP};
-                # count our tags
+                # count tags
                 if ($$tagInfo{SubDirectory}) {
+                    next if $$vars{NO_LOOKUP};
                     $subdirs{$lcName} or $subdirs{$lcName} = 0;
                     ++$subdirs{$lcName};
                 } else {
                     ++$count{'total tags'};
-                    unless ($tagExists{$lcName} and (not $subdirs{$lcName} or $subdirs{$lcName} == $tagExists{$lcName})) {
-                        ++$count{'unique tag names'};
+                    unless ($tagExists{$lcName} and
+                        (not $subdirs{$lcName} or $subdirs{$lcName} == $tagExists{$lcName}))
+                    {
+                        ++$count{'unique tag names'} unless $noLookup{$lcName};
                     }
+                    # don't add to tag lookup if specified
+                    $$vars{NO_LOOKUP} and $noLookup{$lcName} = 1, next;
                 }
                 $tagExists{$lcName} or $tagExists{$lcName} = 0;
                 ++$tagExists{$lcName};

data/bin/{Image-ExifTool-9.41 → Image-ExifTool-9.45}/lib/Image/ExifTool/Canon.pm

@@ -81,7 +81,7 @@ sub ProcessSerialData($$$);
 sub ProcessFilters($$$);
 sub SwapWords($);
 
-$VERSION = '3.21';
+$VERSION = '3.22';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -285,6 +285,7 @@ $VERSION = '3.21';
     174 => 'Canon EF 135mm f/2L or Sigma 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', #http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,4031.0.html
+    174.3 => 'Sigma 150-500mm f/5-6.3 APO DG OS HSM', #47
     175 => 'Canon EF 400mm f/2.8L', #32
     176 => 'Canon EF 24-85mm f/3.5-4.5 USM',
     177 => 'Canon EF 300mm f/4L IS', #9
@@ -375,6 +376,7 @@ $VERSION = '3.21';
     4145 => 'Canon EF-M 22mm f/2 STM', #34
     4146 => 'Canon EF-S 18-55mm f/3.5-5.6 IS STM', #PH
     4147 => 'Canon EF-M 11-22mm f/4-5.6 IS STM', #42
+    4148 => 'Canon EF-S 55-250mm f/4-5.6 IS STM', #42
 );
 
 # Canon model ID numbers (PH)
@@ -642,6 +644,7 @@ $VERSION = '3.21';
     0x80000325 => 'EOS 70D',
     0x80000326 => 'EOS Rebel T5i / 700D / Kiss X7i',
     0x80000331 => 'EOS M',
+    0x80000355 => 'EOS M2',
     0x80000346 => 'EOS Rebel SL1 / 100D / Kiss X7',
 );
 

data/bin/{Image-ExifTool-9.41 → Image-ExifTool-9.45}/lib/Image/ExifTool/Casio.pm

@@ -9,7 +9,7 @@
 # References:   1) http://park2.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html
 #               2) Joachim Loehr private communication
 #               3) http://homepage3.nifty.com/kamisaka/makernote/makernote_casio.htm
-#               4) http://www.gvsoft.homedns.org/exif/makernote-casio.html
+#               4) http://gvsoft.homedns.org/exif/makernote-casio-type1.html
 #               5) Robert Chi private communication (EX-F1)
 #               6) http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,3701.html
 #               JD) Jens Duttke private communication

data/bin/{Image-ExifTool-9.41 → Image-ExifTool-9.45}/lib/Image/ExifTool/Exif.pm

@@ -34,7 +34,7 @@
 #              22) http://tools.ietf.org/html/draft-ietf-fax-tiff-fx-extension1-01
 #              23) MetaMorph Stack (STK) Image File Format:
 #                  --> ftp://ftp.meta.moleculardevices.com/support/stack/STK.doc
-#              24) http://www.cipa.jp/english/hyoujunka/kikaku/pdf/DC-008-2010_E.pdf (Exif 2.3)
+#              24) http://www.cipa.jp/std/documents/e/DC-008-2012_E.pdf (Exif 2.3)
 #              25) Vesa Kivisto private communication (7D)
 #              26) Jeremy Brown private communication
 #              27) Gregg Lee private communication
@@ -51,7 +51,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '3.57';
+$VERSION = '3.60';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -1674,8 +1674,8 @@ my %sampleFormat = (
     0x927c => \@Image::ExifTool::MakerNotes::Main,
     0x9286 => {
         Name => 'UserComment',
-        # may consider forcing a Format of 'undef' for this tag because I have
-        # seen other applications write it incorrectly as 'string' or 'int8u'
+        # I have seen other applications write it incorrectly as 'string' or 'int8u'
+        Format => 'undef',
         RawConv => 'Image::ExifTool::Exif::ConvertExifText($self,$val,1)',
     },
     0x9290 => {
@@ -2142,6 +2142,11 @@ my %sampleFormat = (
         },
         PrintConvInv => '$val =~ /^PrintIM/ ? $val : undef',    # quick validation
     },
+    0xc573 => { #PH
+        Name => 'OriginalFileName',
+        Notes => 'used by some obscure software', # (possibly Swizzy Photosmacker?)
+        # (it is a 'string', but obscure, so don't make it writable)
+    },
     0xc580 => { #20
         Name => 'USPTOOriginalContentType',
         PrintConv => {
@@ -2256,7 +2261,13 @@ my %sampleFormat = (
             Format => 'undef',  # written incorrectly as int8u (change to undef for speed)
         },
         {
-            Condition => '$$valPt =~ /^(PENTAX |SAMSUNG)\0/',
+            # Pentax/Samsung models that write AOC maker notes in JPG images:
+            # K-5,K-7,K-m,K-x,K-r,K10D,K20D,K100D,K110D,K200D,K2000,GX10,GX20
+            # (Note: the following expression also appears in WriteExif.pl)
+            Condition => q{
+                $$valPt =~ /^(PENTAX |SAMSUNG)\0/ and
+                $$self{Model} =~ /\b(K(-[57mrx]|(10|20|100|110|200)D|2000)|GX(10|20))\b/
+            },
             Name => 'MakerNotePentax',
             MakerNotes => 1,    # (causes "MakerNotes header" to be identified in HtmlDump output)
             Binary => 1,
@@ -2272,6 +2283,22 @@ my %sampleFormat = (
             },
             Format => 'undef',  # written incorrectly as int8u (change to undef for speed)
         },
+        {
+            # must duplicate the above tag with a different name for more recent
+            # Pentax models which use the "PENTAX" instead of the "AOC" maker notes
+            # in JPG images (needed when copying maker notes from DNG to JPG)
+            Condition => '$$valPt =~ /^(PENTAX |SAMSUNG)\0/',
+            Name => 'MakerNotePentax5',
+            MakerNotes => 1,
+            Binary => 1,
+            SubDirectory => {
+                TagTable => 'Image::ExifTool::Pentax::Main',
+                Start => '$valuePtr + 10',
+                Base => '$start - 10',
+                ByteOrder => 'Unknown',
+            },
+            Format => 'undef',
+        },
         {
             Name => 'DNGPrivateData',
             Flags => [ 'Binary', 'Protected' ],
@@ -3231,7 +3258,8 @@ sub ConvertExifText($$;$)
     my $str = substr($val, 8);
     # Note: allow spaces instead of nulls in the ID codes because
     # it is fairly common for camera manufacturers to get this wrong
-    if ($id =~ /^(ASCII)?[\0 ]+$/) {
+    # (also handle Canon ZoomBrowser EX 4.5 null followed by 7 bytes of garbage)
+    if ($id =~ /^(ASCII)?(\0|[\0 ]+$)/) {
         # truncate at null terminator (shouldn't have a null based on the
         # EXIF spec, but it seems that few people actually read the spec)
         $str =~ s/\0.*//s;
@@ -3251,7 +3279,7 @@ sub ConvertExifText($$;$)
     } elsif ($id =~ /^JIS[\0 ]{5}$/) {
         $str = $et->Decode($str, 'JIS', 'Unknown');
     } else {
-        $et->Warn("Invalid EXIF text encoding");
+        $et->Warn('Invalid EXIF text encoding');
         $str = $id . $str;
     }
     $str =~ s/ +$//;    # trim trailing blanks
@@ -3513,7 +3541,7 @@ sub PrintLensID($$@)
         if (($lensType & 0xff00) == 0xef00) {
             # patch for Metabones Canon adapter on a Sony camera (ref Jos Roost)
             # (note: the adapter kills the high byte for 2-byte LensType values,
-            # so the reported lens will be incorrect for these, ref 12)
+            # so the reported lens will be incorrect for these)
             require Image::ExifTool::Canon;
             $printConv = \%Image::ExifTool::Canon::canonLensTypes;
             $lensType &= 0xff;
@@ -4515,7 +4543,7 @@ under the same terms as Perl itself.
 
 =item L<http://www.exif.org/Exif2-2.PDF>
 
-=item L<http://www.cipa.jp/english/hyoujunka/kikaku/pdf/DC-008-2010_E.pdf>
+=item L<http://www.cipa.jp/std/documents/e/DC-008-2012_E.pdf>
 
 =item L<http://partners.adobe.com/asn/developer/pdfs/tn/TIFF6.pdf>