Remove virtual member Fl_GraphicsDriver::mask_bitmap(char **) and its re-implementations.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12843 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

2 files changed, 7 insertions, 7 deletions

diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.H b/src/drivers/GDI/Fl_GDI_Graphics_Driver.H
index f4910fc47..bca0b2177 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.H
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.H
@@ -48,9 +48,8 @@ protected:
   HDC gc_;
   int numcount;
   int counts[20];
-  uchar **mask_bitmap_;
-  uchar **mask_bitmap() {return mask_bitmap_;}
-  void mask_bitmap(uchar **value) { mask_bitmap_ = value; }
+  uchar *mask_bitmap_;
+  uchar **mask_bitmap() {return &mask_bitmap_;}
   int p_size;
   POINT *p;
 public:
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx
index fc63f727a..4ad9d5509 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx
@@ -687,15 +687,16 @@ void Fl_GDI_Printer_Graphics_Driver::draw_pixmap(Fl_Pixmap *pxm, int XP, int YP,
 void Fl_GDI_Graphics_Driver::cache(Fl_Pixmap *img) {
   Fl_Image_Surface *surf = new Fl_Image_Surface(img->data_w(), img->data_h());
   Fl_Surface_Device::push_current(surf);
-  uchar *bitmap = 0;
-  Fl_Surface_Device::surface()->driver()->mask_bitmap(&bitmap);
+  uchar **pbitmap = surf->driver()->mask_bitmap();
+  *pbitmap = 0;
   fl_draw_pixmap(img->data(), 0, 0, FL_BLACK);
   *Fl_Graphics_Driver::pixmap_bg_color(img) = Fl_WinAPI_System_Driver::win_pixmap_bg_color;  // computed by fl_draw_pixmap()
-  Fl_Surface_Device::surface()->driver()->mask_bitmap(0);
+  uchar *bitmap = *pbitmap;
   if (bitmap) {
-    *Fl_Graphics_Driver::mask(img) = (fl_uintptr_t)fl_create_bitmask(img->data_w(), img->data_h(), bitmap);
+    *Fl_Graphics_Driver::mask(img) = (fl_uintptr_t)create_bitmask(img->data_w(), img->data_h(), bitmap);
     delete[] bitmap;
   }
+  *pbitmap = 0;
   Fl_Surface_Device::pop_current();
   Fl_Offscreen id = surf->get_offscreen_before_delete();
   delete surf;