mirror of
https://github.com/fltk/fltk.git
synced 2026-05-31 22:04:26 +08:00
Fix for issue #429 : Segfault with Ctrl+/- with current git version
This commit is contained in:
+2
-2
@@ -50,8 +50,8 @@ public:
|
||||
Fl_Bitmap(const char *bits, int W, int H) :
|
||||
Fl_Image(W,H,0), array((const uchar *)bits), alloc_array(0), id_(0), cache_w_(0),cache_h_(0) {data((const char **)&array, 1);}
|
||||
virtual ~Fl_Bitmap();
|
||||
virtual Fl_Image *copy(int W, int H);
|
||||
Fl_Image *copy() { return Fl_Image::copy(); }
|
||||
virtual Fl_Image *copy(int W, int H) const;
|
||||
Fl_Image *copy() const { return Fl_Image::copy(); }
|
||||
virtual void draw(int X, int Y, int W, int H, int cx=0, int cy=0);
|
||||
void draw(int X, int Y) {draw(X, Y, w(), h(), 0, 0);}
|
||||
virtual void label(Fl_Widget*w);
|
||||
|
||||
+2
-2
@@ -63,8 +63,8 @@ public:
|
||||
/** The constructors create a new pixmap from the specified XPM data. */
|
||||
explicit Fl_Pixmap(const uchar* const * D) : Fl_Image(-1,0,1), alloc_data(0), id_(0), mask_(0) {set_data((const char*const*)D); measure();}
|
||||
virtual ~Fl_Pixmap();
|
||||
virtual Fl_Image *copy(int W, int H);
|
||||
Fl_Image *copy() { return Fl_Image::copy(); }
|
||||
virtual Fl_Image *copy(int W, int H) const;
|
||||
Fl_Image *copy() const { return Fl_Image::copy(); }
|
||||
virtual void color_average(Fl_Color c, float i);
|
||||
virtual void desaturate();
|
||||
virtual void draw(int X, int Y, int W, int H, int cx=0, int cy=0);
|
||||
|
||||
Reference in New Issue
Block a user