Mercurial > octave
changeset 24220:2b7532f237d7
colormap.m: fix regression introduced with 547919e6aec1
| author | Pantxo Diribarne <pantxo.diribarne@gmail.com> |
|---|---|
| date | Thu, 09 Nov 2017 09:58:33 +0100 |
| parents | 3d96400df713 |
| children | ac080874d3b9 |
| files | scripts/image/colormap.m scripts/plot/util/private/__ghostscript__.m scripts/plot/util/private/__opengl_print__.m |
| diffstat | 3 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/image/colormap.m Mon Nov 06 10:27:09 2017 +0100 +++ b/scripts/image/colormap.m Thu Nov 09 09:58:33 2017 +0100 @@ -99,8 +99,9 @@ endif if (nargin == 1) - map = tolower (varargin{1}); + map = varargin{1}; if (ischar (map)) + map = tolower (map); if (strcmp (map, "default")) map = viridis (64); else
--- a/scripts/plot/util/private/__ghostscript__.m Mon Nov 06 10:27:09 2017 +0100 +++ b/scripts/plot/util/private/__ghostscript__.m Thu Nov 09 09:58:33 2017 +0100 @@ -113,6 +113,7 @@ ## "pageoffset" is relative to the coordinates, not the BBox LLHC. str = sprintf ("%s [%d %d] %s", "<< /Margins [0 0] /.HWMargins [0 0 0 0] /PageOffset", fix (opts.pageoffset), ">> setpagedevice"); + str offset_ps = {"%!PS-Adobe-3.0", str, "%%EOF"}; if (isfield (opts, "offsetfile")) offsetfile = opts.offsetfile;
--- a/scripts/plot/util/private/__opengl_print__.m Mon Nov 06 10:27:09 2017 +0100 +++ b/scripts/plot/util/private/__opengl_print__.m Thu Nov 09 09:58:33 2017 +0100 @@ -155,6 +155,8 @@ if (strcmp (get (opts.figure, "visible"), "on")) ## Use toolkits "print_figure" method + disp (gl2ps_device{n}) + disp (pipeline{n}) drawnow (gl2ps_device{n}, ['|' pipeline{n}]); else ## Use OpenGL offscreen rendering with OSMesa