diff options
| author | Manolo Gouy <Manolo> | 2015-03-11 06:21:17 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2015-03-11 06:21:17 +0000 |
| commit | e69467bbc95e699a7e140d73b3f9b58f97f79eaa (patch) | |
| tree | 35aca3339bc4cb00824772c9998065e1dd83dbd4 /FL | |
| parent | dbde470f8d9803d6986ff57b7dfcb40d679508b7 (diff) | |
Implementation of Fl_Shared_Image::scale(width, height) for scaled image drawing - cont'd
Shorter implementation based on Fl_Graphics_Driver::draw_scaled(Fl_Image *,...).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10616 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Device.H | 12 | ||||
| -rw-r--r-- | FL/Fl_PostScript.H | 3 |
2 files changed, 4 insertions, 11 deletions
diff --git a/FL/Fl_Device.H b/FL/Fl_Device.H index 3d86518f3..4d048d179 100644 --- a/FL/Fl_Device.H +++ b/FL/Fl_Device.H @@ -405,11 +405,7 @@ public: #if FLTK_ABI_VERSION >= 10304 || defined(FL_DOXYGEN) virtual #endif - int draw_scaled(Fl_RGB_Image *img, int X, int Y, int W, int H); -#if FLTK_ABI_VERSION >= 10304 || defined(FL_DOXYGEN) - virtual -#endif - int draw_scaled(Fl_Pixmap *img, int X, int Y, int W, int H); + int draw_scaled(Fl_Image *img, int X, int Y, int W, int H); /** \brief The destructor */ virtual ~Fl_Graphics_Driver() { if (p) free(p); } }; @@ -436,8 +432,7 @@ public: void draw(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy); void draw(Fl_Bitmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy); void draw(Fl_RGB_Image *img, int XP, int YP, int WP, int HP, int cx, int cy); - int draw_scaled(Fl_RGB_Image *img, int XP, int YP, int WP, int HP); - int draw_scaled(Fl_Pixmap *img, int XP, int YP, int WP, int HP); + int draw_scaled(Fl_Image *img, int XP, int YP, int WP, int HP); void draw_image(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0); void draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3); void draw_image_mono(const uchar* buf, int X,int Y,int W,int H, int D=1, int L=0); @@ -498,8 +493,7 @@ public: const char *class_name() {return class_id;}; void draw(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy); void draw(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int cx, int cy); - int draw_scaled(Fl_RGB_Image *img, int X, int Y, int W, int H); - int draw_scaled(Fl_Pixmap *img, int X, int Y, int W, int H); + int draw_scaled(Fl_Image *img, int XP, int YP, int WP, int HP); }; #endif #if !(defined(__APPLE__) || defined(WIN32)) diff --git a/FL/Fl_PostScript.H b/FL/Fl_PostScript.H index 19692c455..c635e88ef 100644 --- a/FL/Fl_PostScript.H +++ b/FL/Fl_PostScript.H @@ -213,8 +213,7 @@ class Clip { void draw(Fl_Pixmap * pxm,int XP, int YP, int WP, int HP, int cx, int cy); void draw(Fl_Bitmap * bitmap,int XP, int YP, int WP, int HP, int cx, int cy); void draw(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy); - int draw_scaled(Fl_RGB_Image *img, int XP, int YP, int WP, int HP); - int draw_scaled(Fl_Pixmap *img, int XP, int YP, int WP, int HP); + int draw_scaled(Fl_Image *img, int XP, int YP, int WP, int HP); int clocale_printf(const char *format, ...); ~Fl_PostScript_Graphics_Driver(); }; |