← Back to branch summary

~berthold-daum/zora/trunk

« back to all changes in this revision

Viewing changes to com.bdaum.zoom.batch.unix/exiftool/lib/Image/ExifTool/CanonCustom.pm

  • Committer: bdaum
  • Date: 2015-12-26 10:21:51 UTC
  • Revision ID: berthold.daum@bdaum.de-20151226102151-44f1j5113167thb9
Version 2.4.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
com.bdaum.zoom.batch.unix/exiftool/lib/Image/ExifTool/CanonCustom.pm
19
19
use Image::ExifTool::Canon;
20
20
use Image::ExifTool::Exif;
21
21
 
22
 
$VERSION = '1.50';
 
22
$VERSION = '1.51';
23
23
 
24
24
sub ProcessCanonCustom($$$);
25
25
sub ProcessCanonCustom2($$$);
2394
2394
                $tagInfo = $et->GetTagInfo($tagTablePtr, $tag, \$val, undef, $num) or next;
2395
2395
                my $nvHash = $et->GetNewValueHash($tagInfo) or next;
2396
2396
                next unless $et->IsOverwriting($nvHash, $val);
2397
 
                my $newVal = $et->GetNewValues($nvHash);
 
2397
                my $newVal = $et->GetNewValue($nvHash);
2398
2398
                next unless defined $newVal;    # can't delete from a custom table
2399
2399
                WriteValue($newVal, 'int32s', $num, $dataPt, $recPos);
2400
2400
                $et->VerboseValue("- CanonCustom:$$tagInfo{Name}", $val);
2523
2523
        my $nvHash = $et->GetNewValueHash($tagInfo);
2524
2524
        $val = ($val & 0xff);
2525
2525
        next unless $et->IsOverwriting($nvHash, $val);
2526
 
        my $newVal = $et->GetNewValues($nvHash);
 
2526
        my $newVal = $et->GetNewValue($nvHash);
2527
2527
        next unless defined $newVal;    # can't delete from a custom table
2528
2528
        Set16u(($newVal & 0xff) + ($tag << 8), $dataPt, $pos);
2529
2529
        $et->VerboseValue("- $dirName:$$tagInfo{Name}", $val);