diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-06-10 17:21:53 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-06-10 17:21:53 +0000 |
| commit | 10c613f88a72dcc5c38d497a75405b12bd0bfbd5 (patch) | |
| tree | 376c2508308463610893871103e133c9bdb20e23 /src | |
| parent | c3cde61e9879825c1547e366e2b9becedc1179e7 (diff) | |
Take care of some compiler warnings.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2303 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_BMP_Image.cxx | 8 | ||||
| -rw-r--r-- | src/Fl_Help_View.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/Fl_BMP_Image.cxx b/src/Fl_BMP_Image.cxx index dbc6841f0..16c392849 100644 --- a/src/Fl_BMP_Image.cxx +++ b/src/Fl_BMP_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_BMP_Image.cxx,v 1.1.2.4 2002/05/25 02:56:59 easysw Exp $" +// "$Id: Fl_BMP_Image.cxx,v 1.1.2.5 2002/06/10 17:21:49 easysw Exp $" // // Fl_BMP_Image routines. // @@ -75,7 +75,7 @@ Fl_BMP_Image::Fl_BMP_Image(const char *bmp) // I - File to read count, // Number of times to repeat temp, // Temporary color align; // Alignment bytes - unsigned long offbits; // Offset to image data + long offbits; // Offset to image data uchar bit, // Bit in image byte; // Byte in image uchar *ptr; // Pointer into pixels @@ -90,7 +90,7 @@ Fl_BMP_Image::Fl_BMP_Image(const char *bmp) // I - File to read read_dword(fp); // Skip size read_word(fp); // Skip reserved stuff read_word(fp); - offbits = read_dword(fp); // Read offset to image data + offbits = (long)read_dword(fp);// Read offset to image data // Then the bitmap information... info_size = read_dword(fp); @@ -371,5 +371,5 @@ read_long(FILE *fp) { // I - File to read from // -// End of "$Id: Fl_BMP_Image.cxx,v 1.1.2.4 2002/05/25 02:56:59 easysw Exp $". +// End of "$Id: Fl_BMP_Image.cxx,v 1.1.2.5 2002/06/10 17:21:49 easysw Exp $". // diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx index 868bb05ec..34955de89 100644 --- a/src/Fl_Help_View.cxx +++ b/src/Fl_Help_View.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Help_View.cxx,v 1.1.2.35 2002/06/06 13:40:49 easysw Exp $" +// "$Id: Fl_Help_View.cxx,v 1.1.2.36 2002/06/10 17:21:53 easysw Exp $" // // Fl_Help_View widget routines. // @@ -788,7 +788,7 @@ Fl_Help_View::format() int column, // Current table column number columns[MAX_COLUMNS]; // Column widths - Fl_Color tc, rc, c; // Table/row/cell background color + Fl_Color tc, rc; // Table/row background color // Reset document width... @@ -807,7 +807,7 @@ Fl_Help_View::format() textcolor_ = textcolor(); linkcolor_ = selection_color(); - tc = rc = c = bgcolor_; + tc = rc = bgcolor_; strcpy(title_, "Untitled"); @@ -2638,5 +2638,5 @@ hscrollbar_callback(Fl_Widget *s, void *) // -// End of "$Id: Fl_Help_View.cxx,v 1.1.2.35 2002/06/06 13:40:49 easysw Exp $". +// End of "$Id: Fl_Help_View.cxx,v 1.1.2.36 2002/06/10 17:21:53 easysw Exp $". // |