Mercurial > octave-antonio

comparison libinterp/corefcn/gl2ps-renderer.h @ 20129:1784bf79ed43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backout part of cset 438485f6a479 (bugs #44765, #44806) * gl2ps-renderer.h: remove overloaded method "draw_axes" that fails on win7.
author Pantxo Diribarne <pantxo.diribarne@gmail.com>
date Fri, 24 Apr 2015 18:43:36 +0200
parents 438485f6a479
children
comparison
equal deleted inserted replaced
20128:e05fe4260252 20129:1784bf79ed43
52 52
53 void draw_text (const text::properties& props); 53 void draw_text (const text::properties& props);
54 void draw_pixels (GLsizei w, GLsizei h, GLenum format, 54 void draw_pixels (GLsizei w, GLsizei h, GLenum format,
55 GLenum type, const GLvoid *data); 55 GLenum type, const GLvoid *data);
56 56
57 void draw_axes (const axes::properties& props)
58 {
59 // Initialize a new sorting tree in gl2ps, this will make subsequent
60 // objects be drawn over previous ones
61 GLint vp[4];
62 gl2psEndViewport ();
63 glGetIntegerv(GL_VIEWPORT, vp);
64 gl2psBeginViewport (vp);
65
66 opengl_renderer::draw_axes (props);
67 }
68
69
70 void set_linestyle (const std::string& s, bool use_stipple = false) 57 void set_linestyle (const std::string& s, bool use_stipple = false)
71 { 58 {
72 opengl_renderer::set_linestyle (s, use_stipple); 59 opengl_renderer::set_linestyle (s, use_stipple);
73 60
74 if (s == "-" && ! use_stipple) 61 if (s == "-" && ! use_stipple)