From c679472bbef47003461336cb9b1f0afbf35a7bd6 Mon Sep 17 00:00:00 2001
From: "Mirar (Pontus Hagland)" <pike@sort.mirar.org>
Date: Sun, 19 Apr 1998 15:39:23 +0200
Subject: [PATCH] fixes for later Pike 0.6
Rev: tutorial/Sgml.pmod:1.8
Rev: tutorial/Wmml.pmod:1.18
---
tutorial/Sgml.pmod | 2 +-
tutorial/Wmml.pmod | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/tutorial/Sgml.pmod b/tutorial/Sgml.pmod
index 6597189496..d510f4b685 100644
--- a/tutorial/Sgml.pmod
+++ b/tutorial/Sgml.pmod
@@ -19,7 +19,7 @@ class Tag
}
void create(string t, void|mapping p, void|int po,
- void|array(object) d, void|string f)
+ void|array(object|string) d, void|string f)
{
tag=t;
pos=po;
diff --git a/tutorial/Wmml.pmod b/tutorial/Wmml.pmod
index ee25d737d1..2da5186425 100644
--- a/tutorial/Wmml.pmod
+++ b/tutorial/Wmml.pmod
@@ -846,6 +846,7 @@ string mkgif(mixed o)
object render_illustration(string pike_code, mapping params, float dpi)
{
werror("Rendering ");
+ if (params->__from__) werror("["+params->__from__+"] ");
string src=params->src;
object img=Image.image();
@@ -856,7 +857,7 @@ object render_illustration(string pike_code, mapping params, float dpi)
if(params->src)
img=srccache[params->src]||
(srccache[params->src]=
- img->fromppm(Process.popen("anytopnm 2>/dev/null "+src)));
+ Image.PNM.decode(Process.popen("anytopnm "+params->src)));
if(scale!=1.0) img=img->scale(scale);
return compile_string("import Image;\n"
"mixed `()(object src){ "+pike_code+" ; }")()(img);
--
GitLab