diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-07-29 02:12:36 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-07-29 02:12:36 +0000 |
| commit | 520d44ebf698fb5b9c87d38cd7e841f8dd110c81 (patch) | |
| tree | f540f1a56e2493685568aeb8e4c695b48c9f72f7 /src/Fl_Image.cxx | |
| parent | d597ec7b3898940fc8a790916c80b602abeefc1a (diff) | |
Fix scheme and image drawing bugs.
Bump to 1.1.4rc2.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3064 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Image.cxx')
| -rw-r--r-- | src/Fl_Image.cxx | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/Fl_Image.cxx b/src/Fl_Image.cxx index b67bd9c5b..b9e3f7c16 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.29 2003/01/30 21:41:55 easysw Exp $" +// "$Id: Fl_Image.cxx,v 1.5.2.3.2.30 2003/07/29 02:12:36 easysw Exp $" // // Image drawing code for the Fast Light Tool Kit (FLTK). // @@ -332,17 +332,22 @@ void Fl_RGB_Image::draw(int XP, int YP, int WP, int HP, int cx, int cy) { #elif defined(__APPLE__) if (mask) { Rect src, dst; - src.left = 0; src.right = w(); - src.top = 0; src.bottom = h(); - dst.left = X; dst.right = X+w(); - dst.top = Y; dst.bottom = Y+h(); + // MRS: STR #114 says we should be using cx, cy, W, and H... +// src.left = 0; src.right = w(); +// src.top = 0; src.bottom = h(); +// dst.left = X; dst.right = X+w(); +// dst.top = Y; dst.bottom = Y+h(); + src.left = cx; src.right = cx+W; + src.top = cx; src.bottom = cy+H; + dst.left = X; dst.right = X+W; + dst.top = Y; dst.bottom = Y+H; RGBColor rgb; rgb.red = 0xffff; rgb.green = 0xffff; rgb.blue = 0xffff; RGBBackColor(&rgb); rgb.red = 0x0000; rgb.green = 0x0000; rgb.blue = 0x0000; RGBForeColor(&rgb); -#if 0 +# if 0 // MRS: This *should* work, but doesn't on my system (iBook); change to // "#if 1" and restore the corresponding code in Fl_Bitmap.cxx // to test the real alpha channel support. @@ -350,12 +355,12 @@ void Fl_RGB_Image::draw(int XP, int YP, int WP, int HP, int cx, int cy) { GetPortBitMapForCopyBits((GrafPtr)mask), GetPortBitMapForCopyBits(GetWindowPort(fl_window)), &src, &src, &dst, blend, NULL); -#else // Fallback to screen-door transparency... +# else // Fallback to screen-door transparency... CopyMask(GetPortBitMapForCopyBits((GrafPtr)id), GetPortBitMapForCopyBits((GrafPtr)mask), GetPortBitMapForCopyBits(GetWindowPort(fl_window)), &src, &src, &dst); -#endif // 0 +# endif // 0 } else { fl_copy_offscreen(X, Y, W, H, (Fl_Offscreen)id, cx, cy); } @@ -392,5 +397,5 @@ void Fl_RGB_Image::label(Fl_Menu_Item* m) { // -// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.29 2003/01/30 21:41:55 easysw Exp $". +// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.30 2003/07/29 02:12:36 easysw Exp $". // |