[Sumover-dev] [svn commit] r4205 - vic/branches/mpeg4/codec

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Tue Jul  1 13:22:40 2008
New Revision: 4205

Modified:
   vic/branches/mpeg4/codec/compositor.cpp

Log:
Fixed Compositor:detach() function - it wasn't doing the right thing before.
Initialised overlays_ member variable to zero (Windows
doesn't always zero initialised variables )

Modified: vic/branches/mpeg4/codec/compositor.cpp
==============================================================================
--- vic/branches/mpeg4/codec/compositor.cpp	(original)
+++ vic/branches/mpeg4/codec/compositor.cpp	Tue Jul  1 13:22:40 2008
@@ -203,6 +203,7 @@
 		delete p;
 		p = n;
 	}
+	overlays_=0;
 }
 
 int Compositor::command(int argc, const char*const* argv)
@@ -281,9 +282,9 @@
 	UNUSED(o); //SV-XXX: unused
 
 	for (onode** op = &overlays_; *op != 0; op = &(*op)->next) {
-		onode* p = (*op)->next;
-		if (*op == p) {
-			damage(p);
+		onode* p = (*op);
+		if (p->overlay == o) {
+			//damage(p);
 			*op = p->next;
 			delete p;
 			return;