diff options
| author | Manolo Gouy <Manolo> | 2018-04-12 14:54:53 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2018-04-12 14:54:53 +0000 |
| commit | 178343b2ee6f674d6bdb75f5e039557ea811f40a (patch) | |
| tree | f2f8f6163b773575d652e4cc865665f20fdc45cb | |
| parent | 16705ef734cd00e114e422e2cb4a5c84ad49c09f (diff) | |
Image drawing: simplify the code organisation to better support Fl_Image::scale() - continued
This completes changes introduced at r.12828.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12829 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/Fl_PostScript.H | 6 | ||||
| -rw-r--r-- | src/drivers/PostScript/Fl_PostScript_image.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/FL/Fl_PostScript.H b/FL/Fl_PostScript.H index 4a966de45..db2b8da19 100644 --- a/FL/Fl_PostScript.H +++ b/FL/Fl_PostScript.H @@ -210,9 +210,9 @@ class Clip { void text_extents(const char *c, int n, int &dx, int &dy, int &w, int &h); int height(); int descent(); - 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); + void draw_pixmap(Fl_Pixmap * pxm,int XP, int YP, int WP, int HP, int cx, int cy); + void draw_bitmap(Fl_Bitmap * bitmap,int XP, int YP, int WP, int HP, int cx, int cy); + void draw_rgb(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy); /** Shields output PostScript data from modifications of the current locale. It typically avoids PostScript errors caused if the current locale uses comma instead of dot as "decimal point". diff --git a/src/drivers/PostScript/Fl_PostScript_image.cxx b/src/drivers/PostScript/Fl_PostScript_image.cxx index 4b7c26744..e237b09ca 100644 --- a/src/drivers/PostScript/Fl_PostScript_image.cxx +++ b/src/drivers/PostScript/Fl_PostScript_image.cxx @@ -571,7 +571,7 @@ void Fl_PostScript_Graphics_Driver::draw_image_mono(Fl_Draw_Image_Cb call, void ////////////////////////////// Image classes ////////////////////// -void Fl_PostScript_Graphics_Driver::draw(Fl_Pixmap * pxm,int XP, int YP, int WP, int HP, int cx, int cy){ +void Fl_PostScript_Graphics_Driver::draw_pixmap(Fl_Pixmap * pxm,int XP, int YP, int WP, int HP, int cx, int cy){ int need_clip = cx || cy || WP != pxm->w() || HP != pxm->h(); if (need_clip) push_clip(XP, YP, WP, HP); if (pxm->w() != pxm->data_w() || pxm->h() != pxm->data_h()) { @@ -592,7 +592,7 @@ void Fl_PostScript_Graphics_Driver::draw(Fl_Pixmap * pxm,int XP, int YP, int WP, if (need_clip) pop_clip(); } -void Fl_PostScript_Graphics_Driver::draw(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy) +void Fl_PostScript_Graphics_Driver::draw_rgb(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy) { int need_clip = cx || cy || WP != rgb->w() || HP != rgb->h(); if (need_clip) push_clip(XP, YP, WP, HP); @@ -628,7 +628,7 @@ int Fl_PostScript_Graphics_Driver::scale_and_draw(Fl_Image *img, int XP, int YP, return 1; } -void Fl_PostScript_Graphics_Driver::draw(Fl_Bitmap * bitmap,int XP, int YP, int WP, int HP, int cx, int cy) { +void Fl_PostScript_Graphics_Driver::draw_bitmap(Fl_Bitmap * bitmap,int XP, int YP, int WP, int HP, int cx, int cy) { int need_clip = cx || cy || WP != bitmap->w() || HP != bitmap->h(); if (need_clip) push_clip(XP, YP, WP, HP); if (bitmap->w() != bitmap->data_w() || bitmap->h() != bitmap->data_h()) { |