summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2010-05-13 10:18:47 +0000
committerManolo Gouy <Manolo>2010-05-13 10:18:47 +0000
commit30933933b08104030397f3575283d845316aceaf (patch)
tree75b17892f655a0563455396a82df2d1e5321a4a5 /src
parent6efdd851978c5713318feb2470521309343126c9 (diff)
Fixed WIN32 crash when pixmap has no background area
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7606 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/fl_draw_pixmap.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/fl_draw_pixmap.cxx b/src/fl_draw_pixmap.cxx
index f68237a62..5df23a3a6 100644
--- a/src/fl_draw_pixmap.cxx
+++ b/src/fl_draw_pixmap.cxx
@@ -335,9 +335,12 @@ int fl_draw_pixmap(const char*const* cdata, int x, int y, Fl_Color bg) {
}
d.data = data;
#ifdef WIN32
- if(transparent_c){
- // only make a transparent color if one is defined
- make_unused_color(transparent_c[0], transparent_c[1], transparent_c[2]);
+ if (transparent_c) {
+ make_unused_color(transparent_c[0], transparent_c[1], transparent_c[2]);
+ }
+ else {
+ uchar r, g, b;
+ make_unused_color(r, g, b);
}
#endif
#ifndef __APPLE_QUARTZ__