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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/09/26 09:29:01

Modified files:
        .              : ChangeLog 
        backend        : render_handler_cairo.cpp 

Log message:
                * backend/render_handler_cairo.cpp: make sure that
                  the bitmap_info we receive are actually bitmap_info_cairo
                  type (don't just assume it).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.924&r2=1.925
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_cairo.cpp?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.924
retrieving revision 1.925
diff -u -b -r1.924 -r1.925
--- ChangeLog   26 Sep 2006 08:40:23 -0000      1.924
+++ ChangeLog   26 Sep 2006 09:29:01 -0000      1.925
@@ -1,5 +1,8 @@
 2006-09-26 Sandro Santilli  <address@hidden>
 
+       * backend/render_handler_cairo.cpp: make sure that
+         the bitmap_info we receive are actually bitmap_info_cairo
+         type (don't just assume it).
        * server/parser/bitmap_character_def.cpp,
          server/parser/bitmap_character_def.h: changed interface
          to construct bitmap_info at construction time, and to

Index: backend/render_handler_cairo.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_cairo.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- backend/render_handler_cairo.cpp    14 Sep 2006 03:00:23 -0000      1.7
+++ backend/render_handler_cairo.cpp    26 Sep 2006 09:29:01 -0000      1.8
@@ -525,7 +525,7 @@
 
     void       draw_bitmap(
        const gnash::matrix& m,
-       const gnash::bitmap_info* bi,
+       const gnash::bitmap_info* binfo,
        const gnash::rect& coords,
        const gnash::rect& uv_coords,
        gnash::rgba color)
@@ -537,6 +537,8 @@
        {
 //         GNASH_REPORT_FUNCTION;
            assert(bi);
+           bitmap_info_cairo* bi = dynamic_cast<bitmap_info_cairo*>(binfo);
+           assert(bi);
 
            apply_color(color);
 
@@ -559,8 +561,7 @@
 
            cairo_matrix_multiply(&mat, &mat, &new_mat);
 
-           cairo_pattern_t* pattern = 
-               ((bitmap_info_cairo*)bi)->m_pattern;
+           cairo_pattern_t* pattern = bi->m_pattern;
            cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT);
            cairo_pattern_set_matrix(pattern, &mat);
            cairo_set_source(g_cr, pattern);