FlashPix.pm (Image-ExifTool-12.57) | : | FlashPix.pm (Image-ExifTool-12.58) | ||
---|---|---|---|---|
skipping to change at line 24 | skipping to change at line 24 | |||
#------------------------------------------------------------------------------ | #------------------------------------------------------------------------------ | |||
package Image::ExifTool::FlashPix; | package Image::ExifTool::FlashPix; | |||
use strict; | use strict; | |||
use vars qw($VERSION); | use vars qw($VERSION); | |||
use Image::ExifTool qw(:DataAccess :Utils); | use Image::ExifTool qw(:DataAccess :Utils); | |||
use Image::ExifTool::Exif; | use Image::ExifTool::Exif; | |||
use Image::ExifTool::ASF; # for GetGUID() | use Image::ExifTool::ASF; # for GetGUID() | |||
$VERSION = '1.42'; | $VERSION = '1.43'; | |||
sub ProcessFPX($$); | sub ProcessFPX($$); | |||
sub ProcessFPXR($$$); | sub ProcessFPXR($$$); | |||
sub ProcessProperties($$$); | sub ProcessProperties($$$); | |||
sub ReadFPXValue($$$$$;$$); | sub ReadFPXValue($$$$$;$$); | |||
sub ProcessHyperlinks($$); | sub ProcessHyperlinks($$); | |||
sub ProcessContents($$$); | sub ProcessContents($$$); | |||
sub ProcessWordDocument($$$); | sub ProcessWordDocument($$$); | |||
sub ProcessDocumentTable($); | sub ProcessDocumentTable($); | |||
sub ProcessCommentBy($$$); | sub ProcessCommentBy($$$); | |||
skipping to change at line 2444 | skipping to change at line 2444 | |||
my $t = $$pHash{$tag}; | my $t = $$pHash{$tag}; | |||
$$pHash{$tag} = $$pHash{$key}; | $$pHash{$tag} = $$pHash{$key}; | |||
$$pHash{$key} = $t; | $$pHash{$key} = $t; | |||
} | } | |||
last; | last; | |||
} | } | |||
} | } | |||
} | } | |||
$$et{INDENT} = $oldIndent if $verbose; | $$et{INDENT} = $oldIndent if $verbose; | |||
# try to better identify the file type | # try to better identify the file type | |||
if ($$et{VALUE}{FileType} eq 'FPX') { | if ($$et{FileType} eq 'FPX') { | |||
my $val = $$et{CompObjUserType} || $$et{Software}; | my $val = $$et{CompObjUserType} || $$et{Software}; | |||
if ($val) { | if ($val) { | |||
my %type = ( '^3ds Max' => 'MAX', Word => 'DOC', PowerPoint => 'PPT' , Excel => 'XLS' ); | my %type = ( '^3ds Max' => 'MAX', Word => 'DOC', PowerPoint => 'PPT' , Excel => 'XLS' ); | |||
my $pat; | my $pat; | |||
foreach $pat (sort keys %type) { | foreach $pat (sort keys %type) { | |||
next unless $val =~ /$pat/; | next unless $val =~ /$pat/; | |||
$et->OverrideFileType($type{$pat}); | $et->OverrideFileType($type{$pat}); | |||
last; | last; | |||
} | } | |||
} | } | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |