summaryrefslogtreecommitdiff
path: root/lib/Image/ExifTool.pm
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Image/ExifTool.pm')
-rw-r--r--lib/Image/ExifTool.pm13
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/Image/ExifTool.pm b/lib/Image/ExifTool.pm
index 8a4c62eb..4ec206fd 100644
--- a/lib/Image/ExifTool.pm
+++ b/lib/Image/ExifTool.pm
@@ -29,7 +29,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
%jpegMarker %specialTags %fileTypeLookup $testLen $exeDir
%static_vars);
-$VERSION = '12.49';
+$VERSION = '12.50';
$RELEASE = '';
@ISA = qw(Exporter);
%EXPORT_TAGS = (
@@ -603,6 +603,7 @@ my %fileDescription = (
CRM => 'video/x-canon-crm',
CRW => 'image/x-canon-crw',
CSV => 'text/csv',
+ CUR => 'image/x-cursor', #PH (NC)
CZI => 'image/x-zeiss-czi', #PH (NC)
DCP => 'application/octet-stream', #PH (NC)
DCR => 'image/x-kodak-dcr',
@@ -651,7 +652,7 @@ my %fileDescription = (
HDR => 'image/vnd.radiance',
HTML => 'text/html',
ICC => 'application/vnd.iccprofile',
- ICO => 'application/octet-stream', #PH (NC)
+ ICO => 'image/x-icon', #PH (NC)
ICS => 'text/calendar',
IDML => 'application/vnd.adobe.indesign-idml-package',
IIQ => 'image/x-raw',
@@ -8263,15 +8264,17 @@ sub FoundTag($$$;@)
{
local $_;
my ($self, $tagInfo, $value, @grps) = @_;
- my ($tag, $noListDel);
+ my ($tag, $noListDel, $tbl);
my $options = $$self{OPTIONS};
if (ref $tagInfo eq 'HASH') {
$tag = $$tagInfo{Name} or warn("No tag name\n"), return undef;
+ $tbl = $$tagInfo{Table};
} else {
$tag = $tagInfo;
# look for tag in Extra
- $tagInfo = $self->GetTagInfo(GetTagTable('Image::ExifTool::Extra'), $tag);
+ $tbl = GetTagTable('Image::ExifTool::Extra');
+ $tagInfo = $self->GetTagInfo($tbl, $tag);
# make temporary hash if tag doesn't exist in Extra
# (not advised to do this since the tag won't show in list)
$tagInfo or $tagInfo = { Name => $tag, Groups => \%allGroupsExifTool };
@@ -8280,7 +8283,7 @@ sub FoundTag($$$;@)
# get tag priority
my $priority = $$tagInfo{Priority};
unless (defined $priority) {
- $priority = $$tagInfo{Table}{PRIORITY};
+ $priority = $$tbl{PRIORITY};
$priority = 0 if not defined $priority and $$tagInfo{Avoid};
}
$grps[0] or $grps[0] = $$self{SET_GROUP0};