summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2010-02-18 11:38:42 +0000
committerMatthias Melcher <fltk@matthiasm.com>2010-02-18 11:38:42 +0000
commit795b2c6356af2ef7e26c39faa309d566c4bf62f6 (patch)
treede516e395ea1cb66f4c204792d12666b52c801c7 /FL
parentb434df6061c5436685d2fd6f24e8ebeaf619311f (diff)
Added jpeg loading from memory. Added jpeg Fl_Widget->image() support for Fluid - but linking to fltk_images is required if this feature is used!
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7092 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
-rw-r--r--FL/Fl_JPEG_Image.H5
1 files changed, 3 insertions, 2 deletions
diff --git a/FL/Fl_JPEG_Image.H b/FL/Fl_JPEG_Image.H
index 3a34bcf75..40bf1b7f8 100644
--- a/FL/Fl_JPEG_Image.H
+++ b/FL/Fl_JPEG_Image.H
@@ -40,9 +40,10 @@
*/
class FL_EXPORT Fl_JPEG_Image : public Fl_RGB_Image {
- public:
+public:
- Fl_JPEG_Image(const char* filename);
+ Fl_JPEG_Image(const char *filename);
+ Fl_JPEG_Image(const char *name, const unsigned char *data);
};
#endif