From c7b1591486bf03becbf7414b2d9cac908bd7ee3c Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Sat, 26 Mar 2016 23:06:08 +0000
Subject: Remove a few uses of the fl_graphics_driver global variable

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11439 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx       |  4 ++--
 src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx | 12 ++++++------
 src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx     |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx
index 070c65568..20405ea5d 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx
@@ -633,11 +633,11 @@ fl_uintptr_t Fl_GDI_Graphics_Driver::cache(Fl_Pixmap *img, int w, int h, const c
   id = fl_create_offscreen(w, h);
   fl_begin_offscreen(id);
   uchar *bitmap = 0;
-  fl_graphics_driver->mask_bitmap(&bitmap);
+  Fl_Surface_Device::surface()->driver()->mask_bitmap(&bitmap);
   fl_draw_pixmap(data, 0, 0, FL_BLACK);
   extern UINT win_pixmap_bg_color; // computed by fl_draw_pixmap()
   img->pixmap_bg_color = win_pixmap_bg_color;
-  fl_graphics_driver->mask_bitmap(0);
+  Fl_Surface_Device::surface()->driver()->mask_bitmap(0);
   if (bitmap) {
     img->mask_ = (fl_uintptr_t)fl_create_bitmask(w, h, bitmap);
     delete[] bitmap;
diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx
index 727347320..d66694a35 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx
@@ -51,7 +51,7 @@ static void dataReleaseCB(void *info, const void *data, size_t size)
  */
 static void innards(const uchar *buf, int X, int Y, int W, int H,
 		    int delta, int linedelta, int mono,
-		    Fl_Draw_Image_Cb cb, void* userdata, CGContextRef gc)
+		    Fl_Draw_Image_Cb cb, void* userdata, CGContextRef gc, Fl_Quartz_Graphics_Driver *driver)
 {
   if (!linedelta) linedelta = W*abs(delta);
 
@@ -105,25 +105,25 @@ static void innards(const uchar *buf, int X, int Y, int W, int H,
       CGContextTranslateCTM(gc, W-1, 0);
       CGContextScaleCTM(gc, -1, 1);
     }
-    ((Fl_Quartz_Graphics_Driver*)fl_graphics_driver)->draw_CGImage(img, 0,0,W,H, 0,0,W,H);
+    driver->draw_CGImage(img, 0,0,W,H, 0,0,W,H);
     CGImageRelease(img);
     CGContextRestoreGState(gc);
   }
 }
 
 void Fl_Quartz_Graphics_Driver::draw_image(const uchar* buf, int x, int y, int w, int h, int d, int l){
-  innards(buf,x,y,w,h,d,l,(d<3&&d>-3),0,0,gc_);
+  innards(buf,x,y,w,h,d,l,(d<3&&d>-3),0,0,gc_,this);
 }
 void Fl_Quartz_Graphics_Driver::draw_image(Fl_Draw_Image_Cb cb, void* data,
 		   int x, int y, int w, int h,int d) {
-  innards(0,x,y,w,h,d,0,(d<3&&d>-3),cb,data,gc_);
+  innards(0,x,y,w,h,d,0,(d<3&&d>-3),cb,data,gc_,this);
 }
 void Fl_Quartz_Graphics_Driver::draw_image_mono(const uchar* buf, int x, int y, int w, int h, int d, int l){
-  innards(buf,x,y,w,h,d,l,1,0,0,gc_);
+  innards(buf,x,y,w,h,d,l,1,0,0,gc_,this);
 }
 void Fl_Quartz_Graphics_Driver::draw_image_mono(Fl_Draw_Image_Cb cb, void* data,
 		   int x, int y, int w, int h,int d) {
-  innards(0,x,y,w,h,d,0,1,cb,data,gc_);
+  innards(0,x,y,w,h,d,0,1,cb,data,gc_,this);
 }
 
 void fl_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b) {
diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
index 87df1da76..a7e548541 100644
--- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
@@ -823,9 +823,9 @@ fl_uintptr_t Fl_Xlib_Graphics_Driver::cache(Fl_Pixmap *img, int w, int h, const
   id = fl_create_offscreen(w, h);
   fl_begin_offscreen(id);
   uchar *bitmap = 0;
-  fl_graphics_driver->mask_bitmap(&bitmap);
+  Fl_Surface_Device::surface()->driver()->mask_bitmap(&bitmap);
   fl_draw_pixmap(data, 0, 0, FL_BLACK);
-  fl_graphics_driver->mask_bitmap(0);
+  Fl_Surface_Device::surface()->driver()->mask_bitmap(0);
   if (bitmap) {
     img->mask_ = (fl_uintptr_t)fl_create_bitmask(w, h, bitmap);
     delete[] bitmap;
-- 
cgit v1.2.3