exiftool_vendored 9.53.0 → 9.58.0

data/bin/{Image-ExifTool-9.53 → Image-ExifTool-9.58}/lib/Image/ExifTool/Olympus.pm

@@ -36,7 +36,7 @@ use vars qw($VERSION);
 use Image::ExifTool::Exif;
 use Image::ExifTool::APP12;
 
-$VERSION = '2.16';
+$VERSION = '2.17';
 
 sub PrintLensInfo($$$);
 
@@ -320,6 +320,7 @@ my %olympusCameraTypes = (
     D4537 => 'VR340,D750',
     D4541 => 'SZ-12',
     D4545 => 'VH410',
+    D4546 => 'XZ-10', #21
     D4547 => 'TG-2',
     D4548 => 'TG-830',
     D4549 => 'TG-630',

data/bin/{Image-ExifTool-9.53 → Image-ExifTool-9.58}/lib/Image/ExifTool/Pentax.pm

@@ -55,7 +55,7 @@ use vars qw($VERSION %pentaxLensTypes);
 use Image::ExifTool::Exif;
 use Image::ExifTool::HP;
 
-$VERSION = '2.73';
+$VERSION = '2.75';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -101,12 +101,14 @@ sub PrintFilter($$$);
     '3 23' => 'smc PENTAX-F 100-300mm F4.5-5.6 or Sigma Lens',
     '3 23.1' => 'Sigma AF 28-300mm F3.5-5.6 DL IF', #JD
     '3 23.2' => 'Sigma AF 28-300mm F3.5-6.3 DG IF Macro', #JD
+    '3 23.3' => 'Tokina 80-200mm F2.8 ATX-Pro', #Exiv2
     '3 24' => 'smc PENTAX-F 35-135mm F3.5-4.5',
     '3 25' => 'smc PENTAX-F 35-105mm F4-5.6 or Sigma or Tokina Lens',
     '3 25.1' => 'Sigma AF 28-300mm F3.5-5.6 DL IF', #11
     '3 25.2' => 'Sigma 55-200mm F4-5.6 DC', #JD
-    '3 25.3' => 'Sigma AF 28-300mm F3.5-6.3 DG IF Macro', #JD
-    '3 25.4' => 'Tokina 80-200mm F2.8 ATX-Pro', #12
+    '3 25.3' => 'Sigma AF 28-300mm F3.5-6.3 DL IF', #Exiv2
+    '3 25.4' => 'Sigma AF 28-300mm F3.5-6.3 DG IF Macro', #JD
+    '3 25.5' => 'Tokina 80-200mm F2.8 ATX-Pro', #12
     '3 26' => 'smc PENTAX-F* 250-600mm F5.6 ED[IF]',
     '3 27' => 'smc PENTAX-F 28-80mm F3.5-4.5 or Tokina Lens',
     '3 27.1' => 'Tokina AT-X Pro AF 28-70mm F2.6-2.8', #JD
@@ -254,6 +256,7 @@ sub PrintFilter($$$);
     '7 0' => 'smc PENTAX-DA 21mm F3.2 AL Limited', #13
     '7 58' => 'smc PENTAX-D FA Macro 100mm F2.8 WR', #PH - this bit of information cost me $600 ;)
     '7 75' => 'Tamron SP AF 70-200mm F2.8 Di LD [IF] Macro (A001)', #(Anton Bondar)
+    '7 201' => 'smc Pentax-DA L 50-200mm F4-5.6 ED WR', #(Bruce Rusk)
     '7 202' => 'smc PENTAX-DA L 18-55mm F3.5-5.6 AL WR', #29
     '7 203' => 'HD PENTAX-DA 55-300mm F4-5.8 ED WR', #29
     '7 204' => 'HD PENTAX-DA 15mm F4 ED AL Limited', #forum5318
@@ -290,6 +293,7 @@ sub PrintFilter($$$);
     '7 244' => 'smc PENTAX-DA 21mm F3.2 AL Limited', #16
     '8 3' => 'Sigma AF 18-125mm F3.5-5.6 DC', #29
     '8 4' => 'Sigma 50mm F1.4 EX DG HSM', #Artur private communication
+    '8 7' => 'Sigma 24-70mm F2.8 IF EX DG HSM', #Exiv2
     '8 8' => 'Sigma 18-250mm F3.5-6.3 DC OS HSM', #27
     '8 11' => 'Sigma 10-20mm F3.5 EX DC HSM', #27
     '8 12' => 'Sigma 70-300mm F4-5.6 DG OS', #http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,3382.0.html
@@ -307,6 +311,7 @@ sub PrintFilter($$$);
     '8 28' => 'Sigma 18-250mm F3.5-6.3 DC Macro HSM', #27
     '8 29' => 'Sigma 35mm F1.4 DG HSM', #27
     '8 30' => 'Sigma 17-70mm F2.8-4 DC Macro HSM Contemporary', #27
+    '8 32' => 'Sigma 30mm F1.4 DC HSM | A', #27
     '8 209' => 'HD PENTAX-DA 20-40mm F2.8-4 ED Limited DC WR', #29
     '8 210' => 'smc PENTAX-DA 18-270mm F3.5-6.3 ED SDM', #Helmut Schutz
     '8 211' => 'HD PENTAX-DA 560mm F5.6 ED AW', #PH

data/bin/{Image-ExifTool-9.53 → Image-ExifTool-9.58}/lib/Image/ExifTool/Photoshop.pm

@@ -19,7 +19,7 @@
 #               4) http://www.fileformat.info/format/psd/egff.htm
 #               5) http://www.telegraphics.com.au/svn/psdparse/trunk/resources.c
 #               6) http://libpsd.graphest.com/files/Photoshop%20File%20Formats.pdf
-#               7) http://www.adobe.com/devnet-apps/photoshop/fileformatashtml/PhotoshopFileFormats.htm
+#               7) http://www.adobe.com/devnet-apps/photoshop/fileformatashtml/
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::Photoshop;
@@ -28,7 +28,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD $iptcDigestInfo);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.44';
+$VERSION = '1.45';
 
 sub ProcessPhotoshop($$$);
 sub WritePhotoshop($$$);
