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_Image.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_Image.H')
| -rw-r--r-- | FL/Fl_Image.H | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/FL/Fl_Image.H b/FL/Fl_Image.H index e3331b9e8..aaacdb9b4 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.7 2001/11/25 16:38:10 easysw Exp $" +// "$Id: Fl_Image.H,v 1.5.2.3.2.8 2001/11/29 00:24: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((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.7 2001/11/25 16:38:10 easysw Exp $". +// End of "$Id: Fl_Image.H,v 1.5.2.3.2.8 2001/11/29 00:24:43 easysw Exp $". // |