diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-12-28 16:58:52 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-12-28 16:58:52 +0100 |
| commit | 31327cd649b8ad5a6271057d823abe59a5362c60 (patch) | |
| tree | 942490d6fa3a46feb74ed5b647fc1f175b02da06 | |
| parent | 6518e2d1f1cf02080ee973d79056afdd727414dd (diff) | |
Fix for Two compiler warnings (#615) - cont'd
The Page_Format and Page_Layout enums have been conceived for them to be combinable
into a single int value.
| -rw-r--r-- | src/drivers/PostScript/Fl_PostScript.cxx | 6 | ||||
| -rw-r--r-- | src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/drivers/PostScript/Fl_PostScript.cxx b/src/drivers/PostScript/Fl_PostScript.cxx index 3e5ec3d27..df45eaf69 100644 --- a/src/drivers/PostScript/Fl_PostScript.cxx +++ b/src/drivers/PostScript/Fl_PostScript.cxx @@ -673,7 +673,8 @@ int Fl_PostScript_Graphics_Driver::start_postscript (int pagecount, left_margin = 12; top_margin = 12; } - page_format_ = (enum Fl_Paged_Device::Page_Format)((int)format | (int)layout); + // combine the format and layout information + page_format_ = ((int)format | (int)layout); if (layout & Fl_Paged_Device::LANDSCAPE){ ph_ = Fl_Paged_Device::page_formats[format].width; pw_ = Fl_Paged_Device::page_formats[format].height; @@ -1491,7 +1492,8 @@ int Fl_PostScript_Graphics_Driver::start_postscript(int pagecount, left_margin = 12; top_margin = 12; } - page_format_ = (enum Fl_Paged_Device::Page_Format)(format | layout); + // combine the format and layout information + page_format_ = ((int)format | (int)layout); if (layout & Fl_Paged_Device::LANDSCAPE){ ph_ = Fl_Paged_Device::page_formats[format].width; pw_ = Fl_Paged_Device::page_formats[format].height; diff --git a/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H b/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H index 52288cdae..7f7a0acce 100644 --- a/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H +++ b/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H @@ -45,7 +45,7 @@ class Fl_PostScript_Graphics_Driver : public Fl_Cairo_Graphics_Driver { public: FILE *output; Fl_PostScript_Close_Command close_cmd_; - enum Fl_Paged_Device::Page_Format page_format_; + int page_format_; char *ps_filename_; int nPages; double pw_, ph_; @@ -158,7 +158,7 @@ public: void transformed_draw(const char* s, int n, double x, double y); //precise text placing //void transformed_draw(const char* s, double x, double y); - enum Fl_Paged_Device::Page_Format page_format_; + int page_format_; char *ps_filename_; void close_command(Fl_PostScript_Close_Command cmd){close_cmd_=cmd;} |