summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2004-08-31 01:29:55 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2004-08-31 01:29:55 +0000
commita3155cb205973ee1ebd1bbcf807232a119e67806 (patch)
tree174eab6aeb76431f517434d3c07f2e6b52de2ac2
parent57193e52c0ea34a6af53289b72b232e226466bc1 (diff)
#warn is not portable.
Fix GCC warning about [' ']... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3799 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--src/Fl_Pixmap.cxx6
-rw-r--r--src/fl_draw_pixmap.cxx6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Fl_Pixmap.cxx b/src/Fl_Pixmap.cxx
index 620d3f308..82e8250f5 100644
--- a/src/Fl_Pixmap.cxx
+++ b/src/Fl_Pixmap.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.30 2004/08/31 00:27:40 matthiaswm Exp $"
+// "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.31 2004/08/31 01:29:54 easysw Exp $"
//
// Pixmap drawing code for the Fast Light Tool Kit (FLTK).
//
@@ -80,7 +80,7 @@ void Fl_Pixmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
if (cy+H > h()) H = h()-cy;
if (H <= 0) return;
if (!id) {
-#warning : to enable masking in Quartz, write our own version of this little function!
+//#warning : to enable masking in Quartz, write our own version of this little function!
id = fl_create_offscreen(w(), h());
fl_begin_offscreen((Fl_Offscreen)id);
uchar *bitmap = 0;
@@ -464,5 +464,5 @@ void Fl_Pixmap::desaturate() {
}
//
-// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.30 2004/08/31 00:27:40 matthiaswm Exp $".
+// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.31 2004/08/31 01:29:54 easysw Exp $".
//
diff --git a/src/fl_draw_pixmap.cxx b/src/fl_draw_pixmap.cxx
index 9e6eb569f..8c12982b3 100644
--- a/src/fl_draw_pixmap.cxx
+++ b/src/fl_draw_pixmap.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: fl_draw_pixmap.cxx,v 1.4.2.8.2.13 2004/04/11 04:38:59 easysw Exp $"
+// "$Id: fl_draw_pixmap.cxx,v 1.4.2.8.2.14 2004/08/31 01:29:55 easysw Exp $"
//
// Pixmap drawing code for the Fast Light Tool Kit (FLTK).
//
@@ -147,7 +147,7 @@ int fl_draw_pixmap(const char*const* di, int x, int y, Fl_Color bg) {
// if first color is ' ' it is transparent (put it later to make
// it not be transparent):
if (*p == ' ') {
- uchar* c = (uchar*)&d.colors[' '];
+ uchar* c = (uchar*)&d.colors[(int)' '];
#ifdef U64
*(U64*)c = 0;
# if WORDS_BIGENDIAN
@@ -260,5 +260,5 @@ int fl_draw_pixmap(const char*const* di, int x, int y, Fl_Color bg) {
}
//
-// End of "$Id: fl_draw_pixmap.cxx,v 1.4.2.8.2.13 2004/04/11 04:38:59 easysw Exp $".
+// End of "$Id: fl_draw_pixmap.cxx,v 1.4.2.8.2.14 2004/08/31 01:29:55 easysw Exp $".
//