From bd9a57be29d15f72cd561d99b0a90317361dfe88 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Thu, 19 Apr 2018 13:51:17 +0000
Subject: Fix background color when drawing pixmap data both directly or as an
 Fl_Pixmap object.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12860 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/fl_draw_pixmap.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/fl_draw_pixmap.cxx b/src/fl_draw_pixmap.cxx
index 11ffe0f49..de06a3696 100644
--- a/src/fl_draw_pixmap.cxx
+++ b/src/fl_draw_pixmap.cxx
@@ -203,7 +203,8 @@ int fl_convert_pixmap(const char*const* cdata, uchar* out, Fl_Color bg) {
         // assume "None" or "#transparent" for any errors
         // "bg" should be transparent...
         Fl::get_color(bg, c[0], c[1], c[2]);
-        c[3] = 255;
+        uchar **m = fl_graphics_driver->mask_bitmap();
+        c[3] = (m && !*m) ? 255 : 0;
         if (Fl_Graphics_Driver::need_pixmap_bg_color) transparent_c = c;
       } // if parse
     } // for ncolors
-- 
cgit v1.2.3