diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-12-21 20:45:43 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-12-21 20:45:43 +0000 |
| commit | 1eb5acf22eeacb783b950655314e142b4b5a89a6 (patch) | |
| tree | 187fa4228496aab392e00b1dc66ec4811867e625 | |
| parent | b51af0f1bf311421d5d18815f8776b2e4ddc43c7 (diff) | |
Casts to make old IRIX 5.3 C++ compiler happy...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1892 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/Fl_Bitmap.H | 8 | ||||
| -rw-r--r-- | FL/Fl_Image.H | 6 | ||||
| -rw-r--r-- | src/Fl_GIF_Image.cxx | 6 | ||||
| -rw-r--r-- | src/Fl_Pixmap.cxx | 6 | ||||
| -rw-r--r-- | src/Fl_XPM_Image.cxx | 6 |
5 files changed, 16 insertions, 16 deletions
diff --git a/FL/Fl_Bitmap.H b/FL/Fl_Bitmap.H index 9218bb540..40593bdb1 100644 --- a/FL/Fl_Bitmap.H +++ b/FL/Fl_Bitmap.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Bitmap.H,v 1.5.2.3.2.5 2001/11/29 00:24:43 easysw Exp $" +// "$Id: Fl_Bitmap.H,v 1.5.2.3.2.6 2001/12/21 20:45:43 easysw Exp $" // // Bitmap header file for the Fast Light Tool Kit (FLTK). // @@ -38,9 +38,9 @@ class FL_EXPORT Fl_Bitmap : public Fl_Image { Fl_Bitmask id; // for internal use Fl_Bitmap(const uchar *bits, int W, int H) : - Fl_Image(W,H,0), array(bits), alloc_array(0), id(0) {data((char **)&array, 1);} + Fl_Image(W,H,0), array(bits), alloc_array(0), id(0) {data((const char **)&array, 1);} Fl_Bitmap(const char *bits, int W, int H) : - Fl_Image(W,H,0), array((const uchar *)bits), alloc_array(0), id(0) {data((char **)&array, 1);} + Fl_Image(W,H,0), array((const uchar *)bits), alloc_array(0), id(0) {data((const char **)&array, 1);} virtual ~Fl_Bitmap(); virtual Fl_Image *copy(int W, int H); Fl_Image *copy() { return copy(w(), h()); } @@ -53,5 +53,5 @@ class FL_EXPORT Fl_Bitmap : public Fl_Image { #endif // -// End of "$Id: Fl_Bitmap.H,v 1.5.2.3.2.5 2001/11/29 00:24:43 easysw Exp $". +// End of "$Id: Fl_Bitmap.H,v 1.5.2.3.2.6 2001/12/21 20:45:43 easysw Exp $". // diff --git a/FL/Fl_Image.H b/FL/Fl_Image.H index aaacdb9b4..f218c24d4 100644 --- a/FL/Fl_Image.H +++ b/FL/Fl_Image.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Image.H,v 1.5.2.3.2.8 2001/11/29 00:24:43 easysw Exp $" +// "$Id: Fl_Image.H,v 1.5.2.3.2.9 2001/12/21 20:45:43 easysw Exp $" // // Image header file for the Fast Light Tool Kit (FLTK). // @@ -76,7 +76,7 @@ class FL_EXPORT Fl_RGB_Image : public Fl_Image { Fl_Bitmask mask; // for internal use (mask bitmap) Fl_RGB_Image(const uchar *bits, int W, int H, int D=3, int LD=0) : - Fl_Image(W,H,D), array(bits), alloc_array(0), id(0), mask(0) {data((char **)&array, 1); ld(LD);} + Fl_Image(W,H,D), array(bits), alloc_array(0), id(0), mask(0) {data((const char **)&array, 1); ld(LD);} virtual ~Fl_RGB_Image(); virtual Fl_Image *copy(int W, int H); Fl_Image *copy() { return copy(w(), h()); } @@ -91,5 +91,5 @@ class FL_EXPORT Fl_RGB_Image : public Fl_Image { #endif // -// End of "$Id: Fl_Image.H,v 1.5.2.3.2.8 2001/11/29 00:24:43 easysw Exp $". +// End of "$Id: Fl_Image.H,v 1.5.2.3.2.9 2001/12/21 20:45:43 easysw Exp $". // diff --git a/src/Fl_GIF_Image.cxx b/src/Fl_GIF_Image.cxx index b6260d111..83b27c322 100644 --- a/src/Fl_GIF_Image.cxx +++ b/src/Fl_GIF_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_GIF_Image.cxx,v 1.1.2.7 2001/12/19 18:15:33 easysw Exp $" +// "$Id: Fl_GIF_Image.cxx,v 1.1.2.8 2001/12/21 20:45:43 easysw Exp $" // // Fl_GIF_Image routines. // @@ -363,7 +363,7 @@ Fl_GIF_Image::Fl_GIF_Image(const char *infname) : Fl_Pixmap((char *const*)0) { new_data[i + 2][Width] = 0; } - data(new_data, Height + 2); + data((const char **)new_data, Height + 2); alloc_data = 1; delete[] Image; @@ -373,5 +373,5 @@ Fl_GIF_Image::Fl_GIF_Image(const char *infname) : Fl_Pixmap((char *const*)0) { // -// End of "$Id: Fl_GIF_Image.cxx,v 1.1.2.7 2001/12/19 18:15:33 easysw Exp $". +// End of "$Id: Fl_GIF_Image.cxx,v 1.1.2.8 2001/12/21 20:45:43 easysw Exp $". // diff --git a/src/Fl_Pixmap.cxx b/src/Fl_Pixmap.cxx index 83dc96593..e7fbd9b4f 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.11 2001/12/04 03:03:17 matthiaswm Exp $" +// "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.12 2001/12/21 20:45:43 easysw Exp $" // // Pixmap drawing code for the Fast Light Tool Kit (FLTK). // @@ -207,7 +207,7 @@ void Fl_Pixmap::copy_data() { } // Update pointers... - data(new_data, h() + ncolors + 1); + data((const char **)new_data, h() + ncolors + 1); alloc_data = 1; } @@ -485,5 +485,5 @@ void Fl_Pixmap::desaturate() { } // -// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.11 2001/12/04 03:03:17 matthiaswm Exp $". +// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.12 2001/12/21 20:45:43 easysw Exp $". // diff --git a/src/Fl_XPM_Image.cxx b/src/Fl_XPM_Image.cxx index d29429599..4b36593dc 100644 --- a/src/Fl_XPM_Image.cxx +++ b/src/Fl_XPM_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_XPM_Image.cxx,v 1.1.2.1 2001/11/24 18:07:57 easysw Exp $" +// "$Id: Fl_XPM_Image.cxx,v 1.1.2.2 2001/12/21 20:45:43 easysw Exp $" // // Fl_XPM_Image routines. // @@ -119,11 +119,11 @@ Fl_XPM_Image::Fl_XPM_Image(const char *name) : Fl_Pixmap((char *const*)0) { fclose(f); - data(new_data, i); + data((const char **)new_data, i); measure(); } // -// End of "$Id: Fl_XPM_Image.cxx,v 1.1.2.1 2001/11/24 18:07:57 easysw Exp $". +// End of "$Id: Fl_XPM_Image.cxx,v 1.1.2.2 2001/12/21 20:45:43 easysw Exp $". // |
