exiftool_vendored 9.37.0 → 9.41.0

data/bin/{Image-ExifTool-9.37 → Image-ExifTool-9.41}/lib/Image/ExifTool/Pentax.pm

@@ -54,7 +54,7 @@ use vars qw($VERSION %pentaxLensTypes);
 use Image::ExifTool::Exif;
 use Image::ExifTool::HP;
 
-$VERSION = '2.63';
+$VERSION = '2.67';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -252,6 +252,11 @@ sub PrintFilter($$$);
     '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 202' => 'smc PENTAX-DA L 18-55mm F3.5-5.6 AL WR', #29
+    '7 204' => 'HD PENTAX-DA 15mm F4 ED AL Limited', #forum5318
+    '7 205' => 'HD PENTAX-DA 35mm F2.8 Macro Limited', #29
+    '7 206' => 'HD PENTAX-DA 70mm F2.4 Limited', #29
+    '7 207' => 'HD PENTAX-DA 21mm F3.2 ED AL Limited', #forum5327
+    '7 208' => 'HD PENTAX-DA 40mm F2.8 Limited', #PH
     '7 212' => 'smc PENTAX-DA 50mm F1.8', #PH
     '7 213' => 'smc PENTAX-DA 40mm F2.8 XS', #PH
     '7 214' => 'smc PENTAX-DA 35mm F2.4 AL', #PH
@@ -295,6 +300,8 @@ sub PrintFilter($$$);
     '8 23' => 'Sigma 70-200mm F2.8 APO EX DG OS HSM', #27
     '8 27' => 'Sigma 18-200mm F3.5-6.3 II DC HSM', #27
     '8 28' => 'Sigma 18-250mm F3.5-6.3 DC Macro HSM', #27
+    '8 30' => 'Sigma 17-70mm F2.8-4 DC Macro HSM Contemporary', #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
     '8 215' => 'smc PENTAX-DA 18-135mm F3.5-5.6 ED AL [IF] DC WR', #PH
@@ -347,6 +354,7 @@ sub PrintFilter($$$);
     '22 5' => '05 Toy Lens Telephoto 18mm F8', #PH
     '21 6' => '06 Telephoto Zoom 15-45mm F2.8', #PH
     '21 7' => '07 Mount Shield 11.5mm F9', #PH (NC)
+    '21 8' => '08 Wide Zoom 3.8-5.9mm F3.7-4', #PH (NC)
 );
 
 # Pentax model ID codes - PH
@@ -471,6 +479,7 @@ my %pentaxModelID = (
     0x12f98 => 'WG-3',
     0x12fa2 => 'WG-10',
     0x12fb6 => 'K-50',
+    0x12fc0 => 'K-3', #29
     0x12fca => 'K-500',
 );
 
@@ -742,6 +751,40 @@ my %binaryDataAttrs = (
         Count => 4,
         PrintConv => '$val=~tr/ /./; $val',
         PrintConvInv => '$val=~tr/./ /; $val',
+        # 0.1.0.3 - PENTAX Optio E40
+        # 3.0.0.0 - K10D
+        # 3.1.0.0 - Optio A40/S10/L36/L40/M40/V10
+        # 3.1.2.0 - Optio Z10
+        # 4.0.2.0 - Optio E50
+        # 4.1.0.0 - Optio S12
+        # 4.1.1.0 - Optio M50
+        # 4.1.2.0 - K20D, K200D
+        # 4.2.0.0 - Optio L50/V20
+        # 4.2.1.0 - Optio E60/M90
+        # 4.2.2.0 - Optio W60
+        # 4.2.3.0 - Optio M60
+        # 4.4.0.1 - K-m, K2000
+        # 4.5.0.0 - Optio E70/L70
+        # 4.5.0.0 - Optio P70
+        # 4.6.0.0 - Optio E80/E90/W80
+        # 5.0.0.0 - K-7, Optio P80/WS80
+        # 5.1.0.0 - K-x
+        # 5.2.0.0 - Optio I-10
+        # 5.3.0.0 - Optio H90
+        # 5.3.2.0 - Optio W90
+        # 6.0.0.0 - K-r, 645D
+        # 6.1.3.0 - Optio LS1000/RS1000/RS1500/RZ10
+        # 7.0.0.0 - K-5
+        # 7.1.0.0 - Optio WG-1GPS/WG-10
+        # 7.2.0.0 - Optio S1
+        # 8.0.0.0 - Q
+        # 8.0.1.0 - Optio RZ18
+        # 8.0.4.0 - Optio VS20
+        # 8.1.0.0 - Optio LS465/WG-2GPS
+        # 9.0.0.0 - K-01
+        # 9.1.2.0 - X-5
+        # 10.0.0.0 - K-30, K-50, K-500, K-5 II
+        # 11.0.0.0 - K-3
     },
     0x0001 => { #PH
         Name => 'PentaxModelType',
@@ -1008,8 +1051,9 @@ my %binaryDataAttrs = (
             },
         },
     ],
