Mercurial > octave

changeset 29851:8c60542cf30c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copyobj.m: Use 'qt' toolkit for BIST test, not 'gnuplot'. * copyobj.m: Change BIST conditional header to execute test only if 'qt' toolkit with "QT_OFFSCREEN" feature is available. Don't create extra structure variable s2 which could be quite large.
author Rik <rik@octave.org>
date Sat, 03 Jul 2021 11:38:36 -0700
parents 224dbae54060
children b2455f0a8297
files scripts/plot/util/copyobj.m
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/plot/util/copyobj.m	Sat Jul 03 10:54:43 2021 -0700
+++ b/scripts/plot/util/copyobj.m	Sat Jul 03 11:38:36 2021 -0700
@@ -203,9 +203,9 @@
 %! set (hnew, "position", [scrn(3)/2, scrn(4)/2-pos(4)/2, pos(3:4)]);
 %! drawnow ();
 
-%!testif HAVE_MAGICK; any (strcmp ("gnuplot", available_graphics_toolkits ()))
+%!testif HAVE_MAGICK; (have_window_system () && __have_feature__ ("QT_OFFSCREEN") && strcmp ("qt", graphics_toolkit ()))
 %! toolkit = graphics_toolkit ();
-%! graphics_toolkit ("gnuplot");
+%! graphics_toolkit ("qt");
 %! unwind_protect
 %!   h1 = figure ("visible", "off", "paperposition", [0.25, 2.5, 8.0, 6.0]);
 %!   x = 0:0.1:2*pi;
@@ -223,7 +223,6 @@
 %!         "color", [0 0.5 0], "horizontalalignment", "center");
 %!   s1 = hdl2struct (h1);
 %!   h2 = struct2hdl (s1);
-%!   s2 = hdl2struct (h2);
 %!   png1 = [tempname() ".png"];
 %!   png2 = [tempname() ".png"];
 %!   unwind_protect