gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Safer code for gl_draw() when used on normal window and Mac OS X.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11725 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2016-05-09 08:01:16 +00:00
parent 59f5b732ae
commit 489bb91a82
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gl_draw.cxx
View File

@ -40,6 +40,7 @@
# include <OpenGL/glext.h>
# define kCGBitmapByteOrder32Host 0
# define GL_TEXTURE_RECTANGLE_ARB GL_TEXTURE_RECTANGLE_EXT
# include <FL/Fl_Gl_Window.H>
#endif // __APPLE__
/** Returns the current font's height */
@ -520,7 +521,8 @@ static gl_texture_fifo *gl_fifo = NULL; // points to the texture pile class inst
// draws a utf8 string using pre-computed texture if available
static void gl_draw_textures(const char* str, int n)
{
gl_scale = Fl_Window::current()->as_gl_window()->pixels_per_unit();
Fl_Gl_Window *gwin = Fl_Window::current()->as_gl_window();
gl_scale = (gwin ? gwin->pixels_per_unit() : 1);
//fprintf(stderr,"gl_scale=%d\n",gl_scale);
if (! gl_fifo) gl_fifo = new gl_texture_fifo();
if (!gl_fifo->textures_generated) {