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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/18 14:51:08

Modified files:
        .              : ChangeLog 
        backend        : render_handler_ogl.cpp 

Log message:
        * backend/render_handler_ogl.cpp: don't directly access rect "to-be" 
private members.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1299&r2=1.1300
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.30&r2=1.31

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1299
retrieving revision 1.1300
diff -u -b -r1.1299 -r1.1300
--- ChangeLog   18 Oct 2006 14:23:27 -0000      1.1299
+++ ChangeLog   18 Oct 2006 14:51:08 -0000      1.1300
@@ -1,5 +1,7 @@
 2006-10-18 Sandro Santilli <address@hidden>
 
+       * backend/render_handler_ogl.cpp: don't directly access rect
+         "to-be" private members.
        * server/: fontlib.cpp, movie_root.cpp: don't directly access
          rect "to-be" private members.
        * gui/gtk.cpp: don't directly access rect "to-be" private members.

Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- backend/render_handler_ogl.cpp      13 Oct 2006 15:03:08 -0000      1.30
+++ backend/render_handler_ogl.cpp      18 Oct 2006 14:51:08 -0000      1.31
@@ -699,9 +699,9 @@
            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;
 
@@ -721,16 +721,21 @@
 
            glBegin(GL_TRIANGLE_STRIP);
 
-           glTexCoord2f(uv_coords.m_x_min, uv_coords.m_y_min);
+            float xmin = uv_coords.get_x_min();
+            float xmax = uv_coords.get_x_max();
+            float ymin = uv_coords.get_y_min();
+            float ymax = uv_coords.get_y_max();
+
+           glTexCoord2f(xmin, ymin);
            glVertex2f(a.m_x, a.m_y);
 
-           glTexCoord2f(uv_coords.m_x_max, uv_coords.m_y_min);
+           glTexCoord2f(xmax, ymin);
            glVertex2f(b.m_x, b.m_y);
 
-           glTexCoord2f(uv_coords.m_x_min, uv_coords.m_y_max);
+           glTexCoord2f(xmin, ymax);
            glVertex2f(c.m_x, c.m_y);
 
-           glTexCoord2f(uv_coords.m_x_max, uv_coords.m_y_max);
+           glTexCoord2f(xmax, ymax);
            glVertex2f(d.m_x, d.m_y);
 
            glEnd();