@@ -238,6 +238,7 @@ my %psdMap = (
     0x043d => { Unknown => 1, Name => 'WindowsDEVMODE' }, #7
     0x043e => { Unknown => 1, Name => 'AutoSaveFilePath' }, #7
     0x043f => { Unknown => 1, Name => 'AutoSaveFormat' }, #7
+    0x0440 => { Unknown => 1, Name => 'PathSelectionState' }, #7
     # 0x07d0-0x0bb6 Path information
     0x0bb7 => {
         Name => 'ClippingPathName',
@@ -248,8 +249,10 @@ my %psdMap = (
             return Image::ExifTool::Photoshop::ConvertPascalString($self,$val);
         },
     },
+    0x0bb8 => { Unknown => 1, Name => 'OriginPathInfo' }, #7
     # 0x0fa0-0x1387 - plug-in resources (ref 7)
     0x1b58 => { Unknown => 1, Name => 'ImageReadyVariables' }, #7
+    0x1b59 => { Unknown => 1, Name => 'ImageReadyDataSets' }, #7
     0x1f40 => { Unknown => 1, Name => 'LightroomWorkflow' }, #7
     0x2710 => { Unknown => 1, Name => 'PrintFlagsInfo' },
 );
@@ -616,7 +619,7 @@ under the same terms as Perl itself.
 
 =item L<http://libpsd.graphest.com/files/Photoshop%20File%20Formats.pdf>
 
-=item L<http://www.adobe.com/devnet-apps/photoshop/fileformatashtml/PhotoshopFileFormats.htm>
+=item L<http://www.adobe.com/devnet-apps/photoshop/fileformatashtml/>
 
 =back
 

data/bin/{Image-ExifTool-9.53 → Image-ExifTool-9.58}/lib/Image/ExifTool/QuickTime.pm

@@ -39,7 +39,7 @@ use vars qw($VERSION $AUTOLOAD);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.76';
+$VERSION = '1.78';
 
 sub FixWrongFormat($);
 sub ProcessMOV($$;$);
