summaryrefslogtreecommitdiff
path: root/src/Fl_Paged_Device.cxx
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2011-01-31 17:17:54 +0000
committerManolo Gouy <Manolo>2011-01-31 17:17:54 +0000
commitb42f5ebdbfbb22f12920943c96646a197de403f7 (patch)
tree59a8f70303f5dd1f2f4cb1c35b178a5e3e95f70c /src/Fl_Paged_Device.cxx
parent535f0c2d3b17b20723bd5520d91531eda62e5ffe (diff)
Fl_Paged_Device::print_window_part() doesn't need special WIN32 processing any more.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8343 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Paged_Device.cxx')
-rw-r--r--src/Fl_Paged_Device.cxx26
1 files changed, 6 insertions, 20 deletions
diff --git a/src/Fl_Paged_Device.cxx b/src/Fl_Paged_Device.cxx
index ba3014456..239f8b83a 100644
--- a/src/Fl_Paged_Device.cxx
+++ b/src/Fl_Paged_Device.cxx
@@ -129,7 +129,6 @@ void Fl_Paged_Device::origin(int *x, int *y)
*/
void Fl_Paged_Device::print_window_part(Fl_Window *win, int x, int y, int w, int h, int delta_x, int delta_y)
{
- int slice, width, offset, count = 0;
Fl_Surface_Device *current = Fl_Surface_Device::surface();
Fl_Display_Device::display_device()->set_current();
Fl_Window *save_front = Fl::first_window();
@@ -137,32 +136,19 @@ void Fl_Paged_Device::print_window_part(Fl_Window *win, int x, int y, int w, int
fl_gc = NULL;
Fl::check();
win->make_current();
- uchar *image_data[20];
-#ifdef WIN32 // because of bug in StretchDIBits, vertically cut image in pieces of width slice
- slice = 500;
-#else
- slice = w;
-#endif
- for ( offset = 0; offset < w; offset += slice) {
- width = slice;
- if (offset + width > w) width = w - offset;
- image_data[count++] = fl_read_image(NULL, x + offset, y, width, h);
- }
+ uchar *image_data;
+ image_data = fl_read_image(NULL, x, y, w, h);
save_front->show();
current->set_current();
- offset = 0;
- for ( int i = 0; i < count; i++, offset += slice) {
- width = slice;
- if (offset + width > w) width = w - offset;
- fl_draw_image(image_data[i], delta_x + offset, delta_y, width, h, 3);
+ fl_draw_image(image_data, delta_x, delta_y, w, h, 3);
#ifdef __APPLE__
- add_image(image_data[i]);
+ add_image(image_data);
#else
- delete image_data[i];
+ delete image_data;
#endif
- }
}
+
#ifdef __APPLE__
void Fl_Paged_Device::add_image(const uchar *data)
{