From 5bf4f809201d33ec06b76476904166c250ba596e Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 2 Jul 2013 09:12:36 -0700 Subject: [PATCH] Slightly simplify spectrum image generation in the colorpicker --- aegisub/src/dialog_colorpicker.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/aegisub/src/dialog_colorpicker.cpp b/aegisub/src/dialog_colorpicker.cpp index 1b56d235d..e5674f6fe 100644 --- a/aegisub/src/dialog_colorpicker.cpp +++ b/aegisub/src/dialog_colorpicker.cpp @@ -918,12 +918,8 @@ void DialogColorPicker::UpdateSpectrumDisplay() { template static wxBitmap *make_spectrum(wxBitmap *bitmap, Func func) { - unsigned char *spec = (unsigned char *)malloc(256*256*3); - if (!spec) throw std::bad_alloc(); - - func(spec); - - wxImage spectrum_image(256, 256, spec); + wxImage spectrum_image(256, 256); + func(spectrum_image.GetData()); *bitmap = wxBitmap(spectrum_image); return bitmap; }