Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-31 22:04:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove useless fl_matrix member variable of class Fl_Graphics_Driver

Browse Source
This commit is contained in:
ManoloFLTK
2022-11-30 18:57:39 +01:00
parent 67817f696c
commit bc3bbb7ca0
4 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FL/Fl_Graphics_Driver.H
-5
View File
@@ -170,11 +170,6 @@ protected:
int p_size; int p_size;
typedef struct { float x; float y; } XPOINT; typedef struct { float x; float y; } XPOINT;
XPOINT *xpoint; XPOINT *xpoint;
#ifndef FL_DOXYGEN
inline int vertex_no() { return n; }
inline int vertex_kind() {return what;}
#endif
matrix *fl_matrix; /**< Points to the current coordinate transformation matrix */
virtual void global_gc(); virtual void global_gc();
virtual void cache(Fl_Pixmap *img); virtual void cache(Fl_Pixmap *img);
virtual void cache(Fl_Bitmap *img); virtual void cache(Fl_Bitmap *img);
src/Fl_Graphics_Driver.cxx
-1
View File
@@ -50,7 +50,6 @@ Fl_Graphics_Driver::Fl_Graphics_Driver()
rstack[0] = NULL; rstack[0] = NULL;
fl_clip_state_number=0; fl_clip_state_number=0;
m = m0; m = m0;
fl_matrix = &m;
font_descriptor_ = NULL; font_descriptor_ = NULL;
scale_ = 1; scale_ = 1;
p_size = 0; p_size = 0;
src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx
+2 -2
View File
@@ -376,12 +376,12 @@ Fl_Color Fl_Cairo_Graphics_Driver::color() { return Fl_Graphics_Driver::color();
void Fl_Cairo_Graphics_Driver::concat(){ void Fl_Cairo_Graphics_Driver::concat(){
cairo_matrix_t mat = {fl_matrix->a , fl_matrix->b , fl_matrix->c , fl_matrix->d , fl_matrix->x , fl_matrix->y}; cairo_matrix_t mat = {m.a , m.b , m.c , m.d , m.x , m.y};
cairo_transform(cairo_, &mat); cairo_transform(cairo_, &mat);
} }
void Fl_Cairo_Graphics_Driver::reconcat(){ void Fl_Cairo_Graphics_Driver::reconcat(){
cairo_matrix_t mat = {fl_matrix->a , fl_matrix->b , fl_matrix->c , fl_matrix->d , fl_matrix->x , fl_matrix->y}; cairo_matrix_t mat = {m.a , m.b , m.c , m.d , m.x , m.y};
cairo_status_t stat = cairo_matrix_invert(&mat); cairo_status_t stat = cairo_matrix_invert(&mat);
if (stat != CAIRO_STATUS_SUCCESS) { if (stat != CAIRO_STATUS_SUCCESS) {
fputs("error in cairo_matrix_invert\n", stderr); fputs("error in cairo_matrix_invert\n", stderr);
src/drivers/PostScript/Fl_PostScript.cxx
+2 -2
View File
@@ -1241,11 +1241,11 @@ void Fl_PostScript_Graphics_Driver::rtl_draw(const char* str, int n, int x, int
} }
void Fl_PostScript_Graphics_Driver::concat(){ void Fl_PostScript_Graphics_Driver::concat(){
clocale_printf("[%g %g %g %g %g %g] CT\n", fl_matrix->a , fl_matrix->b , fl_matrix->c , fl_matrix->d , fl_matrix->x , fl_matrix->y); clocale_printf("[%g %g %g %g %g %g] CT\n", m.a , m.b , m.c , m.d , m.x , m.y);
} }
void Fl_PostScript_Graphics_Driver::reconcat(){ void Fl_PostScript_Graphics_Driver::reconcat(){
clocale_printf("[%g %g %g %g %g %g] RCT\n" , fl_matrix->a , fl_matrix->b , fl_matrix->c , fl_matrix->d , fl_matrix->x , fl_matrix->y); clocale_printf("[%g %g %g %g %g %g] RCT\n" , m.a , m.b , m.c , m.d , m.x , m.y);
} }
///////////////// transformed (double) drawings //////////////////////////////// ///////////////// transformed (double) drawings ////////////////////////////////