diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-09-24 16:00:11 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-09-24 16:00:11 +0000 |
| commit | 18ad096722e7ce1d38ed7f956fe11a86c9a0dee5 (patch) | |
| tree | dfbd127b3e7f2bc4c1070dc3d17a5d65aa226427 /src/Fl_Image.cxx | |
| parent | 44a7ad2c489bc6e9e65b82c8776cc136472fd588 (diff) | |
Now look for 8 bits of alpha when the developer has requested
FL_RGB8 (STR #541)
The last line in an Fl_Help_View widget was not aligned properly
(STR #536)
The "search" symbol looked like a Q (STR #536)
Changed Fl_Help_View::get_color() to use a lookup table to avoid
serious Borland C++ 5.5 compiler bugs (STR #533)
Fixed Watcom compiler warnings with FL/Fl_Widget.H (STR #540)
The image class copy() methods did not always make a separate
copy of the image data (STR #539)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3844 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Image.cxx')
| -rw-r--r-- | src/Fl_Image.cxx | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/Fl_Image.cxx b/src/Fl_Image.cxx index a21bfa008..1f47beaa6 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.37 2004/08/31 22:00:47 matthiaswm Exp $" +// "$Id: Fl_Image.cxx,v 1.5.2.3.2.38 2004/09/24 16:00:10 easysw Exp $" // // Image drawing code for the Fast Light Tool Kit (FLTK). // @@ -141,18 +141,28 @@ void Fl_RGB_Image::uncache() { } Fl_Image *Fl_RGB_Image::copy(int W, int H) { + Fl_RGB_Image *new_image; // New RGB image + uchar *new_array; // New array for image data + // Optimize the simple copy where the width and height are the same, // or when we are copying an empty image... if ((W == w() && H == h()) || !w() || !h() || !d() || !array) { - return new Fl_RGB_Image(array, w(), h(), d(), ld()); + if (array) { + // Make a copy of the image data and return a new Fl_RGB_Image... + new_array = new uchar[w() * h() * d()]; + memcpy(new_array, array, w() * h() * d()); + + new_image = new Fl_RGB_Image(new_array, w(), h(), d(), ld()); + new_image->alloc_array = 1; + + return new_image; + } else return new Fl_RGB_Image(array, w(), h(), d(), ld()); } if (W <= 0 || H <= 0) return 0; // OK, need to resize the image data; allocate memory and - Fl_RGB_Image *new_image; // New RGB image - uchar *new_array, // New array for image data - *new_ptr; // Pointer into new array + uchar *new_ptr; // Pointer into new array const uchar *old_ptr; // Pointer into old array int c, // Channel number sy, // Source coordinate @@ -418,5 +428,5 @@ void Fl_RGB_Image::label(Fl_Menu_Item* m) { // -// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.37 2004/08/31 22:00:47 matthiaswm Exp $". +// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.38 2004/09/24 16:00:10 easysw Exp $". // |