diff options
| author | Manolo Gouy <Manolo> | 2010-06-16 17:19:02 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2010-06-16 17:19:02 +0000 |
| commit | 9a026f9dcd0a1149e0638ddc1e442e74b12b5caa (patch) | |
| tree | f8c032cd88075756aca162489f53cce25261c892 | |
| parent | 55a6172ad796e7ffcfad3109e4843926b2c48157 (diff) | |
Reintroduced the changes brought in r.7606 that had been lost in r.7617
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7645 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/fl_draw_pixmap.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/fl_draw_pixmap.cxx b/src/fl_draw_pixmap.cxx index a8755938a..c674a6791 100644 --- a/src/fl_draw_pixmap.cxx +++ b/src/fl_draw_pixmap.cxx @@ -221,7 +221,7 @@ int fl_draw_pixmap(const char*const* cdata, int x, int y, Fl_Color bg) { if (!fl_measure_pixmap(cdata, d.w, d.h)) return 0; const uchar*const* data = (const uchar*const*)(cdata+1); int transparent_index = -1; - uchar *transparent_c; // such that transparent_c[0,1,2] are the RGB of the transparent color + uchar *transparent_c = (uchar *)0; // such that transparent_c[0,1,2] are the RGB of the transparent color #ifdef WIN32 color_count = 0; used_colors = (uchar *)malloc(abs(ncolors)*3*sizeof(uchar)); @@ -334,7 +334,13 @@ int fl_draw_pixmap(const char*const* cdata, int x, int y, Fl_Color bg) { } d.data = data; #ifdef WIN32 + 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 #ifdef __APPLE_QUARTZ__ |