Remove the global variable fl_mask_bitmap - put it in the graphics driver's virtual API.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11216 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 2 insertions, 3 deletions

diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
index 591203174..53aa48a13 100644
--- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
@@ -806,16 +806,15 @@ void Fl_Xlib_Graphics_Driver::draw(Fl_Pixmap *pxm, int XP, int YP, int WP, int H
   else copy_offscreen(X, Y, W, H, pxm->id_, cx, cy);
 }
 
-extern uchar **fl_mask_bitmap; // if non-zero, create bitmap and store pointer here
 
 fl_uintptr_t Fl_Xlib_Graphics_Driver::cache(Fl_Pixmap *img, int w, int h, const char *const*data) {
   Fl_Offscreen id;
   id = fl_create_offscreen(w, h);
   fl_begin_offscreen(id);
   uchar *bitmap = 0;
-  fl_mask_bitmap = &bitmap;
+  mask_bitmap(&bitmap);
   fl_draw_pixmap(data, 0, 0, FL_BLACK);
-  fl_mask_bitmap = 0;
+  mask_bitmap(0);
   if (bitmap) {
     img->mask_ = (fl_uintptr_t)fl_create_bitmask(w, h, bitmap);
     delete[] bitmap;