diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-11-23 12:06:36 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-11-23 12:06:36 +0000 |
| commit | 4087b8cd9a139664420468c57489cae73c8b830a (patch) | |
| tree | e760b9aed14a687ec0e1217676adf43cfe16d889 /src/Fl_Pixmap.cxx | |
| parent | f5258404959cff3a299c796676b553b843a94355 (diff) | |
Add code for PNG and JPEG images.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1713 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Pixmap.cxx')
| -rw-r--r-- | src/Fl_Pixmap.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/Fl_Pixmap.cxx b/src/Fl_Pixmap.cxx index 743e2f1fa..0c6b5b74a 100644 --- a/src/Fl_Pixmap.cxx +++ b/src/Fl_Pixmap.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.7 2001/11/22 15:35:01 easysw Exp $" +// "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.8 2001/11/23 12:06:36 easysw Exp $" // // Pixmap drawing code for the Fast Light Tool Kit (FLTK). // @@ -56,13 +56,19 @@ void Fl_Pixmap::measure() { void Fl_Pixmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) { // ignore empty or bad pixmap data: - if (!data()) return; + if (!data()) { + draw_empty(XP, YP); + return; + } if (w()<0) measure(); if (WP==-1) { WP = w(); HP = h(); } - if (!w()) return; + if (!w()) { + draw_empty(XP, YP); + return; + } // account for current clip region (faster on Irix): int X,Y,W,H; fl_clip_box(XP,YP,WP,HP,X,Y,W,H); cx += X-XP; cy += Y-YP; @@ -461,5 +467,5 @@ void Fl_Pixmap::desaturate() { } // -// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.7 2001/11/22 15:35:01 easysw Exp $". +// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.8 2001/11/23 12:06:36 easysw Exp $". // |