Merge remote-tracking branch 'origin' into msvc-support-make

base/animation.asy

@@ -74,10 +74,10 @@ struct animation {
 
   int merge(int loops=0, real delay=animationdelay, string format="gif",
             string options="", bool keep=settings.keep) {
-    string args="-loop " +(string) loops+" -delay "+(string)(delay/10)+
-      " -alpha Off -dispose Background "+options;
+    string args="-loop " +(string) loops+" -delay "+(string)(delay/10);
     for(int i=0; i < files.length; ++i)
-      args += " " +files[i];
+      args += " "+files[i];
+    args += " -alpha Off -dispose Background "+options;
     int rc=convert(args,prefix+"."+format,format=format);
     this.purge(keep);
     if(rc == 0) animate(file=prefix+"."+format,format=format);

picture.cc

@@ -893,17 +893,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");
       }

runsystem.in

@@ -214,8 +214,6 @@ Int convert(string args=emptystring, string file=emptystring,
   mem::vector<string> cmd;
   string s=getSetting<string>("convert");
   cmd.push_back(s);
-    if(s == "magick")
-      cmd.push_back("convert");
   push_split(cmd,args);
   cmd.push_back(name);
   bool quiet=verbose <= 1;