summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>2020-01-05 15:51:47 +0100
committerManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>2020-01-05 15:51:47 +0100
commitd2e207754449b2cd8aeb18bee0f6748579c7c8d9 (patch)
tree7b44bad93b8735fdd77f875756c68bbf9ccb3fac
parent97e30260ec3f7e0ca7de38617eb3766c3cbff9b5 (diff)
Fix Doxygen description of the constructors.
-rw-r--r--FL/Fl_BMP_Image.H2
-rw-r--r--FL/Fl_GIF_Image.H2
-rw-r--r--src/Fl_BMP_Image.cxx12
-rw-r--r--src/Fl_GIF_Image.cxx16
4 files changed, 16 insertions, 16 deletions
diff --git a/FL/Fl_BMP_Image.H b/FL/Fl_BMP_Image.H
index 93ac32610..b8dee36c0 100644
--- a/FL/Fl_BMP_Image.H
+++ b/FL/Fl_BMP_Image.H
@@ -32,7 +32,7 @@ class FL_EXPORT Fl_BMP_Image : public Fl_RGB_Image {
public:
Fl_BMP_Image(const char* filename);
- Fl_BMP_Image(const char* filename, const unsigned char *data);
+ Fl_BMP_Image(const char* imagename, const unsigned char *data);
protected:
diff --git a/FL/Fl_GIF_Image.H b/FL/Fl_GIF_Image.H
index 096104a09..9d362c118 100644
--- a/FL/Fl_GIF_Image.H
+++ b/FL/Fl_GIF_Image.H
@@ -33,7 +33,7 @@ class FL_EXPORT Fl_GIF_Image : public Fl_Pixmap {
public:
Fl_GIF_Image(const char* filename);
- Fl_GIF_Image(const char* filename, const unsigned char *data);
+ Fl_GIF_Image(const char* imagename, const unsigned char *data);
protected:
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);