From 8d612d91b20af8c559bb9cfe083ebb35610d6f0b Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Mon, 16 Mar 2026 18:12:31 +0100 Subject: [PATCH] Remove member function Fl_Cairo_Graphics_Driver::check_status() of debugging interest only. --- src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H | 2 -- .../Cairo/Fl_Cairo_Graphics_Driver.cxx | 24 +------------------ src/drivers/PostScript/Fl_PostScript.cxx | 5 ---- .../PostScript/Fl_PostScript_image.cxx | 1 - 4 files changed, 1 insertion(+), 31 deletions(-) diff --git a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H index eee10900d..399b2c342 100644 --- a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H +++ b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H @@ -69,8 +69,6 @@ public: static cairo_pattern_t *calc_cairo_mask(const Fl_RGB_Image *rgb); static const char *clean_utf8(const char* str, int &n); - void check_status(void); - unsigned char cr_,cg_,cb_; char linedash_[256];//should be enough void concat(); // transform ror scalable dradings... diff --git a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx index 3e1433c7f..013c939f0 100644 --- a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx +++ b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx @@ -143,11 +143,11 @@ void Fl_Cairo_Graphics_Driver::set_cairo(cairo_t *cr, float s) { void Fl_Cairo_Graphics_Driver::rectf(int x, int y, int w, int h) { + if (w < 1 || h < 1) return; cairo_rectangle(cairo_, x-0.5, y-0.5, w, h); cairo_set_antialias(cairo_, CAIRO_ANTIALIAS_NONE); cairo_fill(cairo_); cairo_set_antialias(cairo_, CAIRO_ANTIALIAS_DEFAULT); - check_status(); surface_needs_commit(); } @@ -196,7 +196,6 @@ void Fl_Cairo_Graphics_Driver::xyline(int x, int y, int x1) { cairo_set_antialias(cairo_, CAIRO_ANTIALIAS_NONE); cairo_stroke(cairo_); cairo_set_antialias(cairo_, CAIRO_ANTIALIAS_DEFAULT); - check_status(); surface_needs_commit(); } @@ -207,7 +206,6 @@ void Fl_Cairo_Graphics_Driver::xyline(int x, int y, int x1, int y2) { cairo_set_antialias(cairo_, CAIRO_ANTIALIAS_NONE); cairo_stroke(cairo_); cairo_set_antialias(cairo_, CAIRO_ANTIALIAS_DEFAULT); - check_status(); surface_needs_commit(); } @@ -219,7 +217,6 @@ void Fl_Cairo_Graphics_Driver::xyline(int x, int y, int x1, int y2, int x3) { cairo_set_antialias(cairo_, CAIRO_ANTIALIAS_NONE); cairo_stroke(cairo_); cairo_set_antialias(cairo_, CAIRO_ANTIALIAS_DEFAULT); - check_status(); surface_needs_commit(); } @@ -229,7 +226,6 @@ void Fl_Cairo_Graphics_Driver::yxline(int x, int y, int y1) { cairo_set_antialias(cairo_, CAIRO_ANTIALIAS_NONE); cairo_stroke(cairo_); cairo_set_antialias(cairo_, CAIRO_ANTIALIAS_DEFAULT); - check_status(); surface_needs_commit(); } @@ -240,7 +236,6 @@ void Fl_Cairo_Graphics_Driver::yxline(int x, int y, int y1, int x2) { cairo_set_antialias(cairo_, CAIRO_ANTIALIAS_NONE); cairo_stroke(cairo_); cairo_set_antialias(cairo_, CAIRO_ANTIALIAS_DEFAULT); - check_status(); surface_needs_commit(); } @@ -252,7 +247,6 @@ void Fl_Cairo_Graphics_Driver::yxline(int x, int y, int y1, int x2, int y3) { cairo_set_antialias(cairo_, CAIRO_ANTIALIAS_NONE); cairo_stroke(cairo_); cairo_set_antialias(cairo_, CAIRO_ANTIALIAS_DEFAULT); - check_status(); surface_needs_commit(); } @@ -370,7 +364,6 @@ void Fl_Cairo_Graphics_Driver::line_style(int style, int width, char* dashes) { cairo_set_dash(cairo_, ddashes, l, 0); cairo_set_antialias(cairo_, l ? CAIRO_ANTIALIAS_NONE : CAIRO_ANTIALIAS_DEFAULT); delete[] ddashes; - check_status(); } void Fl_Cairo_Graphics_Driver::color(unsigned char r, unsigned char g, unsigned char b) { @@ -381,7 +374,6 @@ void Fl_Cairo_Graphics_Driver::color(unsigned char r, unsigned char g, unsigned fg = g/255.0; fb = b/255.0; cairo_set_source_rgb(cairo_, fr, fg, fb); - check_status(); } void Fl_Cairo_Graphics_Driver::color(Fl_Color i) { @@ -590,7 +582,6 @@ void Fl_Cairo_Graphics_Driver::push_clip(int x, int y, int w, int h) { cairo_set_antialias(cairo_, CAIRO_ANTIALIAS_NONE); cairo_clip(cairo_); cairo_set_antialias(cairo_, CAIRO_ANTIALIAS_DEFAULT); - check_status(); } void Fl_Cairo_Graphics_Driver::push_no_clip() { @@ -600,7 +591,6 @@ void Fl_Cairo_Graphics_Driver::push_no_clip() { clip_->x = clip_->y = clip_->w = clip_->h = -1; cairo_save(cairo_); cairo_reset_clip(cairo_); - check_status(); } void Fl_Cairo_Graphics_Driver::pop_clip() { @@ -609,7 +599,6 @@ void Fl_Cairo_Graphics_Driver::pop_clip() { clip_ = clip_->prev; delete c; cairo_restore(cairo_); - check_status(); } void Fl_Cairo_Graphics_Driver::ps_origin(int x, int y) { @@ -620,7 +609,6 @@ void Fl_Cairo_Graphics_Driver::ps_origin(int x, int y) { cairo_translate(cairo_, x, y); cairo_rotate(cairo_, angle * M_PI / 180); cairo_save(cairo_); - check_status(); } void Fl_Cairo_Graphics_Driver::ps_translate(int x, int y) @@ -628,22 +616,12 @@ void Fl_Cairo_Graphics_Driver::ps_translate(int x, int y) cairo_save(cairo_); cairo_translate(cairo_, x, y); cairo_save(cairo_); - check_status(); } void Fl_Cairo_Graphics_Driver::ps_untranslate(void) { cairo_restore(cairo_); cairo_restore(cairo_); - check_status(); -} - -void Fl_Cairo_Graphics_Driver::check_status(void) { -#ifdef DEBUG - if (cairo_status(cairo_) != CAIRO_STATUS_SUCCESS) { - fprintf(stderr,"we have a problem"); - } -#endif } void Fl_Cairo_Graphics_Driver::draw_image(Fl_Draw_Image_Cb call, void *data, int ix, int iy, int iw, int ih, int D) diff --git a/src/drivers/PostScript/Fl_PostScript.cxx b/src/drivers/PostScript/Fl_PostScript.cxx index 324d1c6f9..4149b6ab2 100644 --- a/src/drivers/PostScript/Fl_PostScript.cxx +++ b/src/drivers/PostScript/Fl_PostScript.cxx @@ -1583,7 +1583,6 @@ void Fl_PostScript_Graphics_Driver::transformed_draw(const char* str, int n, dou pango_cairo_show_layout(cairo_, pango_layout_); // 1.10 } cairo_restore(cairo_); - check_status(); } @@ -1765,7 +1764,6 @@ int Fl_PDF_Pango_File_Surface::begin_page(void) cairo_set_source_rgb(ps->cr(), 1.0, 1.0, 1.0); // white background cairo_save(ps->cr()); cairo_save(ps->cr()); - ps->check_status(); x_offset = 0; y_offset = 0; ps->scale_x = ps->scale_y = 1.; @@ -1915,7 +1913,6 @@ int Fl_PostScript_File_Device::begin_page (void) cairo_set_source_rgb(ps->cr(), 1.0, 1.0, 1.0); // white background cairo_save(ps->cr()); cairo_save(ps->cr()); - ps->check_status(); #else ps->page(ps->page_format_); #endif @@ -1937,7 +1934,6 @@ int Fl_PostScript_File_Device::end_page (void) cairo_restore(ps->cr()); cairo_restore(ps->cr()); cairo_show_page(ps->cr()); - ps->check_status(); #endif Fl_Surface_Device::pop_current(); return 0; @@ -2004,7 +2000,6 @@ Fl_EPS_File_Surface::Fl_EPS_File_Surface(int width, int height, FILE *eps, Fl_Co cairo_set_source_rgb(ps->cr(), 1.0, 1.0, 1.0); // white background cairo_save(ps->cr()); cairo_save(ps->cr()); - ps->check_status(); #else if (s != 1) { ps->clocale_printf("GR GR GS %f %f SC GS\n", s, s); diff --git a/src/drivers/PostScript/Fl_PostScript_image.cxx b/src/drivers/PostScript/Fl_PostScript_image.cxx index 9b5fe1668..31f684c43 100644 --- a/src/drivers/PostScript/Fl_PostScript_image.cxx +++ b/src/drivers/PostScript/Fl_PostScript_image.cxx @@ -177,7 +177,6 @@ void Fl_PostScript_Graphics_Driver::draw_rgb_bitmap_(Fl_Image *img,int XP, int Y cairo_pattern_destroy(pat); cairo_surface_destroy(surf); cairo_restore(cairo_); - check_status(); } }