@@ -387,7 +387,7 @@ my %graphicsMode = (
     ],
     _htc => {
         Name => 'HTCInfo',
-        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::HTC' },
+        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::HTCInfo' },
     },
     udta => {
         Name => 'UserData',
@@ -398,6 +398,49 @@ my %graphicsMode = (
         Groups => { 2 => 'Image' },
         Binary => 1,
     },
+    ardt => { #PH
+        Name => 'ARDroneFile',
+        ValueConv => 'length($val) > 4 ? substr($val,4) : $val', # remove length
+    },
+    prrt => { #PH
+        Name => 'ARDroneTelemetry',
+        Notes => q{
+            telemetry information for each video frame: status1, status2, time, pitch,
+            roll, yaw, speed, altitude
+        },
+        ValueConv => q{
+            my $size = length $val;
+            return \$val if $size < 12 or not $$self{OPTIONS}{Binary};
+            my $len = Get16u(\$val, 2);
+            my $str = '';
+            SetByteOrder('II');
+            my $pos = 12;
+            while ($pos + $len <= $size) {
+                my $s1 = Get16u(\$val, $pos);
+                # s2: 7=take-off?, 3=moving, 4=hovering, 9=landing?, 2=landed
+                my $s2 = Get16u(\$val, $pos + 2);
+                $str .= "$s1 $s2";
+                my $num = int(($len-4)/4);
+                my ($i, $v);
+                for ($i=0; $i<$num; ++$i) {
+                    my $pt = $pos + 4 + $i * 4;
+                    if ($i > 0 && $i < 4) {
+                        $v = GetFloat(\$val, $pt); # pitch/roll/yaw
+                    } else {
+                        $v = Get32u(\$val, $pt);
+                        # convert time to sec, and speed(NC)/altitude to metres
+                        $v /= 1000 if $i <= 5;
+                    }
+                    $str .= " $v";
+                }
+                $str .= "\n";
+                $pos += $len;
+            }
+            SetByteOrder('MM');
+            return \$str;
+        },
+    },
+    # meta - proprietary XML information written by some Flip cameras - PH
 );
 
 # MPEG-4 'ftyp' atom
@@ -425,7 +468,7 @@ my %graphicsMode = (
 );
 
 # proprietary HTC atom (HTC One MP4 video)
