Skip to content
Snippets Groups Projects
Commit c679472b authored by Mirar (Pontus Hagland)'s avatar Mirar (Pontus Hagland)
Browse files

fixes for later Pike 0.6

Rev: tutorial/Sgml.pmod:1.8
Rev: tutorial/Wmml.pmod:1.18
parent 9bc24c47
No related branches found
No related tags found
No related merge requests found
...@@ -19,7 +19,7 @@ class Tag ...@@ -19,7 +19,7 @@ class Tag
} }
void create(string t, void|mapping p, void|int po, 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; tag=t;
pos=po; pos=po;
......
...@@ -846,6 +846,7 @@ string mkgif(mixed o) ...@@ -846,6 +846,7 @@ string mkgif(mixed o)
object render_illustration(string pike_code, mapping params, float dpi) object render_illustration(string pike_code, mapping params, float dpi)
{ {
werror("Rendering "); werror("Rendering ");
if (params->__from__) werror("["+params->__from__+"] ");
string src=params->src; string src=params->src;
object img=Image.image(); object img=Image.image();
...@@ -856,7 +857,7 @@ object render_illustration(string pike_code, mapping params, float dpi) ...@@ -856,7 +857,7 @@ object render_illustration(string pike_code, mapping params, float dpi)
if(params->src) if(params->src)
img=srccache[params->src]|| img=srccache[params->src]||
(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); if(scale!=1.0) img=img->scale(scale);
return compile_string("import Image;\n" return compile_string("import Image;\n"
"mixed `()(object src){ "+pike_code+" ; }")()(img); "mixed `()(object src){ "+pike_code+" ; }")()(img);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment