diff options
| author | Bill Spitzak <spitzak@gmail.com> | 2000-06-29 07:23:56 +0000 |
|---|---|---|
| committer | Bill Spitzak <spitzak@gmail.com> | 2000-06-29 07:23:56 +0000 |
| commit | e2e44bfcd5a04334e71114e124ddd90dd28cecb5 (patch) | |
| tree | 09a234f7452242ef2c1630c078106ca46f0be84e /fluid | |
| parent | 753c53cc7562ae97317f35fa659b5b1bc3827278 (diff) | |
Fixed .gif files in fluid, they were broken by the fix for large .xpm
files in version 1.0.9.
Fix for OpenGL hardware overlays with the transparent index != 0.
Tested on the brand new HP Linux Workstations, this is the only bug
encountered. Both X and OpenGL hardware overlay works perfectly on
these, though configue may not enable it by default...)
Fl_Choice and all other Fl_Menu_ subclasses draw the items using
textcolor() as the default color of the text.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1244 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/Fluid_Image.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fluid/Fluid_Image.cxx b/fluid/Fluid_Image.cxx index 4efaf3800..6f28b8d9b 100644 --- a/fluid/Fluid_Image.cxx +++ b/fluid/Fluid_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fluid_Image.cxx,v 1.7.2.4 2000/06/16 07:08:15 bill Exp $" +// "$Id: Fluid_Image.cxx,v 1.7.2.5 2000/06/29 07:23:56 spitzak Exp $" // // Pixmap label support for the Fast Light Tool Kit (FLTK). // @@ -74,7 +74,7 @@ void pixmap_image::write_static() { write_c("static char *%s[] = {\n", unique_id(this, "image", filename_name(name()), 0)); int l; - for (l = 0; l < numlines; l++) { + for (l = 0; l < numlines && p->data[l]; l++) { if (l) write_c(",\n"); write_cstring(p->data[l],linelength[l]); } @@ -101,7 +101,7 @@ static int hexdigit(int x) { #define INITIALLINES 1024 pixmap_image::pixmap_image(const char *name, FILE *f) : Fluid_Image(name) { - if (!f) return; // for subclasses + if (!f) {numlines = 0x7ffffff; return;} // for subclasses // read all the c-strings out of the file: char* local_data[INITIALLINES]; char** data = local_data; @@ -437,5 +437,5 @@ Fluid_Image *ui_find_image(const char *oldname) { } // -// End of "$Id: Fluid_Image.cxx,v 1.7.2.4 2000/06/16 07:08:15 bill Exp $". +// End of "$Id: Fluid_Image.cxx,v 1.7.2.5 2000/06/29 07:23:56 spitzak Exp $". // |