diff options
Diffstat (limited to 'exiftool')
-rwxr-xr-x | exiftool | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -10,7 +10,7 @@ use strict; require 5.004; -my $version = '12.25'; +my $version = '12.26'; # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool' my $exeDir; @@ -2218,7 +2218,7 @@ sub GetImageInfo($$) my $f = $file; CleanXML(\$f); print $fp "\n<rdf:Description rdf:about='${f}'"; - print $fp "\n xmlns:et='http://ns.exiftool.ca/1.0/'"; + print $fp "\n xmlns:et='http://ns.exiftool.org/1.0/'"; print $fp " et:toolkit='Image::ExifTool $Image::ExifTool::VERSION'"; # define namespaces for all tag groups my (%groups, @groups, $grp0, $grp1); @@ -2240,7 +2240,7 @@ sub GetImageInfo($$) unless ($grp eq $grp1 and $grp =~ /^(ExifTool|File|Composite|Unknown)$/) { $grp .= "/$grp1"; } - print $fp "\n xmlns:$grp1='http://ns.exiftool.ca/$grp/1.0/'"; + print $fp "\n xmlns:$grp1='http://ns.exiftool.org/$grp/1.0/'"; } print $fp '>' if $outFormat < 1; # finish rdf:Description token unless short format $ind = $outFormat >= 0 ? ' ' : ' '; @@ -4263,7 +4263,10 @@ sub FilterArgfileLine($) # escaped by an odd number of backslashes, and escape a single backslash # if it occurs at the end of the string $arg =~ s{\\(.)|(["\$\@]|\\$)}{'\\'.($2 || $1)}sge; - $arg = eval qq{"$arg"}; # un-escape characters in C string + # un-escape characters in C string + my %esc = ( a => "\a", b => "\b", f => "\f", n => "\n", + r => "\r", t => "\t", '"' => '"', '\\' => '\\' ); + $arg =~ s/\\(.)/$esc{$1}||'\\'.$1/egs; } else { $arg =~ s/^\s+//; # remove leading white space $arg =~ s/[\x0d\x0a]+$//s; # remove trailing newline @@ -5393,7 +5396,7 @@ with this command: produces output like this: - -- Generated by ExifTool 12.25 -- + -- Generated by ExifTool 12.26 -- File: a.jpg - 2003:10:31 15:44:19 (f/5.6, 1/60s, ISO 100) File: b.jpg - 2006:05:23 11:57:38 |