exiftool_vendored 10.23.0 → 10.25.0

data/bin/{Image-ExifTool-10.23 → Image-ExifTool-10.25}/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);
 
-$VERSION = '10.23';
+$VERSION = '10.25';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -1365,7 +1365,7 @@ my %systemTagsNotes = (
             file.  Not generated unless specifically requested or the RequestAll API
             option is set.  Requires Time::HiRes
         },
-        PrintConv => 'sprintf("%.3f s", $val)',
+        PrintConv => 'sprintf("%.3g s", $val)',
     },
     RAFVersion => { Notes => 'RAF file version number' },
     JPEGDigest => {
@@ -7708,7 +7708,9 @@ until ($Image::ExifTool::noConfig) {
         length $file or last;   # filename of "" disables configuration
         -r $file or warn("Config file not found\n"), last;
     }
+    unshift @INC, '.';      # look in current directory first
     eval { require $file }; # load the config file
+    shift @INC;
     # print warning (minus "Compilation failed" part)
     $@ and $_=$@, s/Compilation failed.*//s, warn $_;
     last;

data/bin/{Image-ExifTool-10.23 → Image-ExifTool-10.25}/lib/Image/ExifTool.pod

@@ -2114,11 +2114,11 @@ SigmaRaw, Stim, Theora, Torrent, VCard, Vorbis, XML, XMP, ZIP
 
 AC3, AFCP, AIFF, APE, ASF, AVI1, Adobe, AdobeCM, AdobeDNG, Apple, Audible,
 CIFF, Canon, CanonCustom, CanonRaw, CanonVRD, Casio, Chapter#, Composite,
-DICOM, DNG, DV, DjVu, DjVu-Meta, Ducky, EPPIM, EXE, EXIF, ExifIFD, ExifTool,
-FLAC, FLIR, File, Flash, FlashPix, Font, FotoStation, FujiFilm, FujiIFD, GE,
-GIF, GIMP, GPS, GeoTiff, GlobParamIFD, GraphConv, H264, HP, HTC, HTML,
-HTML-dc, HTML-ncc, HTML-office, HTML-prod, HTML-vw96, HTTP-equiv, ICC-chrm,
-ICC-clrt, ICC-header, ICC-meas, ICC-meta, ICC-view, ICC_Profile,
+DICOM, DJI, DNG, DV, DjVu, DjVu-Meta, Ducky, EPPIM, EXE, EXIF, ExifIFD,
+ExifTool, FLAC, FLIR, File, Flash, FlashPix, Font, FotoStation, FujiFilm,
+FujiIFD, GE, GIF, GIMP, GPS, GeoTiff, GlobParamIFD, GraphConv, H264, HP,
+HTC, HTML, HTML-dc, HTML-ncc, HTML-office, HTML-prod, HTML-vw96, HTTP-equiv,
+ICC-chrm, ICC-clrt, ICC-header, ICC-meas, ICC-meta, ICC-view, ICC_Profile,
 ICC_Profile#, ID3, ID3v1, ID3v1_Enh, ID3v2_2, ID3v2_3, ID3v2_4, IFD0, IFD1,
 IPTC, IPTC#, ISO, ITC, InteropIFD, JFIF, JPEG, JPEG-HDR, JVC, Jpeg2000,
 KDC_IFD, Kodak, KodakBordersIFD, KodakEffectsIFD, KodakIFD, KyoceraRaw, LNK,

data/bin/{Image-ExifTool-10.23 → Image-ExifTool-10.25}/lib/Image/ExifTool/BuildTagLookup.pm

@@ -32,7 +32,7 @@ use Image::ExifTool::XMP;
 use Image::ExifTool::Canon;
 use Image::ExifTool::Nikon;
 
-$VERSION = '2.96';
+$VERSION = '2.97';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -188,21 +188,21 @@ of values written, or the number of characters in a fixed-length string
 (including a null terminator which is added if required).
 
 A plus sign (C<+>) after an entry in the B<Writable> column indicates a
-"list" tag which supports multiple values and allows individual values to be
-added and deleted.  A slash (C</>) indicates an "avoided" tag that is not
-created when writing if another same-named tag may be created instead.  To
-write these tags, the group should be specified.  A tilde (C<~>) indicates a
-tag this is writable only when the print conversion is disabled (by setting
-PrintConv to 0, using the -n option, or suffixing the tag name with a C<#>
-character).  An exclamation point (C<!>) indicates a tag that is considered
-unsafe to write under normal circumstances.  These "unsafe" tags are not
-written unless specified explicitly (ie. wildcards and "all" may not be
-used), and care should be taken when editing them manually since they may
-affect the way an image is rendered.  An asterisk (C<*>) indicates a
-"protected" tag which is not writable directly, but is written automatically
-by ExifTool (often when a corresponding Composite or Extra tag is written).
-A colon (C<:>) indicates a mandatory tag which may be added automatically
-when writing.
+I<List> tag which supports multiple values and allows individual values to
+be added and deleted.  A slash (C</>) indicates a tag that ExifTool will
+I<Avoid> when writing.  These tags are not created when writing if another
+same-named tag may be created instead.  To write these tags, the group
+should be specified.  A tilde (C<~>) indicates a tag this is writable only
+when the print conversion is disabled (by setting PrintConv to 0, using the
+-n option, or suffixing the tag name with a C<#> character).  An exclamation
+point (C<!>) indicates a tag that is considered I<Unsafe> to write under
+normal circumstances.  These tags are not written unless specified
+explicitly (ie. wildcards and "all" may not be used), and care should be
+taken when editing them manually since they may affect the way an image is
+rendered.  An asterisk (C<*>) indicates a I<Protected> tag which is not
+writable directly, but is written automatically by ExifTool (often when a
+corresponding Composite or Extra tag is written). A colon (C<:>) indicates a
+I<Mandatory> tag which may be added automatically when writing.
 
 The HTML version of these tables also lists possible B<Values> for
 discrete-valued tags, as well as B<Notes> for some tags.  The B<Values> are
@@ -297,7 +297,7 @@ indicates a structured tag, and C<lang-alt> is a tag that supports alternate
 languages.
 
 When reading, C<struct> tags are extracted only if the Struct (-struct)
-option is used.  Otherwise the corresponding "flattened" tags, indicated by
+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
@@ -594,7 +594,7 @@ my %shortcutNotes = (
         L<FAQ number 7|../faq.html#Q7> for details
     },
     Unsafe => q{
-        "unsafe" tags in JPEG images which are normally not copied.  Defined here
+        I<Unsafe> tags in JPEG images which are normally not copied.  Defined here
         as a shortcut to use when rebuilding JPEG EXIF from scratch. See
         L<FAQ number 20|../faq.html#Q20> for more information
     },
@@ -2342,7 +2342,7 @@ sub WriteTagNames($$)
             my %wattr = (
                 '_' => 'Flattened',
                 '+' => 'List',
-                '/' => 'Avoided',
+                '/' => 'Avoid',
                 '~' => 'Writable only with -n',
                 '!' => 'Unsafe',
                 '*' => 'Protected',

data/bin/{Image-ExifTool-10.23 → Image-ExifTool-10.25}/lib/Image/ExifTool/Canon.pm

@@ -66,6 +66,7 @@
 #              50) http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,3833.0.html
 #              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
 #              IB) Iliah Borg private communication (LibRaw)
 #              JD) Jens Duttke private communication
 #              JR) Jos Roost private communication
@@ -84,7 +85,7 @@ sub ProcessSerialData($$$);
 sub ProcessFilters($$$);
 sub SwapWords($);
 
-$VERSION = '3.64';
+$VERSION = '3.65';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -856,6 +857,8 @@ my %pictureStyles = ( #12
     0x86 => 'Monochrome',
     0x87 => 'Auto', #PH
     0x88 => 'Fine Detail', #PH
+    0xff => 'n/a', #PH (guess)
+    0xffff => 'n/a', #PH (guess)
 );
 my %userDefStyles = ( #12/48
     Notes => q{
@@ -1690,11 +1693,22 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
         # 'Drop' because not found in JPEG images (too large for APP1 anyway)
         Flags => [ 'Unknown', 'Binary', 'Drop' ],
     },
-    0x4008 => { #PH guess (1DmkIII)
-        Name => 'BlackLevel', # (BasePictStyleOfUser)
-        Unknown => 1,
+    0x4008 => { #53
+        Name => 'PictureStyleUserDef', # (BasePictStyleOfUser)
+        Format => 'int16u',
+        Count => 3, # UserDef1, UserDef2, UserDef3
+        PrintHex => 1,
+        SeparateTable => 'PictureStyle',
+        PrintConv => [\%pictureStyles,\%pictureStyles,\%pictureStyles],
+    },
+    0x4009 => { #53
+        Name => 'PictureStylePC', # (BasePictStyleOfUser)
+        Format => 'int16u',
+        Count => 3, # PC1, PC2, PC3
+        PrintHex => 1,
+        SeparateTable => 'PictureStyle',
+        PrintConv => [\%pictureStyles,\%pictureStyles,\%pictureStyles],
     },
-    # 0x4009 (BasePictStyleOfPC)
     0x4010 => { #forum2933
         Name => 'CustomPictureStyleFileName', # (PictStyleCaption)
         Writable => 'string',

data/bin/Image-ExifTool-10.25/lib/Image/ExifTool/DJI.pm

@@ -0,0 +1,71 @@
+#------------------------------------------------------------------------------
+# File:         DJI.pm
+#
+# Description:  DJI Phantom maker notes tags
+#
+# Revisions:    2016-07-25 - P. Harvey Created
+#------------------------------------------------------------------------------
+
+package Image::ExifTool::DJI;
+
+use strict;
+use vars qw($VERSION);
+use Image::ExifTool::Exif;
+
+$VERSION = '1.00';
+
+my %convFloat2 = (
+    PrintConv => 'sprintf("%+.2f", $val)',
+    PrintConvInv => '$val',
+);
+
+# DJI maker notes (ref PH, mostly educated guesses based on DJI QuickTime::UserData tags)
+%Image::ExifTool::DJI::Main = (
+    WRITE_PROC => \&Image::ExifTool::Exif::WriteExif,
+    CHECK_PROC => \&Image::ExifTool::Exif::CheckExif,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => q{
+        This table lists tags found in the maker notes of images from some DJI
+        Phantom drones.
+    },
+    0x01 => { Name => 'Make',       Writable => 'string' },
+  # 0x02 - int8u[4]: "1 0 0 0", "1 1 0 0"
+    0x03 => { Name => 'SpeedX',     Writable => 'float', %convFloat2 }, # (guess)
+    0x04 => { Name => 'SpeedY',     Writable => 'float', %convFloat2 }, # (guess)
+    0x05 => { Name => 'SpeedZ',     Writable => 'float', %convFloat2 }, # (guess)
+    0x06 => { Name => 'Pitch',      Writable => 'float', %convFloat2 },
+    0x07 => { Name => 'Yaw',        Writable => 'float', %convFloat2 },
+    0x08 => { Name => 'Roll',       Writable => 'float', %convFloat2 },
+    0x09 => { Name => 'CameraPitch',Writable => 'float', %convFloat2 },
+    0x0a => { Name => 'CameraYaw',  Writable => 'float', %convFloat2 },
+    0x0b => { Name => 'CameraRoll', Writable => 'float', %convFloat2 },
+);
+
+__END__
+
+=head1 NAME
+
+Image::ExifTool::DJI - DJI Phantom maker notes tags
+
+=head1 SYNOPSIS
+
+This module is loaded automatically by Image::ExifTool when required.
+
+=head1 DESCRIPTION
+
+This module contains definitions required by Image::ExifTool to interpret
+the maker notes in images from some DJI Phantom drones.
+
+=head1 AUTHOR
+
+Copyright 2003-2016, Phil Harvey (phil at owl.phy.queensu.ca)
+
+This library is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
+
+=head1 SEE ALSO
+
+L<Image::ExifTool::TagNames/DJI Tags>,
+L<Image::ExifTool(3pm)|Image::ExifTool>
+
+=cut

data/bin/{Image-ExifTool-10.23 → Image-ExifTool-10.25}/lib/Image/ExifTool/Exif.pm

@@ -53,7 +53,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '3.82';
+$VERSION = '3.83';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -289,6 +289,14 @@ sub BINARY_DATA_LIMIT { return 10 * 1024 * 1024; }
     },
 );
 
+# convert DNG UTF-8 string values (may be string or int8u format)
+my %utf8StringConv = (
+    Writable => 'string',
+    Format => 'string',
+    ValueConv => '$self->Decode($val, "UTF8")',
+    ValueConvInv => '$self->Encode($val,"UTF8")',
+);
+
 # ValueConv that makes long values binary type
 my %longBin = (
     ValueConv => 'length($val) > 64 ? \$val : $val',
@@ -1366,11 +1374,11 @@ my %sampleFormat = (
         Name => 'WangTag4',
         PrintConv => 'length($val) <= 64 ? $val : \$val',
     },
-    # tags 0x80b8-0x80bb are registered to Island Graphics
-    0x80b8 => 'ImageReferencePoints', #29
-    0x80b9 => 'RegionXformTackPoint', #29
-    0x80ba => 'WarpQuadrilateral', #29
-    0x80bb => 'AffineTransformMat', #29
+    # tags 0x80b8-0x80bc are registered to Island Graphics
+    0x80b9 => 'ImageReferencePoints', #29
+    0x80ba => 'RegionXformTackPoint', #29
+    0x80bb => 'WarpQuadrilateral', #29
+    0x80bc => 'AffineTransformMat', #29
     0x80e3 => 'Matteing', #9
     0x80e4 => 'DataType', #9
     0x80e5 => 'ImageDepth', #9
@@ -2658,9 +2666,8 @@ my %sampleFormat = (
     },
     0xc615 => {
         Name => 'LocalizedCameraModel',
-        Format => 'string',
-        Writable => 'string',
         WriteGroup => 'IFD0',
+        %utf8StringConv,
         PrintConv => '$self->Printable($val, 0)',
         PrintConvInv => '$val',
     },
@@ -3008,10 +3015,9 @@ my %sampleFormat = (
     },
     0xc68b => {
         Name => 'OriginalRawFileName',
-        Format => 'string', # sometimes written as int8u
-        Writable => 'string',
         WriteGroup => 'IFD0',
         Protected => 1,
+        %utf8StringConv,
     },
     0xc68c => {
         Name => 'OriginalRawFileData', # (writable directory!)
@@ -3116,15 +3122,15 @@ my %sampleFormat = (
     # 0xc6dc - int32u[4]: found in CR2 images (PH, 7DmkIII)
     0xc6f3 => {
         Name => 'CameraCalibrationSig',
-        Writable => 'string',
         WriteGroup => 'IFD0',
         Protected => 1,
+        %utf8StringConv,
     },
     0xc6f4 => {
         Name => 'ProfileCalibrationSig',
-        Writable => 'string',
         WriteGroup => 'IFD0',
         Protected => 1,
+        %utf8StringConv,
     },
     0xc6f5 => {
         Name => 'ProfileIFD', # (ExtraCameraProfiles)
@@ -3142,9 +3148,9 @@ my %sampleFormat = (
     },
     0xc6f6 => {
         Name => 'AsShotProfileName',
-        Writable => 'string',
         WriteGroup => 'IFD0',
         Protected => 1,
+        %utf8StringConv,
     },
     0xc6f7 => {
         Name => 'NoiseReductionApplied',
@@ -3154,9 +3160,9 @@ my %sampleFormat = (
     },
     0xc6f8 => {
         Name => 'ProfileName',
-        Writable => 'string',
         WriteGroup => 'IFD0',
         Protected => 1,
+        %utf8StringConv,
     },
     0xc6f9 => {
         Name => 'ProfileHueSatMapDims',
@@ -3203,9 +3209,9 @@ my %sampleFormat = (
     },
     0xc6fe => {
         Name => 'ProfileCopyright',
-        Writable => 'string',
         WriteGroup => 'IFD0',
         Protected => 1,
+        %utf8StringConv,
     },
     0xc714 => {
         Name => 'ForwardMatrix1',
@@ -3223,21 +3229,23 @@ my %sampleFormat = (
     },
     0xc716 => {
         Name => 'PreviewApplicationName',
-        Writable => 'string',
         WriteGroup => 'IFD0',
         Protected => 1,
+        %utf8StringConv,
     },
     0xc717 => {
         Name => 'PreviewApplicationVersion',
         Writable => 'string',
         WriteGroup => 'IFD0',
         Protected => 1,
+        %utf8StringConv,
     },
     0xc718 => {
         Name => 'PreviewSettingsName',
         Writable => 'string',
         WriteGroup => 'IFD0',
         Protected => 1,
+        %utf8StringConv,
     },
     0xc719 => {
         Name => 'PreviewSettingsDigest',
@@ -3316,6 +3324,9 @@ my %sampleFormat = (
     },
     0xc740 => { # DNG 1.3
         Name => 'OpcodeList1',
+        Writable => 'undef',
+        WriteGroup => 'SubIFD',
+        Protected => 1,
         Binary => 1,
         # opcodes:
         # 1 => 'WarpRectilinear',
@@ -3334,10 +3345,16 @@ my %sampleFormat = (
     },
     0xc741 => { # DNG 1.3
         Name => 'OpcodeList2',
+        Writable => 'undef',
+        WriteGroup => 'SubIFD',
+        Protected => 1,
         Binary => 1,
     },
     0xc74e => { # DNG 1.3
         Name => 'OpcodeList3',
+        Writable => 'undef',
+        WriteGroup => 'SubIFD',
+        Protected => 1,
         Binary => 1,
     },
     0xc761 => { # DNG 1.3