FLTK logo

[master] bc3bbb7 - Remove useless fl_matrix member variable of class Fl_Graphics_Driver

FLTK matrix user chat room
(using Element browser app)   FLTK gitter user chat room   GitHub FLTK Project   FLTK News RSS Feed  
  FLTK Apps      FLTK Library      Forums      Links     Login 
 All Forums  |  Back to fltk.commit  ]
 
Previous Message ]Next Message ]

[master] bc3bbb7 - Remove useless fl_matrix member variable of class Fl_Graphics_Driver "ManoloFLTK" Nov 30, 2022  
 
commit bc3bbb7ca028db377ec4b2acbe74d8f2c8a5c149
Author:     ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
AuthorDate: Wed Nov 30 18:57:39 2022 +0100
Commit:     ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
CommitDate: Wed Nov 30 18:57:39 2022 +0100

    Remove useless fl_matrix member variable of class Fl_Graphics_Driver

 FL/Fl_Graphics_Driver.H                        | 5 -----
 src/Fl_Graphics_Driver.cxx                     | 1 -
 src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx | 4 ++--
 src/drivers/PostScript/Fl_PostScript.cxx       | 4 ++--
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git FL/Fl_Graphics_Driver.H FL/Fl_Graphics_Driver.H
index b9db1d2..817fcd9 100644
--- FL/Fl_Graphics_Driver.H
+++ FL/Fl_Graphics_Driver.H
@@ -170,11 +170,6 @@ protected:
   int p_size;
   typedef struct { float x; float y; } 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 cache(Fl_Pixmap *img);
   virtual void cache(Fl_Bitmap *img);
diff --git src/Fl_Graphics_Driver.cxx src/Fl_Graphics_Driver.cxx
index 350f187..967b015 100644
--- src/Fl_Graphics_Driver.cxx
+++ src/Fl_Graphics_Driver.cxx
@@ -50,7 +50,6 @@ Fl_Graphics_Driver::Fl_Graphics_Driver()
   rstack[0] = NULL;
   fl_clip_state_number=0;
   m = m0;
-  fl_matrix = &m;
   font_descriptor_ = NULL;
   scale_ = 1;
   p_size = 0;
diff --git src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx
index 7b24176..1bf5d2a 100644
--- src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx
+++ src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx
@@ -376,12 +376,12 @@ Fl_Color Fl_Cairo_Graphics_Driver::color() { return Fl_Graphics_Driver::color();
 
 
 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);
 }
 
 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);
   if (stat != CAIRO_STATUS_SUCCESS) {
     fputs("error in cairo_matrix_invert\n", stderr);
diff --git src/drivers/PostScript/Fl_PostScript.cxx src/drivers/PostScript/Fl_PostScript.cxx
index bd8994c..8e6dff8 100644
--- src/drivers/PostScript/Fl_PostScript.cxx
+++ src/drivers/PostScript/Fl_PostScript.cxx
@@ -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(){
-  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(){
-  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 ////////////////////////////////
Direct Link to Message ]
 
     
Previous Message ]Next Message ]
 
 

Comments are owned by the poster. All other content is copyright 1998-2024 by Bill Spitzak and others. This project is hosted by The FLTK Team. Please report site problems to 'erco@seriss.com'.