CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/01/31 13:41:32
Modified files:
. : ChangeLog
server : movie_root.cpp
Log message:
(display): do nothing if the movie frame is null. Fixes bug #22189.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5534&r2=1.5535
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.156&r2=1.157
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5534
retrieving revision 1.5535
diff -u -b -r1.5534 -r1.5535
--- ChangeLog 31 Jan 2008 11:25:56 -0000 1.5534
+++ ChangeLog 31 Jan 2008 13:41:31 -0000 1.5535
@@ -1,5 +1,10 @@
2008-01-31 Sandro Santilli <[EMAIL PROTECTED]>
+ * server/movie_root.cpp (display): do nothing if the movie frame
+ is null. Fixes bug #22189.
+
+2008-01-31 Sandro Santilli <[EMAIL PROTECTED]>
+
* libamf/amf.{cpp,h}: have encodeVariable take an output parameter
to return size of the serialized buffer; perform boundary checking
before any memcpy.
Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -b -r1.156 -r1.157
--- server/movie_root.cpp 30 Jan 2008 14:51:48 -0000 1.156
+++ server/movie_root.cpp 31 Jan 2008 13:41:32 -0000 1.157
@@ -1036,11 +1036,18 @@
assert(testInvariant());
- // should we cache this ? it's immutable after all !
- const rect& frame_size = getRootMovie()->get_frame_size();
-
clearInvalidated();
+ // TODO: should we consider the union of all levels bounds ?
+ const rect& frame_size = getRootMovie()->get_frame_size();
+ if ( frame_size.is_null() )
+ {
+ // TODO: check what we should do if other levels
+ // have valid bounds
+ log_debug("original root movie had null bounds, not
displaying");
+ return;
+ }
+
render::begin_display(
m_background_color,
m_viewport_x0, m_viewport_y0,
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
