Changeset 23771

Show
Ignore:
Timestamp:
10.03.2011 11:59:25 (8 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/cpan/Image/ExifTool.pm

    r16842 r23771  
    14121412 
    14131413    # first, add user-defined composite tags if necessary 
    1414     if (defined %UserDefined and $UserDefined{'Image::ExifTool::Composite'}) { 
     1414    if (%UserDefined and $UserDefined{'Image::ExifTool::Composite'}) { 
    14151415        AddCompositeTags($UserDefined{'Image::ExifTool::Composite'},1); 
    14161416        delete $UserDefined{'Image::ExifTool::Composite'}; 
     
    35003500    unless ($table) { 
    35013501        no strict 'refs'; 
    3502         unless (defined %$tableName) { 
     3502        unless (%$tableName) { 
    35033503            # try to load module for this table 
    35043504            if ($tableName =~ /(.*)::/) { 
     
    35083508                } 
    35093509            } 
    3510             unless (defined %$tableName) { 
     3510            unless (%$tableName) { 
    35113511                warn "Can't find table $tableName\n"; 
    35123512                return undef; 
     
    35423542        SetupTagTable($table); 
    35433543        # add any user-defined tags 
    3544         if (defined %UserDefined and $UserDefined{$tableName}) { 
     3544        if (%UserDefined and $UserDefined{$tableName}) { 
    35453545            my $tagID; 
    35463546            foreach $tagID (TagTableKeys($UserDefined{$tableName})) { 
  • main/trunk/greenstone2/perllib/cpan/Image/ExifTool/TagLookup.pm

    r16842 r23771  
    37263726 
    37273727# insert any user-defined tags into our tag lookup 
    3728 if (defined %Image::ExifTool::UserDefined) { 
     3728if (%Image::ExifTool::UserDefined) { 
    37293729    my ($table, %tableNum, $tagID); 
    37303730    my $tnum = 0; # make hash lookup to get table numbers 
     
    37693769            next if $Image::ExifTool::UserDefined{$subTable}; 
    37703770            no strict 'refs'; 
    3771             next unless defined %$subTable; 
     3771            next unless %$subTable; 
    37723772            $Image::ExifTool::UserDefined{$subTable} = \%$subTable; 
    37733773            push @userTables, $subTable;