diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-11-29 00:24:43 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-11-29 00:24:43 +0000 |
| commit | 4b23d4c6d59bb0461e0f1b44c88c489df6ab7a31 (patch) | |
| tree | 7ec64a2336791e41a68a79b3947aafab38a4113f /FL/Fl_Bitmap.H | |
| parent | 79d6a32be98d8809c915fd4914cb57a5730202b3 (diff) | |
VC++ fixes, plus add new tiled_image project file.
Use the plastic box type for the tiled_image demo.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1783 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL/Fl_Bitmap.H')
| -rw-r--r-- | FL/Fl_Bitmap.H | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/FL/Fl_Bitmap.H b/FL/Fl_Bitmap.H index c4864d36e..9218bb540 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.4 2001/11/22 15:35:01 easysw Exp $" +// "$Id: Fl_Bitmap.H,v 1.5.2.3.2.5 2001/11/29 00:24: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(&((const char *)array), 1);} + Fl_Image(W,H,0), array(bits), alloc_array(0), id(0) {data((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(&((const char *)array), 1);} + Fl_Image(W,H,0), array((const uchar *)bits), alloc_array(0), id(0) {data((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.4 2001/11/22 15:35:01 easysw Exp $". +// End of "$Id: Fl_Bitmap.H,v 1.5.2.3.2.5 2001/11/29 00:24:43 easysw Exp $". // |