[Gnash-commit] gnash ChangeLog server/movie.h server/sprite_in...

[Sandro Santilli]

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

Modified files:
        .              : ChangeLog 
        server         : movie.h sprite_instance.h 

Log message:
                * server/movie.h: fix set_display_callback signature (was 
changed
                  when erroneously commented out unused parameter)
                * server/sprite_instance.h (attach_display_callback): removed
                  cast of set_display_callback() first arg (see above item).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.965&r2=1.966
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.27&r2=1.28

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.965
retrieving revision 1.966
diff -u -b -r1.965 -r1.966
--- ChangeLog   29 Sep 2006 10:06:53 -0000      1.965
+++ ChangeLog   29 Sep 2006 10:08:29 -0000      1.966
@@ -1,5 +1,9 @@
 2006-09-29 Sandro Santilli  <address@hidden>
 
+       * server/movie.h: fix set_display_callback signature (was changed
+         when erroneously commented out unused parameter)
+       * server/sprite_instance.h (attach_display_callback): removed
+         cast of set_display_callback() first arg (see above item).
        * server/parser/movie_def_impl.cpp: cast to void* when printing 
          args with format %p
        * server/xmlsocket.cpp: fixed unused variable warning.

Index: server/movie.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/movie.h      26 Aug 2006 18:45:50 -0000      1.18
+++ server/movie.h      29 Sep 2006 10:08:29 -0000      1.19
@@ -500,7 +500,7 @@
 
        // Override me to provide this functionality.
        virtual void set_display_callback(
-           void * /* (*callback)(void*) */,
+           void (* /*callback*/ )(void*),
            void* /* user_ptr */)
        {
        }

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/sprite_instance.h    22 Sep 2006 19:16:46 -0000      1.27
+++ server/sprite_instance.h    29 Sep 2006 10:08:29 -0000      1.28
@@ -35,7 +35,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.27 2006/09/22 19:16:46 nihilus Exp $ */
+/* $Id: sprite_instance.h,v 1.28 2006/09/29 10:08:29 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -478,7 +478,7 @@
                        movie*  m = as_obj->to_movie();
                        if (m)
                        {
-                       m->set_display_callback((void *)callback, user_ptr);
+                       m->set_display_callback(callback, user_ptr);
                        }
                }
        }