[Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/simple_...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/01/25 15:01:39

Modified files:
        .              : ChangeLog 
        testsuite/misc-ming.all: simple_loop_test.c 
                                 simple_loop_testrunner.cpp 

Log message:
                * testsuite/misc-ming.all/simple_loop_test.c: anchor
                  the characters at 0,0 and fix compiler warnings.
                * testsuite/misc-ming.all/simple_loop_testrunner.cpp:
                  fix invalidated bounds checking (but still fails
                  with both bogus and correct version of
                  sprite_instance::execute_frame_tags - odd!)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2174&r2=1.2175
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/simple_loop_test.c?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/simple_loop_testrunner.cpp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2174
retrieving revision 1.2175
diff -u -b -r1.2174 -r1.2175
--- ChangeLog   25 Jan 2007 13:37:45 -0000      1.2174
+++ ChangeLog   25 Jan 2007 15:01:39 -0000      1.2175
@@ -1,5 +1,11 @@
-2007-01-24 Sandro Santilli <address@hidden>
+2007-01-25 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-ming.all/simple_loop_test.c: anchor
+         the characters at 0,0 and fix compiler warnings.
+       * testsuite/misc-ming.all/simple_loop_testrunner.cpp:
+         fix invalidated bounds checking (but still fails
+         with both bogus and correct version of
+         sprite_instance::execute_frame_tags - odd!)
        * server/character.h: more info about set_invalidated()
        * server/sprite_instance.cpp (execute_frame_tags): properly
          call set_invalidated() when resetting DisplayList.

Index: testsuite/misc-ming.all/simple_loop_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/simple_loop_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/simple_loop_test.c  25 Jan 2007 10:55:30 -0000      
1.1
+++ testsuite/misc-ming.all/simple_loop_test.c  25 Jan 2007 15:01:39 -0000      
1.2
@@ -37,10 +37,7 @@
 static SWFShape
 get_shape(int r, int g, int b)
 {
-       SWFMovieClip mc = newSWFMovieClip();
-       SWFShape  sh  = make_fill_square (0, 300, 60, 60, r, g, b, r, g, b);
-       //SWFMovieClip_add(mc, (SWFBlock)sh); 
-       //SWFMovieClip_nextFrame(mc);
+       SWFShape  sh  = make_fill_square (0, 0, 60, 60, r, g, b, r, g, b);
        return sh;
 }
 
@@ -48,7 +45,7 @@
 main(int argc, char** argv)
 {
   SWFMovie mo;
-  SWFMovieClip mc, dejagnuclip;
+  SWFShape sh;
   SWFDisplayItem it;
 
   const char *srcdir=".";
@@ -76,8 +73,8 @@
    * Frame 2
    ***************************************************************/
 
-  mc = get_shape(255, 0, 0);
-  it = SWFMovie_add(mo, (SWFBlock)mc);
+  sh = get_shape(255, 0, 0);
+  it = SWFMovie_add(mo, (SWFBlock)sh);
   SWFDisplayItem_setDepth(it, 2); 
   SWFMovie_nextFrame(mo); 
 
@@ -85,8 +82,8 @@
    * Frame 3
    ***************************************************************/
 
-  mc = get_shape(0, 255, 0);
-  it = SWFMovie_add(mo, (SWFBlock)mc);
+  sh = get_shape(0, 255, 0);
+  it = SWFMovie_add(mo, (SWFBlock)sh);
   SWFDisplayItem_moveTo(it, 60, 0);
   SWFDisplayItem_setDepth(it, 3); 
   SWFMovie_nextFrame(mo); 
@@ -95,8 +92,8 @@
    * Frame 4
    ***************************************************************/
 
-  mc = get_shape(0, 0, 255);
-  it = SWFMovie_add(mo, (SWFBlock)mc);
+  sh = get_shape(0, 0, 255);
+  it = SWFMovie_add(mo, (SWFBlock)sh);
   SWFDisplayItem_moveTo(it, 120, 0);
   SWFDisplayItem_setDepth(it, 4);
   SWFMovie_nextFrame(mo); 

Index: testsuite/misc-ming.all/simple_loop_testrunner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/simple_loop_testrunner.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/simple_loop_testrunner.cpp  25 Jan 2007 10:55:30 
-0000      1.1
+++ testsuite/misc-ming.all/simple_loop_testrunner.cpp  25 Jan 2007 15:01:39 
-0000      1.2
@@ -46,7 +46,7 @@
        gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
        dbglogfile.setVerbosity(1);
 
-       Bounds invalidatedBounds;
+       Bounds invalidated;
        sprite_instance* root = tester.getRootMovie();
        assert(root);
 
@@ -56,9 +56,8 @@
        check_equals(root->get_play_state(), sprite_instance::PLAY);
        check_equals(root->get_current_frame(), 0);
        check_equals(root->getDisplayList().size(), 0); // no chars
-
-       invalidatedBounds = tester.getInvalidatedBounds();
-       check_equals(invalidatedBounds, Bounds().setNull());
+       invalidated = tester.getInvalidatedBounds();
+       check( invalidated.isNull() );
 
        tester.advance(); // FRAME 2/4
        
@@ -66,17 +65,18 @@
        check_equals(root->get_current_frame(), 1);
        check_equals(root->getDisplayList().size(), 1);
        check( tester.findDisplayItemByDepth(*root, 2) );
-       xcheck_equals( invalidatedBounds, Bounds(0, 0, 60, 60) );
+       invalidated = tester.getInvalidatedBounds();
+       check( invalidated.intersects(Bounds(0, 0, 60, 60)) );
 
        tester.advance(); // FRAME 3/4
        
        check_equals(root->get_play_state(), sprite_instance::PLAY);
        check_equals(root->get_current_frame(), 2);
-
        check_equals(root->getDisplayList().size(), 2);
        check( tester.findDisplayItemByDepth(*root, 2) );
        check( tester.findDisplayItemByDepth(*root, 3) );
-       xcheck_equals( invalidatedBounds, Bounds(60, 0, 120, 60) );
+       invalidated = tester.getInvalidatedBounds();
+       check( invalidated.intersects(Bounds(60, 0, 120, 60)) );
 
        tester.advance(); // FRAME 4/4
        
@@ -86,33 +86,35 @@
        check( tester.findDisplayItemByDepth(*root, 2) );
        check( tester.findDisplayItemByDepth(*root, 3) );
        check( tester.findDisplayItemByDepth(*root, 4) );
-       xcheck_equals( invalidatedBounds, Bounds(120, 0, 180, 60) );
+       invalidated = tester.getInvalidatedBounds();
+       check( invalidated.intersects(Bounds(120, 0, 180, 60)) );
 
        tester.advance(); // FRAME 1/4 (loop back)
        
        check_equals(root->get_play_state(), sprite_instance::PLAY);
        check_equals(root->get_current_frame(), 0);
        check_equals(root->getDisplayList().size(), 0);
-       xcheck_equals( invalidatedBounds, Bounds(0, 0, 180, 60) );
+       invalidated = tester.getInvalidatedBounds();
+       xcheck( invalidated.intersects(Bounds(0, 0, 180, 60)) );
 
        tester.advance(); // FRAME 2/4
        
        check_equals(root->get_play_state(), sprite_instance::PLAY);
        check_equals(root->get_current_frame(), 1);
-
        check_equals(root->getDisplayList().size(), 1);
        check( tester.findDisplayItemByDepth(*root, 2) );
-       xcheck_equals( invalidatedBounds, Bounds(0, 0, 60, 60) );
+       invalidated = tester.getInvalidatedBounds();
+       check( invalidated.intersects(Bounds(0, 0, 60, 60)) );
 
        tester.advance(); // FRAME 3/4
        
        check_equals(root->get_play_state(), sprite_instance::PLAY);
        check_equals(root->get_current_frame(), 2);
-
        check_equals(root->getDisplayList().size(), 2);
        check( tester.findDisplayItemByDepth(*root, 2) );
        check( tester.findDisplayItemByDepth(*root, 3) );
-       xcheck_equals( invalidatedBounds, Bounds(60, 0, 120, 60) );
+       invalidated = tester.getInvalidatedBounds();
+       check( invalidated.intersects(Bounds(60, 0, 120, 60)) );
 
        tester.advance(); // FRAME 4/4
        
@@ -122,7 +124,8 @@
        check( tester.findDisplayItemByDepth(*root, 2) );
        check( tester.findDisplayItemByDepth(*root, 3) );
        check( tester.findDisplayItemByDepth(*root, 4) );
-       xcheck_equals( invalidatedBounds, Bounds(120, 0, 180, 60) );
+       invalidated = tester.getInvalidatedBounds();
+       check( invalidated.intersects(Bounds(120, 0, 180, 60)) );
 
 }