mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make image data 'const' for all image types in fluid.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10358 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser 2014-10-05 11:56:06 +00:00
parent 386c2413f8
commit 02b1646d0e
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fluid/Fluid_Image.cxx
View File

@ -84,7 +84,7 @@ void Fluid_Image::write_static() {
write_c("#include <FL/Fl_Bitmap.H>\n");
bitmap_header_written = write_number;
}
write_c("static unsigned char %s[] =\n",
write_c("static const unsigned char %s[] =\n",
unique_id(this, "idata", fl_filename_name(name()), 0));
write_cdata(img->data()[0], ((img->w() + 7) / 8) * img->h());
write_c(";\n");
@ -99,9 +99,9 @@ void Fluid_Image::write_static() {
write_c("#include <FL/Fl_JPEG_Image.H>\n");
jpeg_header_written = write_number;
}
write_c("static unsigned char %s[] =\n",
write_c("static const unsigned char %s[] =\n",
unique_id(this, "idata", fl_filename_name(name()), 0));
FILE *f = fl_fopen(name(), "rb");
if (!f) {
// message = "Can't include binary file. Can't open";
@ -130,7 +130,7 @@ void Fluid_Image::write_static() {
write_c("#include <FL/Fl_Image.H>\n");
image_header_written = write_number;
}
write_c("static unsigned char %s[] =\n",
write_c("static const unsigned char %s[] =\n",
unique_id(this, "idata", fl_filename_name(name()), 0));
write_cdata(img->data()[0], (img->w() * img->d() + img->ld()) * img->h());
write_c(";\n");

1
src/Fl_File_Chooser.cxx
View File

@ -60,7 +60,6 @@ void Fl_File_Chooser::cb_newButton(Fl_Button* o, void* v) {
}
#include <FL/Fl_Bitmap.H>
// FIXME: fluid does NOT (yet?) generate 'const' image data !
static const unsigned char idata_new[] =
{0,0,120,0,132,0,2,1,1,254,1,128,49,128,49,128,253,128,253,128,49,128,49,
128,1,128,1,128,255,255,0,0};