diff options
| author | Matthias Melcher <git@matthiasm.com> | 2020-01-10 18:46:45 +0100 |
|---|---|---|
| committer | Matthias Melcher <git@matthiasm.com> | 2020-01-10 18:46:45 +0100 |
| commit | 7e0c82637d5cb2de0d7baa5a3c2ebe8491663b06 (patch) | |
| tree | 13471c7faf41ae4ae49f9f9f0ab69c2b1b4286f5 /FL | |
| parent | 82d279c2341c88da802b82e0d8732399d4f6b481 (diff) | |
Updated image readers.
Removed duplicate code from Fl_JPEG_Image, updated and unified Doxygen comments. Avoiding name conflict in new protected functions.
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_BMP_Image.H | 2 | ||||
| -rw-r--r-- | FL/Fl_GIF_Image.H | 2 | ||||
| -rw-r--r-- | FL/Fl_JPEG_Image.H | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/FL/Fl_BMP_Image.H b/FL/Fl_BMP_Image.H index b8dee36c0..aca8d1e2b 100644 --- a/FL/Fl_BMP_Image.H +++ b/FL/Fl_BMP_Image.H @@ -36,7 +36,7 @@ class FL_EXPORT Fl_BMP_Image : public Fl_RGB_Image { protected: - void read(class BMPReader &rdr); + void load_bmp_(class BMPReader &rdr); }; diff --git a/FL/Fl_GIF_Image.H b/FL/Fl_GIF_Image.H index 9d362c118..0f316eca9 100644 --- a/FL/Fl_GIF_Image.H +++ b/FL/Fl_GIF_Image.H @@ -37,7 +37,7 @@ public: protected: - void read(class GIFReader &rdr); + void load_gif_(class GIFReader &rdr); }; diff --git a/FL/Fl_JPEG_Image.H b/FL/Fl_JPEG_Image.H index d9b162c13..50553823c 100644 --- a/FL/Fl_JPEG_Image.H +++ b/FL/Fl_JPEG_Image.H @@ -35,6 +35,11 @@ public: Fl_JPEG_Image(const char *filename); Fl_JPEG_Image(const char *name, const unsigned char *data); + +protected: + + void load_jpg_(const char *filename, const char *sharename, const unsigned char *data); + }; #endif |