Author: manolo
Date: 2012-05-01 07:52:38 -0700 (Tue, 01 May 2012)
New Revision: 9422
Log:
Fix STR#2831: regression in fltk3::Pixmap drawing under X11.
Modified:
branches/branch-3.0/include/fltk3/Pixmap.h
branches/branch-3.0/src/fltk3/Pixmap.cxx
Modified: branches/branch-3.0/include/fltk3/Pixmap.h
===================================================================
--- branches/branch-3.0/include/fltk3/Pixmap.h 2012-05-01 14:33:30 UTC (rev
9421)
+++ branches/branch-3.0/include/fltk3/Pixmap.h 2012-05-01 14:52:38 UTC (rev
9422)
@@ -66,7 +66,7 @@
void copy_data();
void delete_data();
void set_data(const char * const *p);
- int prepare(int XP, int YP, int WP, int HP, int cx, int cy,
+ int prepare(int XP, int YP, int WP, int HP, int &cx, int &cy,
int &X, int &Y, int &W, int &H);
protected:
Modified: branches/branch-3.0/src/fltk3/Pixmap.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Pixmap.cxx 2012-05-01 14:33:30 UTC (rev
9421)
+++ branches/branch-3.0/src/fltk3/Pixmap.cxx 2012-05-01 14:52:38 UTC (rev
9422)
@@ -105,7 +105,7 @@
return 0;
}
-int fltk3::Pixmap::prepare(int XP, int YP, int WP, int HP, int cx, int cy,
+int fltk3::Pixmap::prepare(int XP, int YP, int WP, int HP, int &cx, int &cy,
int &X, int &Y, int &W, int &H) {
if (w() < 0) measure();
int code = start(this, XP, YP, WP, HP, w(), h(), cx, cy, X, Y, W, H);
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
