From bd1446a6eb5b845179bb850c0f371a323141e8b0 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Thu, 6 Nov 2014 16:48:57 +0000 Subject: =?UTF-8?q?Fix=20for=20STR#3142=20where=20fl=5Fread=5Fimage()=20co?= =?UTF-8?q?rrectly=20reads=20GL=20data=20under=20X11,=20but=20ignores=20th?= =?UTF-8?q?em=20under=20MSWindows=20and=20Mac=20OS=20X.=20Moreover,=20fl?= =?UTF-8?q?=5Fread=5Fimage()=20behaves=20differently=20with=20and=20withou?= =?UTF-8?q?t=20OS=20virtualization=20for=20X11=20and=20MSWindows.=20The=20?= =?UTF-8?q?patched=20function=20reads=20whatever=20is=20in=20the=20rectang?= =?UTF-8?q?le=20transmitted=20in=20arguments,=20with=20and=20without=20GL?= =?UTF-8?q?=20data,=20with=20and=20without=20subwindows,=20on=20=E2=80=98t?= =?UTF-8?q?rue=E2=80=99=20OS=20or=20on=20virtualized=20OS.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10436 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Paged_Device.cxx | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/Fl_Paged_Device.cxx') diff --git a/src/Fl_Paged_Device.cxx b/src/Fl_Paged_Device.cxx index fcc18eab2..7f4d9d1a6 100644 --- a/src/Fl_Paged_Device.cxx +++ b/src/Fl_Paged_Device.cxx @@ -3,7 +3,7 @@ // // implementation of Fl_Paged_Device class for the Fast Light Tool Kit (FLTK). // -// Copyright 2010-2011 by Bill Spitzak and others. +// Copyright 2010-2014 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -63,12 +63,7 @@ void Fl_Paged_Device::print_widget(Fl_Widget* widget, int delta_x, int delta_y) Fl_Plugin_Manager pm("fltk:device"); Fl_Device_Plugin *pi = (Fl_Device_Plugin*)pm.plugin("opengl.device.fltk.org"); if (pi) { - int height = 0; -#ifdef __APPLE__ - int width; - this->printable_rect(&width, &height); -#endif - drawn_by_plugin = pi->print(widget, 0, 0, height); + drawn_by_plugin = pi->print(widget, 0, 0, 0); } } if (!drawn_by_plugin) { -- cgit v1.2.3