Changeset 24107 for main/trunk/greenstone2/perllib/cpan/Image/ExifTool/APP12.pm

Timestamp:

2011-06-01T12:33:42+12:00 (13 years ago)

Author:

sjm84

Message:

Updating the ExifTool perl modules

File:

• main/trunk/greenstone2/perllib/cpan/Image/ExifTool/APP12.pm (modified) (7 diffs)

main/trunk/greenstone2/perllib/cpan/Image/ExifTool/APP12.pm

@@ -15 +15 @@
 use Image::ExifTool qw(:DataAccess);
 
-$VERSION = '1.06';
+$VERSION = '1.08';
 
 sub ProcessAPP12($$$);
@@ -114 +114 @@
         Avoid => 1,
         # (ignore 4-byte character count at start of value)
-        ValueConv => '$self->Unicode2Charset(substr($val,4),"MM")',
-        ValueConvInv => 'pack("N",length $val) . $self->Charset2Unicode($val,"MM")',
+        ValueConv => '$self->Decode(substr($val,4),"UCS2","MM")',
+        ValueConvInv => 'pack("N",length $val) . $self->Encode($val,"UCS2","MM")',
     },
     3 => { #PH
@@ -123 +123 @@
         Groups => { 2 => 'Author' },
         # (ignore 4-byte character count at start of value)
-        ValueConv => '$self->Unicode2Charset(substr($val,4),"MM")',
-        ValueConvInv => 'pack("N",length $val) . $self->Charset2Unicode($val,"MM")',
+        ValueConv => '$self->Decode(substr($val,4),"UCS2","MM")',
+        ValueConvInv => 'pack("N",length $val) . $self->Encode($val,"UCS2","MM")',
     },
 );
@@ -140 +140 @@
     my $newTags = $exifTool->GetNewTagInfoHash($tagTablePtr);
     my @addTags = sort { $a <=> $b } keys(%$newTags);
-    my $verbose = $exifTool->Options('Verbose');
-    my $out = $exifTool->Options('TextOut');
     my ($dirEnd, %doneTags);
     if ($dataPt) {
@@ -173 +171 @@
         my $tagInfo = $$newTags{$tag};
         if ($tagInfo) {
-            my $newValueHash = $exifTool->GetNewValueHash($tagInfo);
+            my $nvHash = $exifTool->GetNewValueHash($tagInfo);
             my $isNew;
             if (defined $val) {
-                if (Image::ExifTool::IsOverwriting($newValueHash, $val)) {
-                    if ($verbose > 1) {
-                        my $pval = $exifTool->Printable($val);
-                        print $out "    - Ducky:$$tagInfo{Name} = '$pval'\n";
-                    }
+                if (Image::ExifTool::IsOverwriting($nvHash, $val)) {
+                    $exifTool->VerboseValue("- Ducky:$$tagInfo{Name}", $val);
                     $isNew = 1;
                 }
             } else {
-                next unless Image::ExifTool::IsCreating($newValueHash);
+                next unless Image::ExifTool::IsCreating($nvHash);
                 $isNew = 1;
             }
             if ($isNew) {
-                $val = Image::ExifTool::GetNewValues($newValueHash);
+                $val = Image::ExifTool::GetNewValues($nvHash);
                 ++$exifTool->{CHANGED};
                 next unless defined $val;   # next if tag is being deleted
-                if ($verbose > 1) {
-                    my $pval = $exifTool->Printable($val);
-                    print $out "    + Ducky:$$tagInfo{Name} = '$pval'\n";
-                }
+                $exifTool->VerboseValue("+ Ducky:$$tagInfo{Name}", $val);
             }
         }
@@ -283 +275 @@
         unless ($tagInfo) {
             # add new tag to table
-            $tagInfo = { Name => $tag };
+            $tagInfo = { Name => ucfirst $tag };
             # put in Camera group if information in "Camera" section
             $$tagInfo{Groups} = { 2 => 'Camera' } if $section =~ /camera/i;
@@ -313 +305 @@
 =head1 AUTHOR
 
-Copyright 2003-2007, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2011, Phil Harvey (phil at owl.phy.queensu.ca)
 
 This library is free software; you can redistribute it and/or modify it