From 22bcc7b4cacee37be4e0559c84c848d1f6b1daf6 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Wed, 31 Oct 2018 09:05:26 +0000 Subject: Remove all dependency to libfltk_gl from Fl_cocoa.mm. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@13103 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx') diff --git a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx index f574c671c..a51788018 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx @@ -68,9 +68,8 @@ Fl_RGB_Image* Fl_OpenGL_Display_Device::capture_gl_rectangle(Fl_Gl_Window* glw, if (factor != 1) { w *= factor; h *= factor; x *= factor; y *= factor; } - Fl_Cocoa_Gl_Window_Driver *driver = (Fl_Cocoa_Gl_Window_Driver*)glw->gl_driver(); - driver->GLcontext_makecurrent(glw->context()); - driver->flush_context(); // to capture also the overlay and for directGL demo + Fl_Cocoa_Gl_Window_Driver::GLcontext_makecurrent(glw->context()); + Fl_Cocoa_Gl_Window_Driver::flush_context(glw->context()); // to capture also the overlay and for directGL demo // Read OpenGL context pixels directly. // For extra safety, save & restore OpenGL states that are changed glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT); @@ -88,7 +87,7 @@ Fl_RGB_Image* Fl_OpenGL_Display_Device::capture_gl_rectangle(Fl_Gl_Window* glw, baseAddress = convert_BGRA_to_RGB(baseAddress, w, h, mByteWidth); Fl_RGB_Image *img = new Fl_RGB_Image(baseAddress, w, h, 3, 3 * w); img->alloc_array = 1; - driver->flush_context(); + Fl_Cocoa_Gl_Window_Driver::flush_context(glw->context()); return img; } -- cgit v1.2.3