diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-11-19 20:59:59 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-11-19 20:59:59 +0000 |
| commit | 13e7d7639729cc0fb9b778ecd2e45d407d45d393 (patch) | |
| tree | 34bcdda92540cfd4768852662237f56fb2d7282d /src/Fl_Image.cxx | |
| parent | fb4fe5642abe7b68b99863ab0cf997b744ccbeaf (diff) | |
WIN32 fixes for the new image stuff...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1705 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Image.cxx')
| -rw-r--r-- | src/Fl_Image.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Fl_Image.cxx b/src/Fl_Image.cxx index 3663e4224..3359f5057 100644 --- a/src/Fl_Image.cxx +++ b/src/Fl_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Image.cxx,v 1.5.2.3.2.3 2001/11/19 01:06:45 easysw Exp $" +// "$Id: Fl_Image.cxx,v 1.5.2.3.2.4 2001/11/19 20:59:59 easysw Exp $" // // Image drawing code for the Fast Light Tool Kit (FLTK). // @@ -58,7 +58,7 @@ void Fl_Image::label(Fl_Menu_Item* m) { Fl_RGB_Image::~Fl_RGB_Image() { if (id) fl_delete_offscreen((Fl_Offscreen)id); - if (alloc_array) delete[] array; + if (alloc_array) delete[] (uchar *)array; } Fl_Image *Fl_RGB_Image::copy(int W, int H) { @@ -212,7 +212,7 @@ void Fl_RGB_Image::desaturate() { } // Free the old array as needed, and then set the new pointers/values... - if (alloc_array) delete[] array; + if (alloc_array) delete[] (uchar *)array; array = new_array; alloc_array = 1; @@ -232,7 +232,7 @@ void Fl_RGB_Image::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) { - id = (ulong)fl_create_offscreen(w(), h()); + id = fl_create_offscreen(w(), h()); fl_begin_offscreen((Fl_Offscreen)id); fl_draw_image(array, 0, 0, w(), h(), d, ld); fl_end_offscreen(); @@ -394,5 +394,5 @@ void Fl_RGB_Image::label(Fl_Menu_Item* m) { // -// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.3 2001/11/19 01:06:45 easysw Exp $". +// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.4 2001/11/19 20:59:59 easysw Exp $". // |