Author: manolo
Date: 2010-06-16 10:19:02 -0700 (Wed, 16 Jun 2010)
New Revision: 7645
Log:
Reintroduced the changes brought in r.7606 that had been lost in r.7617
Modified:
branches/branch-1.3/src/fl_draw_pixmap.cxx
Modified: branches/branch-1.3/src/fl_draw_pixmap.cxx
===================================================================
--- branches/branch-1.3/src/fl_draw_pixmap.cxx 2010-06-15 21:16:27 UTC (rev
7644)
+++ branches/branch-1.3/src/fl_draw_pixmap.cxx 2010-06-16 17:19:02 UTC (rev
7645)
@@ -221,7 +221,7 @@
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 @@
}
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__
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
