common: decode utf8 path request

[sheet.git] / charset.plp

diff --git a/charset.plp b/charset.plp
index 4c01b78d0b6bb45717d7f7e7e35bce8f55d81bf5..fcd647da740540df7c085708b0ba751fca2ebf2c 100644 (file)
--- a/charset.plp
+++ b/charset.plp
@@ -24,7 +24,6 @@ my $glyphs = Shiar_Sheet::FormatChar->new;
 my @nibble = (0..9, 'A'..'F');
 my $nibsize = 1;
 
-use Encode qw(decode resolve_alias);
 # generate character table(s)
 # (~16x faster than decoding in loop;
 #  substr strings is twice as fast as splitting to an array)
@@ -71,7 +70,7 @@ my @request = map {
                        @nibble = (map { $_.0, $_.8 } 0 .. 7);
                        $nibsize = 8;
                }
-               elsif ($row{set} = resolve_alias($input)) {
+               elsif ($row{set} = Encode::resolve_alias($input)) {
                        if ($row{set} eq 'Internal') {
                                $row{table} = ' ' x ($endpoint < 255 ? 640 : 8192);
                                $row{set} = 'Unicode BMP';
@@ -85,7 +84,7 @@ my @request = map {
                                        or printf "<p class=error>Table data could not be read: <em>%s</em>.</p>\n", $@ || $!;
                        }
                        else {
-                               $row{table} = decode($row{set}, pack 'C*', $row{offset} .. $endpoint);
+                               $row{table} = Encode::decode($row{set}, pack 'C*', $row{offset} .. $endpoint);
                        }
                }
                else {