diff options
| -rw-r--r-- | src/drivers/OpenGL/Fl_OpenGL_Display_Device.H | 6 | ||||
| -rw-r--r-- | src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx | 19 |
2 files changed, 9 insertions, 16 deletions
diff --git a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.H b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.H index 5637e6525..153121a60 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.H +++ b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.H @@ -3,7 +3,7 @@ // // implementation of class Fl_Gl_Device_Plugin for the Fast Light Tool Kit (FLTK). // -// Copyright 2010-2014 by Bill Spitzak and others. +// Copyright 2010-2016 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -16,7 +16,6 @@ // http://www.fltk.org/str.php // - #include <FL/Fl_Device.H> class Fl_OpenGL_Graphics_Driver; @@ -28,13 +27,12 @@ class Fl_RGB_Image; This surface is needed as an interface between GL windows and the GL graphics driver. */ class FL_EXPORT Fl_OpenGL_Display_Device : public Fl_Surface_Device { -public: Fl_OpenGL_Display_Device(Fl_OpenGL_Graphics_Driver *graphics_driver); +public: static Fl_OpenGL_Display_Device *display_device(); static Fl_RGB_Image* capture_gl_rectangle(Fl_Gl_Window*, int, int, int, int); }; - // // End of "$Id$". // diff --git a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx index 505efd17d..72fdcd64e 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx @@ -16,11 +16,9 @@ // http://www.fltk.org/str.php // -#include <config.h> #include "../../config_lib.h" #include <FL/Fl_Gl_Window.H> #include <FL/Fl_Image.H> -#include <FL/Fl_Device.H> #include <FL/gl.h> #include <string.h> @@ -42,7 +40,7 @@ Fl_OpenGL_Display_Device::Fl_OpenGL_Display_Device(Fl_OpenGL_Graphics_Driver *gr #ifdef FL_CFG_GFX_QUARTZ // convert BGRA to RGB and also exchange top and bottom -uchar *convert_BGRA_to_RGB(uchar *baseAddress, int w, int h, int mByteWidth) +static uchar *convert_BGRA_to_RGB(uchar *baseAddress, int w, int h, int mByteWidth) { uchar *newimg = new uchar[3*w*h]; uchar *to = newimg; @@ -89,7 +87,12 @@ Fl_RGB_Image* Fl_OpenGL_Display_Device::capture_gl_rectangle(Fl_Gl_Window* glw, img->alloc_array = 1; return img; } -#elif defined(FL_CFG_GFX_GDI) || defined(FL_CFG_GFX_XLIB) + +#else + +#if defined(FL_PORTING) +# pragma message "FL_PORTING: check whether the default Fl_OpenGL_Display_Device::capture_gl_rectangle() works for your platform" +#endif Fl_RGB_Image* Fl_OpenGL_Display_Device::capture_gl_rectangle(Fl_Gl_Window *glw, int x, int y, int w, int h) /* captures a rectangle of a Fl_Gl_Window window, and returns it as a RGB image @@ -127,14 +130,6 @@ Fl_RGB_Image* Fl_OpenGL_Display_Device::capture_gl_rectangle(Fl_Gl_Window *glw, return img; } -#elif defined(FL_PORTING) - -# pragma message "FL_PORTING: implement Fl_OpenGL_Display_Device::capture_gl_rectangle() for your platform" -Fl_RGB_Image* Fl_OpenGL_Display_Device::capture_gl_rectangle(Fl_Gl_Window* glw, int x, int y, int w, int h) -{ - return NULL; -} - #endif // // End of "$Id$". |