diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_BMP_Image.cxx | 12 | ||||
| -rw-r--r-- | src/Fl_GIF_Image.cxx | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/Fl_BMP_Image.cxx b/src/Fl_BMP_Image.cxx index b910d91cc..11d4890f1 100644 --- a/src/Fl_BMP_Image.cxx +++ b/src/Fl_BMP_Image.cxx @@ -160,11 +160,11 @@ private: BMP format could not be decoded, and ERR_NO_IMAGE if the image could not be loaded for another reason. */ -Fl_BMP_Image::Fl_BMP_Image(const char *bmp) // I - File to read +Fl_BMP_Image::Fl_BMP_Image(const char *filename) // I - File to read : Fl_RGB_Image(0,0,0) { BMPReader f; - if (f.open(bmp)==-1) { + if (f.open(filename)==-1) { ld(ERR_FORMAT); } else { read(f); @@ -174,16 +174,16 @@ Fl_BMP_Image::Fl_BMP_Image(const char *bmp) // I - File to read /** The constructor loads the named BMP image from the given memory address. - \param[in] bmp the name of the bitmap + \param[in] imagename the name of the bitmap \param[in] data a pointer to the BMP data in memory. There is no checking for buffer overruns - \see Fl_BMP_Image::Fl_BMP_Image(const char *bmp) + \see Fl_BMP_Image::Fl_BMP_Image(const char *filename) */ -Fl_BMP_Image::Fl_BMP_Image(const char *bmp, const unsigned char *data) +Fl_BMP_Image::Fl_BMP_Image(const char *imagename, const unsigned char *data) : Fl_RGB_Image(0,0,0) { BMPReader d; - if (d.open(bmp, data)==-1) { + if (d.open(imagename, data)==-1) { ld(ERR_FORMAT); } else { read(d); diff --git a/src/Fl_GIF_Image.cxx b/src/Fl_GIF_Image.cxx index aba6cf01a..91b8c13a5 100644 --- a/src/Fl_GIF_Image.cxx +++ b/src/Fl_GIF_Image.cxx @@ -163,12 +163,12 @@ private: GIF format could not be decoded, and ERR_NO_IMAGE if the image could not be loaded for another reason. */ -Fl_GIF_Image::Fl_GIF_Image(const char *infname) : +Fl_GIF_Image::Fl_GIF_Image(const char *filename) : Fl_Pixmap((char *const*)0) { GIFReader f; - if (f.open(infname)==-1) { - Fl::error("Fl_GIF_Image: Unable to open %s!", infname); + if (f.open(filename)==-1) { + Fl::error("Fl_GIF_Image: Unable to open %s!", filename); ld(ERR_FILE_ACCESS); } else { read(f); @@ -179,16 +179,16 @@ Fl_GIF_Image::Fl_GIF_Image(const char *infname) : /** The constructor loads the named GIF image. - \param[in] bmp the name of the bitmap - \param[in] data a pointer to the BMP data in memory. There is no checking for buffer overruns + \param[in] imagename the name of the GIF image + \param[in] data a pointer to the GIF data in memory. There is no checking for buffer overruns - \see Fl_BMP_Image::Fl_BMP_Image(const char *bmp) + \see Fl_GIF_Image::Fl_GIF_Image(const char *filename) */ -Fl_GIF_Image::Fl_GIF_Image(const char *gif, const unsigned char *data) : +Fl_GIF_Image::Fl_GIF_Image(const char *imagename, const unsigned char *data) : Fl_Pixmap((char *const*)0) { GIFReader d; - if (d.open(gif, data)==-1) { + if (d.open(imagename, data)==-1) { ld(ERR_FORMAT); } else { read(d); |