Accept empty Fl_Pixmap in Fl_RGB_Image c'tor (STR #3348).

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@12074 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 7 insertions, 3 deletions

diff --git a/src/Fl_Image.cxx b/src/Fl_Image.cxx
index 7c3233c89..817613c87 100644
--- a/src/Fl_Image.cxx
+++ b/src/Fl_Image.cxx
@@ -290,12 +290,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);
 }