diff --git a/CHANGES b/CHANGES index 74e4ff422..487ced324 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,7 @@ CHANGES IN FLTK 1.3.4rc4 RELEASED: Nov ?? 2016 Bug fixes and other improvements - MacOS: fix a crash when closing a fullscreen window. + - Accept empty Fl_Pixmap in Fl_RGB_Image c'tor (STR #3348). CHANGES IN FLTK 1.3.4rc3 RELEASED: Oct 31 2016 diff --git a/src/Fl_Image.cxx b/src/Fl_Image.cxx index 72c8506ce..ad65bedaf 100644 --- a/src/Fl_Image.cxx +++ b/src/Fl_Image.cxx @@ -294,12 +294,16 @@ Fl_RGB_Image::Fl_RGB_Image(const uchar *bits, int W, int H, int D, int LD) : */ Fl_RGB_Image::Fl_RGB_Image(const Fl_Pixmap *pxm, Fl_Color bg): Fl_Image(pxm->w(), pxm->h(), 4), + array(0), + alloc_array(0), id_(0), mask_(0) { - array = new uchar[w() * h() * d()]; - alloc_array = 1; - fl_convert_pixmap(pxm->data(), (uchar*)array, bg); + if (pxm && pxm->w() > 0 && pxm->h() > 0) { + array = new uchar[w() * h() * d()]; + alloc_array = 1; + fl_convert_pixmap(pxm->data(), (uchar*)array, bg); + } data((const char **)&array, 1); }