[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/character.h
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog server/character.h |
Date: |
Sat, 12 May 2007 08:41:13 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/05/12 08:41:13
Modified files:
. : ChangeLog
server : character.h
Log message:
* server/character.h (isDynamic): the root movie, not having
been placed in a parent displaylist, has NO TimelineInfo
associated. Consider this in the assertion aimed at dropping
the _dynamicallyCreated flag.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3171&r2=1.3172
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.74&r2=1.75
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3171
retrieving revision 1.3172
diff -u -b -r1.3171 -r1.3172
--- ChangeLog 12 May 2007 07:02:29 -0000 1.3171
+++ ChangeLog 12 May 2007 08:41:12 -0000 1.3172
@@ -1,5 +1,9 @@
2007-05-12 Sandro Santilli <address@hidden>
+ * server/character.h (isDynamic): the root movie, not having
+ been placed in a parent displaylist, has NO TimelineInfo
+ associated. Consider this in the assertion aimed at dropping
+ the _dynamicallyCreated flag.
* libbase/tu_file.cpp (std_tell_func): don't require not to
be at EOF on tell() call. See bug #19861.
Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- server/character.h 11 May 2007 17:53:29 -0000 1.74
+++ server/character.h 12 May 2007 08:41:13 -0000 1.75
@@ -18,7 +18,7 @@
//
//
-/* $Id: character.h,v 1.74 2007/05/11 17:53:29 strk Exp $ */
+/* $Id: character.h,v 1.75 2007/05/12 08:41:13 strk Exp $ */
#ifndef GNASH_CHARACTER_H
#define GNASH_CHARACTER_H
@@ -667,7 +667,19 @@
///
bool isDynamic() const {
// TODO: return _timelineInfo.get() == NULL
- assert(_timelineInfo.get() ? !_dynamicallyCreated :
_dynamicallyCreated);
+ // WARNING: cannot use _timelinInfo for this, unless
+ // we'll provide a TimelineInfo object for top level movies
+ // (_level#) too... which would have no use except implementing
+ // isDynamic(). Note that we have NO automated test for this,
but
+ // the "Magical Trevor 2" movie aborts due to a call to
getBytesTotal
+ // against the root movie.
+#ifndef NDEBUG
+ if ( ! m_parent || _timelineInfo.get() )
assert(!_dynamicallyCreated);
+ else assert(_dynamicallyCreated);
+#endif
+ // TODO: _parent && !_timelineInfo.get() might work..
+ assert((m_parent && !_timelineInfo.get()) ==
_dynamicallyCreated);
+ //assert(_timelineInfo.get() ? !_dynamicallyCreated :
_dynamicallyCreated);
return _dynamicallyCreated;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog server/character.h,
Sandro Santilli <=