diff options
Diffstat (limited to 'graphics/asymptote/picture.cc')
| -rw-r--r-- | graphics/asymptote/picture.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/graphics/asymptote/picture.cc b/graphics/asymptote/picture.cc index 8ea6e3bf86..e7ce1a15f5 100644 --- a/graphics/asymptote/picture.cc +++ b/graphics/asymptote/picture.cc @@ -855,17 +855,15 @@ bool picture::postprocess(const string& prename, const string& outname, res *= expand; string s=getSetting<string>("convert"); cmd.push_back(s); - if(s != "convert") - cmd.push_back("convert"); cmd.push_back("-density"); cmd.push_back(String(res)+"x"+String(res)); + cmd.push_back(prename); if(expand == 1.0) cmd.push_back("+antialias"); push_split(cmd,getSetting<string>("convertOptions")); cmd.push_back("-resize"); cmd.push_back(String(100.0/expand)+"%x"); if(outputformat == "jpg") cmd.push_back("-flatten"); - cmd.push_back(prename); cmd.push_back(outputformat+":"+outname); status=System(cmd,0,true,"convert"); } @@ -1323,6 +1321,7 @@ struct Communicate : public gc { pair shift; pair margin; double *t; + double *tup; double *background; size_t nlights; triple *lights; @@ -1344,15 +1343,17 @@ void glrenderWrapper() #endif if(allowRender) glrender(com.prefix,com.pic,com.format,com.width,com.height,com.angle, - com.zoom,com.m,com.M,com.shift,com.margin,com.t,com.background, - com.nlights,com.lights,com.diffuse,com.specular,com.view); + com.zoom,com.m,com.M,com.shift,com.margin,com.t,com.tup, + com.background,com.nlights,com.lights,com.diffuse,com.specular, + com.view); #endif } bool picture::shipout3(const string& prefix, const string& format, double width, double height, double angle, double zoom, const triple& m, const triple& M, const pair& shift, - const pair& margin, double *t, double *background, + const pair& margin, double *t, double *tup, + double *background, size_t nlights, triple *lights, double *diffuse, double *specular, bool view) { @@ -1444,6 +1445,7 @@ bool picture::shipout3(const string& prefix, const string& format, com.shift=shift; com.margin=margin; com.t=t; + com.tup=tup; com.background=background; com.nlights=nlights; com.lights=lights; @@ -1483,8 +1485,8 @@ bool picture::shipout3(const string& prefix, const string& format, } #if HAVE_LIBGLM - glrender(prefix,pic,outputformat,width,height,angle,zoom,m,M,shift,margin,t, - background,nlights,lights,diffuse,specular,View,oldpid); + glrender(prefix,pic,outputformat,width,height,angle,zoom,m,M,shift,margin, + t,tup,background,nlights,lights,diffuse,specular,View,oldpid); if(format3d) { string name=buildname(prefix,format); |