summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2018-04-29 16:29:13 +0000
committerManolo Gouy <Manolo>2018-04-29 16:29:13 +0000
commit09f15fcac0b030dc0602eabb7d064920aac3538d (patch)
tree4ee711fbaef8a1c3d182402ffc7647074ee6fe1e
parent7dba27a404d20485646ea57a526ec79a658ed9cb (diff)
Slightly simplify examples/clipboard.cxx using Fl_Image::scale().
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12880 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--examples/clipboard.cxx22
1 files changed, 9 insertions, 13 deletions
diff --git a/examples/clipboard.cxx b/examples/clipboard.cxx
index d95f883bd..c5ed99836 100644
--- a/examples/clipboard.cxx
+++ b/examples/clipboard.cxx
@@ -85,25 +85,21 @@ public:
int format = EnumClipboardFormats(0);
if (format && format < CF_MAX) { sprintf(p, " %d",format); p += strlen(p); }
while (format) {
- format = EnumClipboardFormats(format);
- if (format && format < CF_MAX) { sprintf(p, " %d",format); p += strlen(p); }
+ format = EnumClipboardFormats(format);
+ if (format && format < CF_MAX) { sprintf(p, " %d",format); p += strlen(p); }
}
HANDLE h;
if ((h = GetClipboardData(CF_DIB))) {
- LPBITMAPINFO lpBI = (LPBITMAPINFO)GlobalLock(h);
- sprintf(p, " biBitCount=%d biCompression=%d biClrUsed=%d",
- lpBI->bmiHeader.biBitCount, (int)lpBI->bmiHeader.biCompression, (int)lpBI->bmiHeader.biClrUsed);
+ LPBITMAPINFO lpBI = (LPBITMAPINFO)GlobalLock(h);
+ sprintf(p, " biBitCount=%d biCompression=%d biClrUsed=%d",
+ lpBI->bmiHeader.biBitCount, (int)lpBI->bmiHeader.biCompression, (int)lpBI->bmiHeader.biClrUsed);
}
CloseClipboard();
#endif
- Fl_Shared_Image *oldim = (Fl_Shared_Image*)image_box->image();
- if (oldim) oldim->release();
- float scale = fl_graphics_driver->scale();
- Fl_Shared_Image *shared = Fl_Shared_Image::get(im);
- int width = fl_min(image_box->w(), im->w()/scale);
- int height = fl_min(image_box->h(), im->h()/scale);
- shared->scale(width, height);
- image_box->image(shared); // show the scaled image
+ Fl_Image *oldimg = image_box->image();
+ delete oldimg;
+ 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());
window()->redraw();