diff options
| -rw-r--r-- | examples/clipboard.cxx | 2 | ||||
| -rw-r--r-- | src/Fl_cocoa.mm | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/examples/clipboard.cxx b/examples/clipboard.cxx index 5859e5c58..bb0a62d0e 100644 --- a/examples/clipboard.cxx +++ b/examples/clipboard.cxx @@ -98,7 +98,7 @@ public: #endif Fl_Image *oldimg = image_box->image(); delete oldimg; - im->scale(image_box->w(), image_box->h()); + if (im->w() > image_box->w() || im->h() > image_box->h()) im->scale(image_box->w(), image_box->h()); image_box->image(im); // show the scaled image image_size->copy_label(title); value(image_box->parent()); diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 8b392cdba..3a66b5933 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -3576,12 +3576,12 @@ static Fl_RGB_Image* get_image_from_clipboard(Fl_Widget *receiver) if (!bitmap) return NULL; int bytesPerPixel([bitmap bitsPerPixel]/8); int bpr([bitmap bytesPerRow]); - int bpp([bitmap bytesPerPlane]); - int hh(bpp/bpr); - int ww(bpr/bytesPerPixel); + int hh([bitmap pixelsHigh]); + int ww([bitmap pixelsWide]); uchar *imagedata = new uchar[bpr * hh]; memcpy(imagedata, [bitmap bitmapData], bpr * hh); - Fl_RGB_Image *image = new Fl_RGB_Image(imagedata, ww, hh, bytesPerPixel); + Fl_RGB_Image *image = new Fl_RGB_Image(imagedata, ww, hh, bytesPerPixel, (bpr == ww * bytesPerPixel ? 0 : bpr) ); + image->scale([bitmap size].width, [bitmap size].height); image->alloc_array = 1; [bitmap release]; Fl::e_clipboard_type = Fl::clipboard_image; |