Mercurial > octave-nkf
comparison libinterp/corefcn/gl2ps-renderer.cc @ 20645:395140e53656
Fix regression in svg output and simplify viewport handling (bug #44765)
* gl2ps-renderer.cc (glps-renderer::draw): remove check for GL2PS_NO_FEEDBACK, it it always true after EndViewport
* gl2ps-renderer.h (glps-renderer::draw_axes): call gl2psBegin(End)Viewport for every axes and check for GL2PS_NO_FEEDBACK after each axes.
* gl2ps-renderer.h (glps-renderer::draw_axes):remove unnecessary "naxes" attribute
author | Pantxo Diribarne <pantxo.diribarne@gmail.com> |
---|---|
date | Mon, 12 Oct 2015 20:49:04 +0200 |
parents | aa36fb998a4d |
children |
comparison
equal
deleted
inserted
replaced
20644:4e307c55a2b5 | 20645:395140e53656 |
---|---|
135 | 135 |
136 old_print_cmd = print_cmd; | 136 old_print_cmd = print_cmd; |
137 | 137 |
138 opengl_renderer::draw (go); | 138 opengl_renderer::draw (go); |
139 | 139 |
140 // Without glFinish () there may primitives be missing in the | 140 // Without glFinish () there may be primitives missing in the |
141 // gl2ps output. | 141 // gl2ps output. |
142 glFinish (); | 142 glFinish (); |
143 | 143 |
144 state = gl2psEndPage (); | 144 state = gl2psEndPage (); |
145 | 145 |
146 if (state == GL2PS_NO_FEEDBACK) | 146 if (state == GL2PS_ERROR) |
147 { | |
148 warning ("gl2ps-renderer::draw: empty feedback buffer and/or nothing else to print"); | |
149 } | |
150 else if (state == GL2PS_ERROR) | |
151 { | 147 { |
152 old_print_cmd.clear (); | 148 old_print_cmd.clear (); |
153 error ("gl2ps-renderer::draw: gl2psEndPage returned GL2PS_ERROR"); | 149 error ("gl2ps-renderer::draw: gl2psEndPage returned GL2PS_ERROR"); |
154 return; | 150 return; |
155 } | 151 } |