[Gnash-commit] gnash ChangeLog backend/render_handler_cairo.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/18 15:52:31

Modified files:
        .              : ChangeLog 
        backend        : render_handler_cairo.cpp 

Log message:
        don't directly access rect private members.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1303&r2=1.1304
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_cairo.cpp?cvsroot=gnash&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1303
retrieving revision 1.1304
diff -u -b -r1.1303 -r1.1304
--- ChangeLog   18 Oct 2006 15:40:47 -0000      1.1303
+++ ChangeLog   18 Oct 2006 15:52:31 -0000      1.1304
@@ -1,5 +1,7 @@
 2006-10-18 Sandro Santilli <address@hidden>
 
+       * backend/render_handler_cairo.cpp:
+         don't directly access rect private members.
        * gui/fb.cpp, backend/render_handler_agg.cpp:
          don't directly access rect private members.
        * gui/gui.cpp: let initial _last_invalidated_rect be null;

Index: backend/render_handler_cairo.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_cairo.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- backend/render_handler_cairo.cpp    14 Oct 2006 03:50:16 -0000      1.15
+++ backend/render_handler_cairo.cpp    18 Oct 2006 15:52:31 -0000      1.16
@@ -556,17 +556,16 @@
            apply_color(color);
 
            gnash::point a, b, c, d;
-           m.transform(&a, gnash::point(coords.m_x_min, coords.m_y_min));
-           m.transform(&b, gnash::point(coords.m_x_max, coords.m_y_min));
-           m.transform(&c, gnash::point(coords.m_x_min, coords.m_y_max));
+           m.transform(&a, gnash::point(coords.get_x_min(), 
coords.get_y_min()));
+           m.transform(&b, gnash::point(coords.get_x_max(), 
coords.get_y_min()));
+           m.transform(&c, gnash::point(coords.get_x_min(), 
coords.get_y_max()));
            d.m_x = b.m_x + c.m_x - a.m_x;
            d.m_y = b.m_y + c.m_y - a.m_y;
 
            // FIXME!!! scaling and offset is wrong
            cairo_matrix_t mat;
-           cairo_matrix_init_scale(&mat, coords.m_x_max - coords.m_x_min,
-               coords.m_y_max - coords.m_y_min);
-           cairo_matrix_init_translate(&mat, coords.m_x_min, coords.m_y_min);
+           cairo_matrix_init_scale(&mat, coords.width(), coords.height());
+           cairo_matrix_init_translate(&mat, coords.get_x_min(), 
coords.get_y_min());
 
            cairo_matrix_t new_mat;
            cairo_matrix_init(&new_mat, m.m_[0][0], m.m_[1][0], m.m_[0][1],