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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/09/19 14:36:16

Modified files:
        .              : ChangeLog 
        backend        : render_handler_ogl.cpp 

Log message:
        use explicit const_cast<> (makes compiler happier)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.869&r2=1.870
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.869
retrieving revision 1.870
diff -u -b -r1.869 -r1.870
--- ChangeLog   19 Sep 2006 13:46:21 -0000      1.869
+++ ChangeLog   19 Sep 2006 14:36:16 -0000      1.870
@@ -1,5 +1,7 @@
 2006-09-19 Sandro Santilli  <address@hidden>
 
+       * backend/render_handler_ogl.cpp: hush little compiler
+         (use explicit const_cast)
        * server/sprite_instance.cpp (sprite_hit_test): stub for hitTest() 
        * server/sprite_instance.cpp (call_frame_actions): fixed
          premature deletion of action buffers (also optimized somehow).

Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- backend/render_handler_ogl.cpp      14 Sep 2006 03:00:23 -0000      1.26
+++ backend/render_handler_ogl.cpp      19 Sep 2006 14:36:16 -0000      1.27
@@ -263,7 +263,7 @@
        void    set_bitmap(const gnash::bitmap_info* bi, const gnash::matrix& 
m, bitmap_wrap_mode wm, const gnash::cxform& color_transform)
            {
                m_mode = (wm == WRAP_REPEAT) ? BITMAP_WRAP : BITMAP_CLAMP;
-               m_bitmap_info = (gnash::bitmap_info*) bi;
+               m_bitmap_info = const_cast<gnash::bitmap_info*> ( bi );
                m_bitmap_matrix = m;
                m_bitmap_color_transform = color_transform;
                m_bitmap_color_transform.clamp();
@@ -696,9 +696,9 @@
 
                        if (bi->m_texture_id == 0 && bi->m_suspended_image != 
NULL)
                        {
-                               ((bitmap_info*) 
bi)->layout_image(bi->m_suspended_image);
+                               
const_cast<bitmap_info*>(bi)->layout_image(bi->m_suspended_image);
                                delete bi->m_suspended_image;
-                               ((bitmap_info*) bi)->m_suspended_image = NULL;
+                               const_cast<bitmap_info*>(bi)->m_suspended_image 
= NULL;
                        }
 
                        // assert(bi->m_texture_id);