diff options
author | Norbert Preining <norbert@preining.info> | 2019-10-05 03:01:15 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2019-10-05 03:01:15 +0000 |
commit | 72c9345e5bafe708888bf65448a81d1aee8275ed (patch) | |
tree | a1a99929b3d7307572844833f09ad7ba5ad1405d /graphics/asymptote/picture.cc | |
parent | 9d9c04e14d0da9dd7829d0ec896aabfd50414fd8 (diff) |
CTAN sync 201910050301
Diffstat (limited to 'graphics/asymptote/picture.cc')
-rw-r--r-- | graphics/asymptote/picture.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/graphics/asymptote/picture.cc b/graphics/asymptote/picture.cc index 93e5f6a6eb..af334730f3 100644 --- a/graphics/asymptote/picture.cc +++ b/graphics/asymptote/picture.cc @@ -735,8 +735,10 @@ bool picture::postprocess(const string& prename, const string& outname, bool wait, bool view, bool pdftex, bool epsformat, bool svg) { - if(outputformat == "html") - reportError("Use svg instead of html output format for 2D pictures."); + if(outputformat == "html") { + if(getSetting<Int>("render") == 0) + reportError("For 2D pictures, use outformat=\"svg\" instead of \"html\"; if this is a 3D picture, use settings.render=1 or the -render=1 command-line option"); + } static mem::map<CONST string,int> pids; int status=0; bool pdfformat=(settings::pdf(getSetting<string>("tex")) @@ -1175,7 +1177,7 @@ void picture::render(double size2, const triple& Min, const triple& Max, (*p)->render(size2,Min,Max,perspective,remesh); } -#ifdef HAVE_LIBGL +#ifdef HAVE_GL drawBuffers(); #endif } @@ -1205,7 +1207,7 @@ Communicate com; void glrenderWrapper() { -#ifdef HAVE_LIBGL +#ifdef HAVE_GL #ifdef HAVE_PTHREAD wait(initSignal,initLock); endwait(initSignal,initLock); |