gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restore transparent_c use for win32...

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9374 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Fabien Costantini 2012-04-22 02:59:27 +00:00
parent 822bc272fc
commit a5196976cc
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/fl_draw_pixmap.cxx
View File

@ -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
}
}
}