mirror of
https://github.com/fltk/fltk.git
synced 2026-05-30 21:25:30 +08:00
Fix Doxygen description of the constructors.
This commit is contained in:
+1
-1
@@ -32,7 +32,7 @@ class FL_EXPORT Fl_BMP_Image : public Fl_RGB_Image {
|
|||||||
public:
|
public:
|
||||||
|
|
||||||
Fl_BMP_Image(const char* filename);
|
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:
|
protected:
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -33,7 +33,7 @@ class FL_EXPORT Fl_GIF_Image : public Fl_Pixmap {
|
|||||||
public:
|
public:
|
||||||
|
|
||||||
Fl_GIF_Image(const char* filename);
|
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:
|
protected:
|
||||||
|
|
||||||
|
|||||||
@@ -160,11 +160,11 @@ private:
|
|||||||
BMP format could not be decoded, and ERR_NO_IMAGE if the image could not
|
BMP format could not be decoded, and ERR_NO_IMAGE if the image could not
|
||||||
be loaded for another reason.
|
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)
|
: Fl_RGB_Image(0,0,0)
|
||||||
{
|
{
|
||||||
BMPReader f;
|
BMPReader f;
|
||||||
if (f.open(bmp)==-1) {
|
if (f.open(filename)==-1) {
|
||||||
ld(ERR_FORMAT);
|
ld(ERR_FORMAT);
|
||||||
} else {
|
} else {
|
||||||
read(f);
|
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.
|
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
|
\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)
|
: Fl_RGB_Image(0,0,0)
|
||||||
{
|
{
|
||||||
BMPReader d;
|
BMPReader d;
|
||||||
if (d.open(bmp, data)==-1) {
|
if (d.open(imagename, data)==-1) {
|
||||||
ld(ERR_FORMAT);
|
ld(ERR_FORMAT);
|
||||||
} else {
|
} else {
|
||||||
read(d);
|
read(d);
|
||||||
|
|||||||
@@ -163,12 +163,12 @@ private:
|
|||||||
GIF format could not be decoded, and ERR_NO_IMAGE if the image could not
|
GIF format could not be decoded, and ERR_NO_IMAGE if the image could not
|
||||||
be loaded for another reason.
|
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)
|
Fl_Pixmap((char *const*)0)
|
||||||
{
|
{
|
||||||
GIFReader f;
|
GIFReader f;
|
||||||
if (f.open(infname)==-1) {
|
if (f.open(filename)==-1) {
|
||||||
Fl::error("Fl_GIF_Image: Unable to open %s!", infname);
|
Fl::error("Fl_GIF_Image: Unable to open %s!", filename);
|
||||||
ld(ERR_FILE_ACCESS);
|
ld(ERR_FILE_ACCESS);
|
||||||
} else {
|
} else {
|
||||||
read(f);
|
read(f);
|
||||||
@@ -179,16 +179,16 @@ Fl_GIF_Image::Fl_GIF_Image(const char *infname) :
|
|||||||
/**
|
/**
|
||||||
The constructor loads the named GIF image.
|
The constructor loads the named GIF image.
|
||||||
|
|
||||||
\param[in] bmp the name of the bitmap
|
\param[in] imagename the name of the GIF image
|
||||||
\param[in] data a pointer to the BMP data in memory. There is no checking for buffer overruns
|
\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)
|
Fl_Pixmap((char *const*)0)
|
||||||
{
|
{
|
||||||
GIFReader d;
|
GIFReader d;
|
||||||
if (d.open(gif, data)==-1) {
|
if (d.open(imagename, data)==-1) {
|
||||||
ld(ERR_FORMAT);
|
ld(ERR_FORMAT);
|
||||||
} else {
|
} else {
|
||||||
read(d);
|
read(d);
|
||||||
|
|||||||
Reference in New Issue
Block a user