Updated bundled fltk with latest set of patches for
following fltk str: 2660, 2636, 2599, 2641...
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4675 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/fltk/src/fl_draw_pixmap.cxx b/common/fltk/src/fl_draw_pixmap.cxx
index b024485..8296f67 100644
--- a/common/fltk/src/fl_draw_pixmap.cxx
+++ b/common/fltk/src/fl_draw_pixmap.cxx
@@ -128,7 +128,7 @@
if ((chars_per_pixel < 1) || (chars_per_pixel > 2))
return 0;
- uchar (*colors)[4] = new uchar [1<<(chars_per_pixel*8)][4];
+ uchar colors[1<<(chars_per_pixel*8)][4];
#ifdef WIN32
color_count = 0;
@@ -229,7 +229,6 @@
}
}
- delete [] colors;
return 1;
}
@@ -243,12 +242,10 @@
if (!fl_measure_pixmap(cdata, w, h))
return 0;
- uchar *buffer = new uchar[w*h*4];
+ uchar buffer[w*h*4];
- if (!fl_convert_pixmap(cdata, buffer, bg)) {
- delete buffer;
+ if (!fl_convert_pixmap(cdata, buffer, bg))
return 0;
- }
// FIXME: Hack until fl_draw_image() supports alpha properly
#ifdef __APPLE_QUARTZ__
@@ -295,7 +292,6 @@
}
#endif
- delete buffer;
return 1;
}