-%Image::ExifTool::QuickTime::HTC = (
+%Image::ExifTool::QuickTime::HTCInfo = (
     PROCESS_PROC => \&ProcessMOV,
     GROUPS => { 2 => 'Video' },
     NOTES => 'Tags written by some HTC camera phones.',
@@ -655,6 +698,10 @@ my %graphicsMode = (
         Name => 'CompressedMovie',
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::CMovie' },
     },
+    htka => { # (written by HTC One M8 in slow-motion 1280x720 video - PH)
+        Name => 'HTCTrack',
+        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::Track' },
+    },
     # prfl - Profile (ref 12)
     # clip - clipping --> contains crgn (clip region) (ref 12)
     # mvex - movie extends --> contains mehd (movie extends header), trex (track extends) (ref 14)
@@ -1309,6 +1356,11 @@ my %graphicsMode = (
     },
     # ---- GoPro ----
     GoPr => 'GoProType', #PH
+    # --- HTC ----
+    htcb => {
+        Name => 'HTCBinary',
+        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::HTCBinary' },
+    },
     # ---- Kodak ----
     DcMD => {
         Name => 'KodakDcMD',
@@ -1419,11 +1471,6 @@ my %graphicsMode = (
         Name => 'SamsungINFO',
         SubDirectory => { TagTable => 'Image::ExifTool::Samsung::INFO' },
     },
-    # ducp - 4 bytes all zero (Samsung ST96,WB750), 52 bytes all zero (Samsung WB30F)
-    # edli - 52 bytes all zero (Samsung WB30F)
-    # @etc - 4 bytes all zero (Samsung WB30F)
-    # saut - 4 bytes all zero (Samsung SM-N900T)
-    # smrd - string "TRUEBLUE" (Samsung SM-C101)
    '@sec' => { #PH (Samsung WB30F)
         Name => 'SamsungSec',
         SubDirectory => { TagTable => 'Image::ExifTool::Samsung::sec' },
@@ -1435,6 +1482,14 @@ my %graphicsMode = (
             Start => 4,
         },
     },
+    cver => 'CodeVersion', #PH (guess, Samsung MV900F)
+    # ducp - 4 bytes all zero (Samsung ST96,WB750), 52 bytes all zero (Samsung WB30F)
+    # edli - 52 bytes all zero (Samsung WB30F)
+    # @etc - 4 bytes all zero (Samsung WB30F)
+    # saut - 4 bytes all zero (Samsung SM-N900T)
+    # smrd - string "TRUEBLUE" (Samsung SM-C101)
+    # ---- Unknown ----
+    # CDET - 128 bytes (unknown origin)
 #
 # other 3rd-party tags
 # (ref http://code.google.com/p/mp4parser/source/browse/trunk/isoparser/src/main/resources/isoparser-default.properties?r=814)
@@ -1448,6 +1503,20 @@ my %graphicsMode = (
     lrcu => 'LyricsURI',
 );
 
+# Unknown information stored in HTC One (M8) videos - PH
+%Image::ExifTool::QuickTime::HTCBinary = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 0 => 'MakerNotes', 1 => 'HTC', 2 => 'Video' },
+    TAG_PREFIX => 'HTCBinary',
+    FORMAT => 'int32u',
+    FIRST_ENTRY => 0,
+    # 0 - values: 1
+    # 1 - values: 0
+    # 2 - values: 0
+    # 3 - values: FileSize minus 12 (why?)
+    # 4 - values: 12
+);
+
 # User-specific media data atoms (ref 11)
 %Image::ExifTool::QuickTime::UserMedia = (
     PROCESS_PROC => \&ProcessMOV,
@@ -2513,6 +2582,10 @@ my %graphicsMode = (
         Name => 'CompositionToDecodeTimelineMapping',
         Flags => ['Binary','Unknown'],
     },
+    stps => {
+        Name => 'PartialSyncSamples',
+        ValueConv => 'join " ",unpack("x8N*",$val)',
+    },
 );
 
 # MP4 audio sample description box (ref 5/AtomicParsley 0.9.4 parsley.cpp)
@@ -2870,6 +2943,7 @@ my %graphicsMode = (
             hint => 'Hint Track',
             ipsm => 'IPMP', #3
             m7sm => 'MPEG-7 Stream', #3
+            meta => 'NRT Metadata', #PH
             mdir => 'Metadata', #3
             mdta => 'Metadata Tags', #PH
             mjsm => 'MPEG-J', #3
@@ -3225,6 +3299,21 @@ sub UnpackLang($)
     return $lang;
 }
 
+#------------------------------------------------------------------------------
+# Get langInfo hash and save details about alt-lang tags
+# Inputs: 0) ExifTool ref, 1) tagInfo hash ref, 2) locale code
+# Returns: new tagInfo hash ref, or undef if invalid
+sub GetLangInfoQT($$$)
+{
+    my ($et, $tagInfo, $langCode) = @_;
+    my $langInfo = Image::ExifTool::GetLangInfo($tagInfo, $langCode);
+    if ($langInfo) {
+        $$et{QTLang} or $$et{QTLang} = [ ];
+        push @{$$et{QTLang}}, $$langInfo{Name};
+    }
+    return $langInfo;
+}
+
 #------------------------------------------------------------------------------
 # Process MPEG-4 MTDT atom (ref 11)
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
@@ -3254,7 +3343,7 @@ sub ProcessMetaData($$$)
             $lang = UnpackLang($lang);
             # handle alternate languages
             if ($lang) {
-                my $langInfo = Image::ExifTool::GetLangInfo($tagInfo, $lang);
+                my $langInfo = GetLangInfoQT($et, $tagInfo, $lang);
                 $tagInfo = $langInfo if $langInfo;
             }
             $verbose and $et->VerboseInfo($tag, $tagInfo,
@@ -3384,6 +3473,7 @@ sub ProcessEncodingParams($$$)
 # Returns: 1 on success
 sub ProcessKeys($$$)
 {
+    local $_;
     my ($et, $dirInfo, $tagTablePtr) = @_;
     my $dataPt = $$dirInfo{DataPt};
     my $dirLen = length $$dataPt;
@@ -3394,6 +3484,7 @@ sub ProcessKeys($$$)
     }
     my $pos = 8;
     my $index = 1;
+    ++$$et{KeyCount};   # increment key count for this directory
     my $infoTable = GetTagTable('Image::ExifTool::QuickTime::ItemList');
     my $userTable = GetTagTable('Image::ExifTool::QuickTime::UserData');
     while ($pos < $dirLen - 4) {
@@ -3438,11 +3529,19 @@ sub ProcessKeys($$$)
             $msg = ' (Unknown)';
         }
         # substitute this tag in the ItemList table with the given index
-        delete $$infoTable{$index};
+        my $id = $$et{KeyCount} . '.' . $index;
+        if (ref $$infoTable{$id} eq 'HASH') {
+            # delete other languages too if they exist
+            my $oldInfo = $$infoTable{$id};
+            if ($$oldInfo{OtherLang}) {
+                delete $$infoTable{$_} foreach @{$$oldInfo{OtherLang}};
+            }
+            delete $$infoTable{$id};
+        }
         if ($newInfo) {
             $msg or $msg = '';
-            AddTagToTable($infoTable, $index, $newInfo);
-            $out and printf $out "%sAdded ItemList Tag 0x%.4x = $tag$msg\n", $$et{INDENT}, $index;
+            AddTagToTable($infoTable, $id, $newInfo);
+            $out and printf $out "$$et{INDENT}Added ItemList Tag $id = $tag$msg\n";
         }
         $pos += $len;
         ++$index;
@@ -3462,8 +3561,12 @@ sub ProcessMOV($$;$)
     my $verbose = $et->Options('Verbose');
     my $dataPos = $$dirInfo{Base} || 0;
     my $charsetQuickTime = $et->Options('CharsetQuickTime');
-    my ($buff, $tag, $size, $track, $isUserData, %triplet);
+    my ($buff, $tag, $size, $track, $isUserData, %triplet, $doDefaultLang);
 
+    unless (defined $$et{KeyCount}) {
+        $$et{KeyCount} = 0;     # initialize ItemList key directory count
+        $doDefaultLang = 1;     # flag to generate default language tags
+    }
     # more convenient to package data as a RandomAccess file
     $raf or $raf = new File::RandomAccess($dataPt);
     # skip leading bytes if necessary
@@ -3562,10 +3665,10 @@ sub ProcessMOV($$;$)
         my $tagInfo = $et->GetTagInfo($tagTablePtr, $tag);
         # allow numerical tag ID's
         unless ($tagInfo) {
-            my $num = unpack('N', $tag);
-            if ($$tagTablePtr{$num}) {
-                $tagInfo = $et->GetTagInfo($tagTablePtr, $num);
-                $tag = $num;
+            my $id = $$et{KeyCount} . '.' . unpack('N', $tag);
+            if ($$tagTablePtr{$id}) {
+                $tagInfo = $et->GetTagInfo($tagTablePtr, $id);
+                $tag = $id;
             }
         }
         # generate tagInfo if Unknown option set
@@ -3756,7 +3859,15 @@ sub ProcessMOV($$;$)
                                     $lang .= "-$ctry";
                                 }
                             }
-                            $langInfo = Image::ExifTool::GetLangInfo($tagInfo, $lang) if $lang;
+                            if ($lang) {
+                                # get tagInfo for other language
+                                $langInfo = GetLangInfoQT($et, $tagInfo, $lang);
+                                # save other language tag ID's so we can delete later if necessary
+                                if ($langInfo) {
+                                    $$tagInfo{OtherLang} or $$tagInfo{OtherLang} = [ ];
+                                    push @{$$tagInfo{OtherLang}}, $$langInfo{TagID};
+                                }
+                            }
                         }
                         $langInfo or $langInfo = $tagInfo;
                         $et->VerboseInfo($tag, $langInfo,
@@ -3808,7 +3919,7 @@ sub ProcessMOV($$;$)
                             my $enc = $str=~s/^\xfe\xff// ? 'UTF16' : 'UTF8';
                             $str = $et->Decode($str, $enc);
                         }
-                        $langInfo = Image::ExifTool::GetLangInfo($tagInfo, $lang) if $lang;
+                        $langInfo = GetLangInfoQT($et, $tagInfo, $lang) if $lang;
                         $et->FoundTag($langInfo || $tagInfo, $str);
                         $pos += $len;
                     }
@@ -3848,6 +3959,18 @@ sub ProcessMOV($$;$)
         $dataPos += $size + 8;
         ($size, $tag) = unpack('Na4', $buff);
     }
+    # fill in missing defaults for alternate language tags
+    # (the first language is taken as the default)
+    if ($doDefaultLang and $$et{QTLang}) {
+        foreach $tag (@{$$et{QTLang}}) {
+            next unless defined $$et{VALUE}{$tag};
+            my $langInfo = $$et{TAG_INFO}{$tag} or next;
+            my $tagInfo = $$langInfo{SrcTagInfo} or next;
+            next if defined $$et{VALUE}{$$tagInfo{Name}};
+            $et->FoundTag($tagInfo, $$et{VALUE}{$tag});
+        }
+        delete $$et{QTLang};
+    }
     return 1;
 }