From: <de...@de...> - 2010-06-30 04:30:43
|
Author: PeterThoeny Date: 2010-06-29 23:30:37 -0500 (Tue, 29 Jun 2010) New Revision: 19163 Trac url: http://develop.twiki.org/trac/changeset/19163 Modified: twiki/branches/TWikiRelease05x00/core/lib/TWiki/Attach.pm Log: Item6508: ATTACHEDIMAGEFORMAT issues - new patch by TWiki:Main.TimotheLitt - thanks Timothe! Modified: twiki/branches/TWikiRelease05x00/core/lib/TWiki/Attach.pm =================================================================== --- twiki/branches/TWikiRelease05x00/core/lib/TWiki/Attach.pm 2010-06-30 04:29:33 UTC (rev 19162) +++ twiki/branches/TWikiRelease05x00/core/lib/TWiki/Attach.pm 2010-06-30 04:30:37 UTC (rev 19163) @@ -273,6 +273,7 @@ my $fileLink = ''; my $imgSize = ''; + my( $imgWidth, $imgHeight ) = ( '', '' ); my $prefs = $this->{session}->{prefs}; my $store = $this->{session}->{store}; # I18N: URL-encode the attachment filename @@ -294,6 +295,7 @@ if( $nx > 0 && $ny > 0 ) { push( @attrs, width=>$nx, height=>$ny ); $imgSize = "width=\"$nx\" height=\"$ny\""; + $imgWidth = $nx; $imgHeight = $ny; } $fileLink = $prefs->getPreferencesValue( 'ATTACHEDIMAGEFORMAT' ); @@ -319,6 +321,8 @@ $fileLink =~ s/\\t/\t/go; $fileLink =~ s/\\n/\n/go; $fileLink =~ s/\$size/$imgSize/g; + $fileLink =~ s/\$width/$imgWidth/g; + $fileLink =~ s/\$height/$imgHeight/g; $fileLink =~ s/\$comment/$fileComment/g; $fileLink =~ s/([^\n])$/$1\n/; @@ -349,7 +353,7 @@ # PNG 89 50 4e 47 ( $x, $y ) = _pngsize( $file ); } elsif ( $a == 0xFF && $b == 0xD8 && - $c == 0xFF && $d == 0xE0 ) { + $c == 0xFF && ($d == 0xE0 || $d == 0xE1) ) { # JPG ff d8 ff e0 ( $x, $y ) = _jpegsize( $file ); } |