diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2010-10-28 21:47:01 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2010-10-28 21:47:01 +0000 |
| commit | 8f79d200a0c20c1840f8f8fa9862c4f84ce72135 (patch) | |
| tree | 7695dc20692a91694f00424da1c5a8caad792e2d /src | |
| parent | 1b6dae10bff9e86977f7293e14d48fb8b619a1c9 (diff) | |
Fixed the remaining warnings
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7767 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_BMP_Image.cxx | 2 | ||||
| -rw-r--r-- | src/Fl_PNM_Image.cxx | 2 | ||||
| -rw-r--r-- | src/forms_compatability.cxx | 2 | ||||
| -rw-r--r-- | src/gl_draw.cxx | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/Fl_BMP_Image.cxx b/src/Fl_BMP_Image.cxx index 8587790bc..2b8693264 100644 --- a/src/Fl_BMP_Image.cxx +++ b/src/Fl_BMP_Image.cxx @@ -177,7 +177,7 @@ Fl_BMP_Image::Fl_BMP_Image(const char *bmp) // I - File to read for (repcount = 0; repcount < colors_used; repcount ++) { // Read BGR color... - fread(colormap[repcount], 1, 3, fp); + if (fread(colormap[repcount], 1, 3, fp)==0) { /* ignore */ } // Skip pad byte for new BMP files... if (info_size > 12) getc(fp); diff --git a/src/Fl_PNM_Image.cxx b/src/Fl_PNM_Image.cxx index 5ffbdb73c..4ede73f07 100644 --- a/src/Fl_PNM_Image.cxx +++ b/src/Fl_PNM_Image.cxx @@ -166,7 +166,7 @@ Fl_PNM_Image::Fl_PNM_Image(const char *name) // I - File to read case 5 : case 6 : if (maxval < 256) { - fread(ptr, w(), d(), fp); + if (fread(ptr, w(), d(), fp)) { /* ignored */ } } else { for (x = d() * w(); x > 0; x --) { val = (uchar)getc(fp); diff --git a/src/forms_compatability.cxx b/src/forms_compatability.cxx index 32219b48a..59f4a2ebd 100644 --- a/src/forms_compatability.cxx +++ b/src/forms_compatability.cxx @@ -204,7 +204,7 @@ int fl_show_choice( } char *fl_show_simple_input(const char *str1, const char *defstr) { - const char *r = fl_input(str1, defstr); + const char *r = fl_input("%s", defstr, str1); return (char *)(r ? r : defstr); } diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx index 1ef3c53ba..56ca2bf6e 100644 --- a/src/gl_draw.cxx +++ b/src/gl_draw.cxx @@ -84,8 +84,8 @@ void gl_font(int fontid, int size) { #else // Fltk-1.1.8 style GL font selection #if defined (USE_X11) // X-windows options follow, either XFT or "plain" X -# warning Ideally, for XFT, we really need a glXUseXftFont implementation here... -# warning GL font selection is basically wrong here +// FIXME: warning Ideally, for XFT, we really need a glXUseXftFont implementation here... +// FIXME: warning GL font selection is basically wrong here /* OksiD had a fairly sophisticated scheme for storing multiple X fonts in a XUtf8FontStruct, * then sorting through them at draw time (for normal X rendering) to find which one can * render the current glyph... But for now, just use the first font in the list for GL... |