diff options
author | Jesús <heckyel@hyperbola.info> | 2020-11-09 16:29:21 -0500 |
---|---|---|
committer | Jesús <heckyel@hyperbola.info> | 2020-11-09 16:29:21 -0500 |
commit | cc300158abc96c89433f73fff48f655d066ee659 (patch) | |
tree | 823e2ed3044be741b572336d2b381f41431b0f9e | |
parent | dbf55fce0e37447df68d9a69d21bc5c5bbe97992 (diff) | |
download | fair-viewer-cc300158abc96c89433f73fff48f655d066ee659.tar.lz fair-viewer-cc300158abc96c89433f73fff48f655d066ee659.tar.xz fair-viewer-cc300158abc96c89433f73fff48f655d066ee659.zip |
Update from upstream
Updated "determine_image_format()" to detect WEBP.
Although, at the moment, the PixbufLoader doesn't recognize the WEBP format.
-rwxr-xr-x | bin/fair-viewer | 2 | ||||
-rwxr-xr-x | bin/gtk-fair-viewer | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/bin/fair-viewer b/bin/fair-viewer index e087828..1742f2f 100755 --- a/bin/fair-viewer +++ b/bin/fair-viewer @@ -58,7 +58,7 @@ use warnings; no warnings 'once'; my $DEVEL; # true in devel mode -use if ($DEVEL = 1), lib => qw(../lib); # devel mode +use if ($DEVEL = 0), lib => qw(../lib); # devel mode use WWW::FairViewer v1.0.4; use WWW::FairViewer::RegularExpressions; diff --git a/bin/gtk-fair-viewer b/bin/gtk-fair-viewer index 952a84a..a11ef49 100755 --- a/bin/gtk-fair-viewer +++ b/bin/gtk-fair-viewer @@ -30,7 +30,7 @@ use warnings; no warnings 'once'; my $DEVEL; # true in devel mode -use if ($DEVEL = 1), lib => qw(../lib); # devel only +use if ($DEVEL = 0), lib => qw(../lib); # devel only use WWW::FairViewer v1.0.4; use WWW::FairViewer::RegularExpressions; @@ -2331,7 +2331,7 @@ sub append_next_page { sub determine_image_format { # - ## Code from: https://metacpan.org/source/SREZIC/Image-Info-1.39/lib/Image/Info.pm + ## Code from: https://metacpan.org/release/Image-Info/source/lib/Image/Info.pm # local ($_) = @_; @@ -2343,9 +2343,10 @@ sub determine_image_format { return "BMP" if /^BM/; return "ICO" if /^\000\000\001\000/; return "PPM" if /^P[1-6]/; - return "XPM" if m,(^\/\* XPM \*\/)|(static\s+char\s+\*\w+\[\]\s*=\s*\{\s*"\d+),; - return "XBM" if m|^(?:\/\*.*\*\/\n)?#define\s|; - return "SVG" if /^(?:[\012\015\t ]*<svg\b|<\?xml)/; + return "XPM" if /(^\/\* XPM \*\/)|(static\s+char\s+\*\w+\[\]\s*=\s*{\s*"\d+)/; + return "XBM" if /^(?:\/\*.*\*\/\n)?#define\s/; + return "SVG" if /^(<\?xml|[\012\015\t ]*<svg\b)/; + return "WEBP" if /^RIFF.{4}WEBP/s; return undef; } |