Mercurial > octave

changeset 22500:1d3b71530539

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix compilation of gl-render.cc if OpenGL is missing * gl-render.cc (opengl_renderer::draw): Avoid calling OpenGL functions if OpenGL is missing. (opengl_renderer::set_linestyle, opengl_renderer::render_grid): Mark linewidth as unused if OpenGL is missing.
author John W. Eaton <jwe@octave.org>
date Thu, 15 Sep 2016 22:10:14 -0400
parents dbe0ec8d53b5
children ed1b0d5fa97c
files libinterp/corefcn/gl-render.cc
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/gl-render.cc	Thu Sep 15 11:34:20 2016 -0700
+++ b/libinterp/corefcn/gl-render.cc	Thu Sep 15 22:10:14 2016 -0400
@@ -697,10 +697,14 @@
                  props.graphics_object_name ().c_str ());
       }
 
+#if defined (HAVE_OPENGL)
+
     GLenum gl_error = glGetError ();
     if (gl_error)
       warning ("opengl_renderer: Error %d occurred drawing '%s' object",
                gl_error, props.graphics_object_name ().c_str ());
+
+#endif
   }
 
 #if defined (HAVE_OPENGL)
@@ -901,6 +905,7 @@
 
 #else
 
+    octave_unused_parameter (linewidth);
     octave_unused_parameter (gridstyle);
     octave_unused_parameter (gridcolor);
     octave_unused_parameter (gridalpha);
@@ -3638,6 +3643,7 @@
 
     octave_unused_parameter (s);
     octave_unused_parameter (use_stipple);
+    octave_unused_parameter (linewidth);
 
     // This shouldn't happen because construction of opengl_renderer
     // objects is supposed to be impossible if OpenGL is not available.