Author: manolo
Date: 2012-06-10 15:26:11 -0700 (Sun, 10 Jun 2012)
New Revision: 9586
Log:
Fix STR#2850: recursion in test1/image FLTK1 compatibility demo
Modified:
branches/branch-3.0/include/FL/Fl_Image.H
Modified: branches/branch-3.0/include/FL/Fl_Image.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Image.H 2012-06-10 14:51:00 UTC (rev
9585)
+++ branches/branch-3.0/include/FL/Fl_Image.H 2012-06-10 22:26:11 UTC (rev
9586)
@@ -146,7 +146,8 @@
Fl_Image *copy() {
// FIXME: 123-1
- return new Fl_Image( ((fltk3::Image*)_p)->copy() );
+ // return new Fl_Image( ((fltk3::Image*)_p)->copy() );
+ return copy(w(), h());
}
void inactive() {
@@ -179,11 +180,13 @@
}
Fl_Image *copy() {
- return new Fl_RGB_Image( ((fltk3::RGBImage*)_p)->copy() );
+ //return new Fl_RGB_Image( ((fltk3::RGBImage*)_p)->copy() );
+ return Fl_Image::copy();
}
Fl_Image *copy(int w, int h) {
- return new Fl_RGB_Image( ((fltk3::RGBImage*)_p)->copy(w, h) );
+ //return new Fl_RGB_Image( ((fltk3::RGBImage*)_p)->copy(w, h) );
+ return Fl_Image::copy(w, h);
}
void draw(int X, int Y) {
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