-    0x000e => { #7
+    0x000e => [{ #7
         Name => 'AFPointSelected',
+        Condition => '$$self{Model} ne "K-3"',
         Writable => 'int16u',
         PrintConvColumns => 2,
         PrintConv => [{
@@ -1035,9 +1079,26 @@ my %binaryDataAttrs = (
         # (second number exists for K-5II(s) is usually 0, but is 1 for AF.C with
         # AFPointMode=='Select' and extended tracking focus points are enabled in the settings)
         ],
-    },
-    0x000f => { #PH
+    },{
+        Name => 'AFPointSelected',
+        Writable => 'int16u',
+        PrintConvColumns => 2,
+        PrintConv => [{
+            # 0 - Contrast-detect AF? - PH (K-5)
+            0xffff => 'Auto',
+            0xfffe => 'Fixed Center',
+            0xfffd => 'Automatic Tracking AF', #JD
+            0xfffc => 'Face Detect AF', #JD
+            0xfffb => 'AF Select', #PH (Q select from 25-areas)
+            0 => 'None',
+            # NEED TO DECODE THIS
+            # seen 0,17,19,20,25
+        },
+        ],
+    }],
+    0x000f => [{ #PH
         Name => 'AFPointsInFocus',
+        Condition => '$$self{Model} ne "K-3"',
         Writable => 'int16u',
         PrintHex => 1,
         PrintConv => {
@@ -1053,7 +1114,14 @@ my %binaryDataAttrs = (
             8 => 'Bottom-center',
             9 => 'Bottom-right',
         },
-    },
+    },{ #PH
+        Name => 'AFPointsInFocus',
+        Writable => 'int32u',
+        PrintHex => 1,
+        PrintConv => {
+            # NEED TO DECODE THIS
+        },
+    }],
     0x0010 => { #PH
         Name => 'FocusPosition',
         Writable => 'int16u',
@@ -1753,7 +1821,7 @@ my %binaryDataAttrs = (
     },
     0x0062 => { # (http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,4803.0.html)
         Name => 'RawDevelopmentProcess',
-        Condition => '$$self{Make} =~ /^PENTAX/', # rules out Kodak, which also use this tag
+        Condition => '$$self{Make} =~ /^(PENTAX|RICOH)/', # rules out Kodak, which also use this tag
         Writable => 'int16u',
         PrintConv => {
             1 => '1 (K10D,K200D,K2000,K-m)',
@@ -1767,6 +1835,7 @@ my %binaryDataAttrs = (
             10 => '10 (K-01,K-30)',
             11 => '11 (Q10)',
             12 => '12 (MX-1)',
+            13 => '13 (K-3)',
         },
     },
     0x0067 => { #PH (K-5)
@@ -2164,7 +2233,7 @@ my %binaryDataAttrs = (
             SubDirectory => { TagTable => 'Image::ExifTool::Pentax::LensInfo' },
         },{
             Name => 'LensInfo',
-            Condition => '$count != 90 and $count != 91 and $count != 80',
+            Condition => '$count != 90 and $count != 91 and $count != 80 and $count != 128',
             SubDirectory => { TagTable => 'Image::ExifTool::Pentax::LensInfo2' },
         },{
             Name => 'LensInfo', # 645D
@@ -2175,8 +2244,8 @@ my %binaryDataAttrs = (
             Condition => '$count == 91',
             SubDirectory => { TagTable => 'Image::ExifTool::Pentax::LensInfo4' },
         },{
-            Name => 'LensInfo', # K-01, K-30, K-50, K-500
-            Condition => '$count == 80',
+            Name => 'LensInfo', # K-01, K-30, K-50, K-500, K-3
+            Condition => '$count == 80 or $count == 128',
             SubDirectory => { TagTable => 'Image::ExifTool::Pentax::LensInfo5' },
         }
     ],
@@ -2193,6 +2262,7 @@ my %binaryDataAttrs = (
     ],
     0x0209 => { #PH
         Name => 'AEMeteringSegments',
+        Condition => '$count <= 77', # (doesn't work for K-3)
         Format => 'int8u',
         Count => -1,
         Notes => q{
@@ -2216,12 +2286,14 @@ my %binaryDataAttrs = (
     },
     0x020a => { #PH/JD/19
         Name => 'FlashMeteringSegments',
+        Condition => '$count <= 77', # (likely doesn't work for K-3)
         Format => 'int8u',
         Count => -1,
         %convertMeteringSegments,
     },
     0x020b => { #PH/JD/19
         Name => 'SlaveFlashMeteringSegments',
+        Condition => '$count <= 77', # (likely doesn't work for K-3)
         Format => 'int8u',
         Count => -1,
         Notes => 'used in wireless control mode',
@@ -5435,13 +5507,13 @@ sub PentaxEvInv($)
 # Returns: Encrypted or decrypted ShutterCount
 sub CryptShutterCount($$)
 {
-    my ($val, $exifTool) = @_;
+    my ($val, $et) = @_;
     # Pentax Date and Time values are used in the encryption
-    return undef unless $$exifTool{PentaxDate} and $$exifTool{PentaxTime} and
-        length($$exifTool{PentaxDate})==4 and length($$exifTool{PentaxTime})>=3;
+    return undef unless $$et{PentaxDate} and $$et{PentaxTime} and
+        length($$et{PentaxDate})==4 and length($$et{PentaxTime})>=3;
     # get Date and Time as integers (after padding Time with a null byte)
-    my $date = unpack('N', $$exifTool{PentaxDate});
-    my $time = unpack('N', $$exifTool{PentaxTime} . "\0");
+    my $date = unpack('N', $$et{PentaxDate});
+    my $time = unpack('N', $$et{PentaxTime} . "\0");
     return $val ^ $date ^ (0xffffffff - $time);
 }
 

data/bin/{Image-ExifTool-9.37 → Image-ExifTool-9.41}/lib/Image/ExifTool/PhaseOne.pm

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.00';
+$VERSION = '1.01';
 
 sub ProcessPhaseOne($$$);
 sub ProcessSensorCalibration($$$);
@@ -288,10 +288,10 @@ my @formatSize = ( undef,        1,       1, undef,        4 );
 #         5) IFD entry offset, 6) IFD entry size, 7) parameter hash
 sub HtmlDump($$$$$$%)
 {
-    my ($exifTool, $tagTablePtr, $tagID, $value, $entry, $entryLen, %parms) = @_;
+    my ($et, $tagTablePtr, $tagID, $value, $entry, $entryLen, %parms) = @_;
     my ($dirName, $index, $formatStr, $base, $size, $valuePtr) =
         @parms{qw(DirName Index Format DataPos Size Start)};
-    my $tagInfo = $exifTool->GetTagInfo($tagTablePtr, $tagID);
+    my $tagInfo = $et->GetTagInfo($tagTablePtr, $tagID);
     my ($tagName, $colName, $subdir);
     my $count = $parms{Count} || $size;
     if ($tagInfo) {
@@ -322,11 +322,11 @@ sub HtmlDump($$$$$$%)
         $tval =~ tr/\x00-\x1f\x7f-\xff/./;
         $tip .= "Value: $tval";
     }
-    $exifTool->HDump($entry+$base, $entryLen, "$dname $colName", $tip, 1);
+    $et->HDump($entry+$base, $entryLen, "$dname $colName", $tip, 1);
     if ($size > 4) {
         my $dumpPos = $valuePtr + $base;
         # add value data block
-        $exifTool->HDump($dumpPos,$size,"$tagName value",'SAME', $subdir ? 0x04 : 0);
+        $et->HDump($dumpPos,$size,"$tagName value",'SAME', $subdir ? 0x04 : 0);
     }
 }
 
@@ -336,13 +336,13 @@ sub HtmlDump($$$$$$%)
 # Returns: 1 on success
 sub ProcessSensorCalibration($$$)
 {
-    my ($exifTool, $dirInfo, $tagTablePtr) = @_;
+    my ($et, $dirInfo, $tagTablePtr) = @_;
     my $dataPt = $$dirInfo{DataPt};
     my $dataPos = $$dirInfo{DataPos} || 0;
     my $dirStart = $$dirInfo{DirStart} || 0;
     my $dirLen = $$dirInfo{DirLen} || $$dirInfo{DataLen} - $dirStart;
-    my $verbose = $exifTool->Options('Verbose');
-    my $htmlDump = $exifTool->{HTML_DUMP};
+    my $verbose = $et->Options('Verbose');
+    my $htmlDump = $$et{HTML_DUMP};
 
     return 0 unless $dirLen >= 12 and SetByteOrder(substr($$dataPt, $dirStart, 2));
     # get offset to start of SensorCalibration directory
@@ -351,13 +351,13 @@ sub ProcessSensorCalibration($$$)
     my $numEntries = Get32u($dataPt, $dirStart + $ifdStart);
     my $ifdEnd = $ifdStart + 8 + 12 * $numEntries;
     return 0 if $numEntries < 2 or $numEntries > 300 or $ifdEnd > $dirLen;
-    $exifTool->VerboseDir('SensorCalibration', $numEntries);
+    $et->VerboseDir('SensorCalibration', $numEntries);
     if ($htmlDump) {
-        $exifTool->HDump($dirStart + $dataPos, 8, 'SensorCalibration header');
-        $exifTool->HDump($dirStart + $dataPos + 8, 4, 'SensorCalibration IFD offset');
-        $exifTool->HDump($dirStart + $dataPos + $ifdStart, 4, 'SensorCalibration entries',
-                             "Entry count: $numEntries");
-        $exifTool->HDump($dirStart + $dataPos + $ifdStart + 4, 4, '[unused]');
+        $et->HDump($dirStart + $dataPos, 8, 'SensorCalibration header');
+        $et->HDump($dirStart + $dataPos + 8, 4, 'SensorCalibration IFD offset');
+        $et->HDump($dirStart + $dataPos + $ifdStart, 4, 'SensorCalibration entries',
+                   "Entry count: $numEntries");
+        $et->HDump($dirStart + $dataPos + $ifdStart + 4, 4, '[unused]');
     }
     my $index;
     for ($index=0; $index<$numEntries; ++$index) {
@@ -367,17 +367,17 @@ sub ProcessSensorCalibration($$$)
         my $valuePtr = $entry + 8;
         if ($size > 4) {
             if ($size > 0x7fffffff) {
-                $exifTool->Warn("Invalid size for SensorCalibration IFD entry $index");
+                $et->Warn("Invalid size for SensorCalibration IFD entry $index");
                 return 0;
             }
             $valuePtr = Get32u($dataPt, $valuePtr);
             if ($valuePtr + $size > $dirLen) {
-                $exifTool->Warn(sprintf("Invalid offset 0x%.4x for SensorCalibration IFD entry $index",$valuePtr));
+                $et->Warn(sprintf("Invalid offset 0x%.4x for SensorCalibration IFD entry $index",$valuePtr));
                 return 0;
             }
             $valuePtr += $dirStart;
         }
-        my $tagInfo = $exifTool->GetTagInfo($tagTablePtr, $tagID);
+        my $tagInfo = $et->GetTagInfo($tagTablePtr, $tagID);
         my $formatStr;
         if ($tagInfo) {
             $formatStr = $$tagInfo{Format};
@@ -402,8 +402,8 @@ sub ProcessSensorCalibration($$$)
             Start   => $valuePtr,
             Format  => $formatStr,
         );
-        $htmlDump and HtmlDump($exifTool, $tagTablePtr, $tagID, $value, $entry, 12, %parms);
-        $exifTool->HandleTag($tagTablePtr, $tagID, $value, %parms);
+        $htmlDump and HtmlDump($et, $tagTablePtr, $tagID, $value, $entry, 12, %parms);
+        $et->HandleTag($tagTablePtr, $tagID, $value, %parms);
     }
     return 1;
 }
@@ -414,14 +414,14 @@ sub ProcessSensorCalibration($$$)
 # Returns: 1 on success
 sub ProcessPhaseOne($$$)
 {
-    my ($exifTool, $dirInfo, $tagTablePtr) = @_;
+    my ($et, $dirInfo, $tagTablePtr) = @_;
     my $dataPt = $$dirInfo{DataPt};
     my $dataPos = $$dirInfo{DataPos} || 0;
     my $dirStart = $$dirInfo{DirStart} || 0;
     my $dirLen = $$dirInfo{DirLen} || $$dirInfo{DataLen} - $dirStart;
-    my $binary = $exifTool->Options('Binary');
-    my $verbose = $exifTool->Options('Verbose');
-    my $htmlDump = $exifTool->{HTML_DUMP};
+    my $binary = $et->Options('Binary');
+    my $verbose = $et->Options('Verbose');
+    my $htmlDump = $$et{HTML_DUMP};
 
     return 0 if $dirLen < 12;
     my $hdr = substr($$dataPt, $dirStart, 12);
@@ -434,13 +434,13 @@ sub ProcessPhaseOne($$$)
     my $numEntries = Get32u($dataPt, $dirStart + $ifdStart);
     my $ifdEnd = $ifdStart + 8 + 16 * $numEntries;
     return 0 if $numEntries < 2 or $numEntries > 300 or $ifdEnd > $dirLen;
-    $exifTool->VerboseDir('PhaseOne', $numEntries);
+    $et->VerboseDir('PhaseOne', $numEntries);
     if ($htmlDump) {
-        $exifTool->HDump($dirStart + $dataPos, 8, 'PhaseOne header');
-        $exifTool->HDump($dirStart + $dataPos + 8, 4, 'PhaseOne IFD offset');
-        $exifTool->HDump($dirStart + $dataPos + $ifdStart, 4, "PhaseOne entries",
-                             "Entry count: $numEntries");
-        $exifTool->HDump($dirStart + $dataPos + $ifdStart + 4, 4, '[unused]');
+        $et->HDump($dirStart + $dataPos, 8, 'PhaseOne header');
+        $et->HDump($dirStart + $dataPos + 8, 4, 'PhaseOne IFD offset');
+        $et->HDump($dirStart + $dataPos + $ifdStart, 4, "PhaseOne entries",
+                   "Entry count: $numEntries");
+        $et->HDump($dirStart + $dataPos + $ifdStart + 4, 4, '[unused]');
     }
     my $index;
     for ($index=0; $index<$numEntries; ++$index) {
@@ -449,11 +449,11 @@ sub ProcessPhaseOne($$$)
         my $format = Get32u($dataPt, $entry+4);
         my $size = Get32u($dataPt, $entry+8);
         if ($format < 1 or $format > 13) {
-            $exifTool->Warn("Invalid PhaseOne IFD entry $index",1);
+            $et->Warn("Invalid PhaseOne IFD entry $index",1);
             return 0;
         }
         unless (defined $formatSize[$format]) {
-            $exifTool->WarnOnce("Unrecognized PhaseOne format type $format",1);
+            $et->WarnOnce("Unrecognized PhaseOne format type $format",1);
             $formatSize[$format] = 1;
             $formatName[$format] = 'undef';
         }
@@ -461,17 +461,17 @@ sub ProcessPhaseOne($$$)
         my $valuePtr = $entry + 12;
         if ($size > 4) {
             if ($size > 0x7fffffff) {
-                $exifTool->Warn("Invalid size for PhaseOne IFD entry $index");
+                $et->Warn("Invalid size for PhaseOne IFD entry $index");
                 return 0;
             }
             $valuePtr = Get32u($dataPt, $valuePtr);
             if ($valuePtr + $size > $dirLen) {
-                $exifTool->Warn(sprintf("Invalid offset 0x%.4x for PhaseOne IFD entry $index",$valuePtr));
+                $et->Warn(sprintf("Invalid offset 0x%.4x for PhaseOne IFD entry $index",$valuePtr));
                 return 0;
             }
             $valuePtr += $dirStart;
         }
-        my $tagInfo = $exifTool->GetTagInfo($tagTablePtr, $tagID);
+        my $tagInfo = $et->GetTagInfo($tagTablePtr, $tagID);
         my $formatStr = $formatName[$format];
         if ($tagInfo) {
             $formatStr = $$tagInfo{Format} if $$tagInfo{Format};
@@ -511,8 +511,8 @@ sub ProcessPhaseOne($$$)
             Format  => $formatStr,
             Count   => $count
         );
-        $htmlDump and HtmlDump($exifTool, $tagTablePtr, $tagID, $value, $entry, 16, %parms);
-        $exifTool->HandleTag($tagTablePtr, $tagID, $value, %parms);
+        $htmlDump and HtmlDump($et, $tagTablePtr, $tagID, $value, $entry, 16, %parms);
+        $et->HandleTag($tagTablePtr, $tagID, $value, %parms);
     }
     return 1;
 }

data/bin/{Image-ExifTool-9.37 → Image-ExifTool-9.41}/lib/Image/ExifTool/PhotoCD.pm

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;  # (for Composite:ImageSize)
 
-$VERSION = '1.00';
+$VERSION = '1.01';
 
 sub ProcessExtData($$$);
 
@@ -449,21 +449,21 @@ sub ProcessExtData($$$);
 # Returns: 1 on success, 0 if this wasn't a valid PhotoCD file
 sub ProcessPCD($$)
 {
-    my ($exifTool, $dirInfo) = @_;
+    my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
     my $buff;
     return 0 unless $raf->Seek(2048, 0) and
                     $raf->Read($buff, 2048) == 2048 and
                     $buff =~ /^PCD_IPI/;
     SetByteOrder('MM');
-    $exifTool->SetFileType();
+    $et->SetFileType();
     my %dirInfo = (
         DirName => 'PhotoCD',
         DataPt => \$buff,
         DataPos => 4096,
     );
     my $tagTablePtr = GetTagTable('Image::ExifTool::PhotoCD::Main');
-    return $exifTool->ProcessBinaryData(\%dirInfo, $tagTablePtr);
+    return $et->ProcessBinaryData(\%dirInfo, $tagTablePtr);
 }
 
 1;  # end

data/bin/{Image-ExifTool-9.37 → Image-ExifTool-9.41}/lib/Image/ExifTool/PhotoMechanic.pm

@@ -15,7 +15,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::IPTC;
 use Image::ExifTool::XMP;
 
-$VERSION = '1.03';
+$VERSION = '1.04';
 
 sub ProcessPhotoMechanic($$);
 
@@ -148,12 +148,12 @@ my %rawCropConv = (
 # - updates DirLen to trailer length
 sub ProcessPhotoMechanic($$)
 {
-    my ($exifTool, $dirInfo) = @_;
+    my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
     my $offset = $$dirInfo{Offset} || 0;
     my $outfile = $$dirInfo{OutFile};
-    my $verbose = $exifTool->Options('Verbose');
-    my $out = $exifTool->Options('TextOut');
+    my $verbose = $et->Options('Verbose');
+    my $out = $et->Options('TextOut');
     my $rtnVal = 0;
     my ($buff, $footer);
 
@@ -164,11 +164,11 @@ sub ProcessPhotoMechanic($$)
         my $size = unpack('N', $footer);
 
         if ($size & 0x80000000 or not $raf->Seek(-$size-12, 1)) {
-            $exifTool->Warn('Bad PhotoMechanic trailer');
+            $et->Warn('Bad PhotoMechanic trailer');
             last;
         }
         unless ($raf->Read($buff, $size) == $size) {
-            $exifTool->Warn('Error reading PhotoMechanic trailer');
+            $et->Warn('Error reading PhotoMechanic trailer');
             last;
         }
         $rtnVal = 1;    # we read the trailer successfully
@@ -187,20 +187,20 @@ sub ProcessPhotoMechanic($$)
         my $tagTablePtr = GetTagTable('Image::ExifTool::PhotoMechanic::Main');
         if (not $outfile) {
             # extract trailer information
-            $exifTool->DumpTrailer($dirInfo) if $verbose or $exifTool->{HTML_DUMP};
-            $exifTool->ProcessDirectory(\%dirInfo, $tagTablePtr);
-        } elsif ($exifTool->{DEL_GROUP}->{PhotoMechanic}) {
+            $et->DumpTrailer($dirInfo) if $verbose or $$et{HTML_DUMP};
+            $et->ProcessDirectory(\%dirInfo, $tagTablePtr);
+        } elsif ($$et{DEL_GROUP}{PhotoMechanic}) {
             # delete the trailer
             $verbose and printf $out "  Deleting PhotoMechanic trailer\n";
-            ++$exifTool->{CHANGED};
+            ++$$et{CHANGED};
         } else {
             # rewrite the trailer
             my $newPt;
-            my $newBuff = $exifTool->WriteDirectory(\%dirInfo, $tagTablePtr);
+            my $newBuff = $et->WriteDirectory(\%dirInfo, $tagTablePtr);
             if (defined $newBuff) {
                 $newPt = \$newBuff; # write out the modified trailer
                 my $pad = 0x800 - length($newBuff);
-                if ($pad > 0 and not $exifTool->Options('Compact')) {
+                if ($pad > 0 and not $et->Options('Compact')) {
                     # pad out to 2kB like PhotoMechanic does
                     $newBuff .= "\0" x $pad;
                 }