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

Eliminate compiler warnings on Solaris...

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4282 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2005-04-14 12:29:51 +00:00
parent 8dda432b40
commit 217f77c9ef
5 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fluid/Fl_Function_Type.cxx
View File

@ -681,7 +681,7 @@ void Fl_Comment_Type::read_property(const char *c) {
#include "comments.h" #include "comments.h"
static void load_comments_preset(Fl_Preferences &menu) { static void load_comments_preset(Fl_Preferences &menu) {
static char *predefined_comment[] = { static const char * const predefined_comment[] = {
"GNU Public License/GPL Header", "GNU Public License/GPL Footer", "GNU Public License/GPL Header", "GNU Public License/GPL Footer",
"GNU Public License/LGPL Header", "GNU Public License/LGPL Footer", "GNU Public License/LGPL Header", "GNU Public License/LGPL Footer",
"FLTK/Header", "FLTK/Footer" }; "FLTK/Header", "FLTK/Footer" };

8
src/Fl_BMP_Image.cxx
View File

@ -82,7 +82,7 @@ Fl_BMP_Image::Fl_BMP_Image(const char *bmp) // I - File to read
byte; // Byte in image byte; // Byte in image
uchar *ptr; // Pointer into pixels uchar *ptr; // Pointer into pixels
uchar colormap[256][3];// Colormap uchar colormap[256][3];// Colormap
uchar mask = 0; // single bit mask follows image data uchar havemask = 0; // single bit mask follows image data
// Open the file... // Open the file...
if ((fp = fopen(bmp, "rb")) == NULL) return; if ((fp = fopen(bmp, "rb")) == NULL) return;
@ -134,7 +134,7 @@ Fl_BMP_Image::Fl_BMP_Image(const char *bmp) // I - File to read
int Bpp = depth/8; int Bpp = depth/8;
int maskSize = (((w()*Bpp+3)&~3)*h()) + (((((w()+7)/8)+3)&~3)*h()); int maskSize = (((w()*Bpp+3)&~3)*h()) + (((((w()+7)/8)+3)&~3)*h());
if (maskSize==2*dataSize) { if (maskSize==2*dataSize) {
mask = 1; havemask = 1;
h(h()/2); h(h()/2);
bDepth = 4; bDepth = 4;
} }
@ -329,7 +329,7 @@ Fl_BMP_Image::Fl_BMP_Image(const char *bmp) // I - File to read
*ptr++ = colormap[temp][2]; *ptr++ = colormap[temp][2];
*ptr++ = colormap[temp][1]; *ptr++ = colormap[temp][1];
*ptr++ = colormap[temp][0]; *ptr++ = colormap[temp][0];
if (mask) ptr++; if (havemask) ptr++;
} }
if (!compression) { if (!compression) {
@ -375,7 +375,7 @@ Fl_BMP_Image::Fl_BMP_Image(const char *bmp) // I - File to read
} }
} }
if (mask) { if (havemask) {
for (y = h() - 1; y >= 0; y --) { for (y = h() - 1; y >= 0; y --) {
ptr = (uchar *)array + y * w() * d() + 3; ptr = (uchar *)array + y * w() * d() + 3;
for (x = w(), bit = 128; x > 0; x --, ptr+=bDepth) { for (x = w(), bit = 128; x > 0; x --, ptr+=bDepth) {

18
src/Fl_JPEG_Image.cxx
View File

@ -73,15 +73,17 @@ struct fl_jpeg_error_mgr {
// //
#ifdef HAVE_LIBJPEG #ifdef HAVE_LIBJPEG
static void extern "C" {
fl_jpeg_error_handler(j_common_ptr dinfo) { // I - Decompressor info static void
longjmp(((fl_jpeg_error_mgr *)(dinfo->err))->errhand_, 1); fl_jpeg_error_handler(j_common_ptr dinfo) { // I - Decompressor info
return; longjmp(((fl_jpeg_error_mgr *)(dinfo->err))->errhand_, 1);
} return;
}
static void static void
fl_jpeg_output_handler(j_common_ptr dinfo) { // I - Decompressor info fl_jpeg_output_handler(j_common_ptr dinfo) { // I - Decompressor info
return; return;
}
} }
#endif // HAVE_LIBJPEG #endif // HAVE_LIBJPEG

2
src/Fl_PNM_Image.cxx
View File

@ -83,7 +83,7 @@ Fl_PNM_Image::Fl_PNM_Image(const char *name) // I - File to read
format = atoi(lineptr); format = atoi(lineptr);
while (isdigit(*lineptr)) lineptr ++; while (isdigit(*lineptr)) lineptr ++;
if (format == 7) lineptr = ""; if (format == 7) lineptr = (char *)"";
while (lineptr != NULL && w() == 0) { while (lineptr != NULL && w() == 0) {
if (*lineptr == '\0' || *lineptr == '#') { if (*lineptr == '\0' || *lineptr == '#') {

11
test/editor.cxx
View File

@ -150,13 +150,14 @@ const char *code_types[] = { // List of known C/C++ types...
// 'compare_keywords()' - Compare two keywords... // 'compare_keywords()' - Compare two keywords...
// //
int extern "C" {
compare_keywords(const void *a, int
const void *b) { compare_keywords(const void *a,
return (strcmp(*((const char **)a), *((const char **)b))); const void *b) {
return (strcmp(*((const char **)a), *((const char **)b)));
}
} }
// //
// 'style_parse()' - Parse text and produce style data. // 'style_parse()' - Parse text and produce style data.
// //