diff options
| author | Fabien Costantini <fabien@onepost.net> | 2012-04-22 02:59:27 +0000 |
|---|---|---|
| committer | Fabien Costantini <fabien@onepost.net> | 2012-04-22 02:59:27 +0000 |
| commit | a5196976cc56590e2cbc261932ec1ee3f310a7fa (patch) | |
| tree | cbbb4518a64150435c2bbf93a90733708c1889d3 /src | |
| parent | 822bc272fc05b79a4385cbf139f4a6c87031617a (diff) | |
restore transparent_c use for win32...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9374 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/fl_draw_pixmap.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/fl_draw_pixmap.cxx b/src/fl_draw_pixmap.cxx index 759d2cefc..1e2a98f25 100644 --- a/src/fl_draw_pixmap.cxx +++ b/src/fl_draw_pixmap.cxx @@ -209,8 +209,8 @@ 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 = (uchar *)0; // such that transparent_c[0,1,2] are the RGB of the transparent color #ifdef WIN32 + uchar *transparent_c = (uchar *)0; // such that transparent_c[0,1,2] are the RGB of the transparent color color_count = 0; used_colors = (uchar *)malloc(abs(ncolors)*3*sizeof(uchar)); #endif @@ -230,7 +230,7 @@ int fl_draw_pixmap(const char*const* cdata, int x, int y, Fl_Color bg) { #endif transparent_index = ' '; Fl::get_color(bg, c[0], c[1], c[2]); c[3] = 0; - // transparent_c = c; + transparent_c = c; p += 4; ncolors--; } @@ -316,7 +316,9 @@ int fl_draw_pixmap(const char*const* cdata, int x, int y, Fl_Color bg) { c[3] = 0; #endif transparent_index = ind; - //transparent_c = c; +#ifdef WIN32 + transparent_c = c; +#endif } } } |