Changeset 23771 for main

Timestamp:

2011-03-10T11:59:25+13:00 (13 years ago)

Author:

sjm84

Message:

Updated several lines in ExifTool.pm and ExifTool/TagLookup.pm to prevent warnings that were being produced on Perl 5.12

Location:

main/trunk/greenstone2/perllib/cpan/Image

Files:

• ExifTool.pm (modified) (4 diffs)
• ExifTool/TagLookup.pm (modified) (2 diffs)

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

@@ -1412 +1412 @@
 
     # first, add user-defined composite tags if necessary
-    if (defined %UserDefined and $UserDefined{'Image::ExifTool::Composite'}) {
+    if (%UserDefined and $UserDefined{'Image::ExifTool::Composite'}) {
         AddCompositeTags($UserDefined{'Image::ExifTool::Composite'},1);
         delete $UserDefined{'Image::ExifTool::Composite'};
@@ -3500 +3500 @@
     unless ($table) {
         no strict 'refs';
-        unless (defined %$tableName) {
+        unless (%$tableName) {
             # try to load module for this table
             if ($tableName =~ /(.*)::/) {
@@ -3508 +3508 @@
                 }
             }
-            unless (defined %$tableName) {
+            unless (%$tableName) {
                 warn "Can't find table $tableName\n";
                 return undef;
@@ -3542 +3542 @@
         SetupTagTable($table);
         # add any user-defined tags
-        if (defined %UserDefined and $UserDefined{$tableName}) {
+        if (%UserDefined and $UserDefined{$tableName}) {
             my $tagID;
             foreach $tagID (TagTableKeys($UserDefined{$tableName})) {

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

@@ -3726 +3726 @@
 
 # insert any user-defined tags into our tag lookup
-if (defined %Image::ExifTool::UserDefined) {
+if (%Image::ExifTool::UserDefined) {
     my ($table, %tableNum, $tagID);
     my $tnum = 0; # make hash lookup to get table numbers
@@ -3769 +3769 @@
             next if $Image::ExifTool::UserDefined{$subTable};
             no strict 'refs';
-            next unless defined %$subTable;
+            next unless %$subTable;
             $Image::ExifTool::UserDefined{$subTable} = \%$subTable;
             push @userTables, $subTable;