gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnash-commit] [SCM] Gnash branch, master, updated. 842fe5cd6002d4116069


From: Benjamin Wolsey
Subject: [Gnash-commit] [SCM] Gnash branch, master, updated. 842fe5cd6002d411606941af23bc17ad9e6c8da7
Date: Sat, 30 Oct 2010 17:11:43 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  842fe5cd6002d411606941af23bc17ad9e6c8da7 (commit)
      from  dac017fc93723259e3beba2d8da804219fce4ee9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=842fe5cd6002d411606941af23bc17ad9e6c8da7


commit 842fe5cd6002d411606941af23bc17ad9e6c8da7
Author: Benjamin Wolsey <address@hidden>
Date:   Sat Oct 30 18:56:15 2010 +0200

    Fix various warnings in misc-ming.all.

diff --git a/testsuite/misc-ming.all/BitmapDataTest.c 
b/testsuite/misc-ming.all/BitmapDataTest.c
index 28f5fb3..8f5bbce 100644
--- a/testsuite/misc-ming.all/BitmapDataTest.c
+++ b/testsuite/misc-ming.all/BitmapDataTest.c
@@ -25,6 +25,8 @@
 #define OUTPUT_VERSION 8
 #define OUTPUT_FILENAME "BitmapDataTest.swf"
 
+void addRedSquareExport(SWFMovie mo);
+
 const char* mediadir=".";
 
 void
@@ -51,7 +53,6 @@ int
 main(int argc, char** argv)
 {
   SWFMovie mo;
-  SWFMovieClip mc;
   SWFMovieClip dejagnuclip, staticSquare;
   SWFShape shape;
   SWFDisplayItem it;
diff --git a/testsuite/misc-ming.all/BitmapSmoothingTest.c 
b/testsuite/misc-ming.all/BitmapSmoothingTest.c
index fc0ceb4..90b3f39 100644
--- a/testsuite/misc-ming.all/BitmapSmoothingTest.c
+++ b/testsuite/misc-ming.all/BitmapSmoothingTest.c
@@ -37,8 +37,6 @@ main(int argc, char **argv)
        SWFMovie mo;
        SWFInput in;
        SWFBitmap bitmap;
-       SWFFillStyle smtFill;
-       SWFFillStyle hrdFill;
        SWFShape shpSmt;
        SWFShape shpHrd;
        SWFMovieClip mc;
diff --git a/testsuite/misc-ming.all/ButtonEventsTest.c 
b/testsuite/misc-ming.all/ButtonEventsTest.c
index 812ee26..2365ec8 100644
--- a/testsuite/misc-ming.all/ButtonEventsTest.c
+++ b/testsuite/misc-ming.all/ButtonEventsTest.c
@@ -112,7 +112,7 @@ add_button(SWFMovie mo)
        if ( ! ermc )
        {
                ermc = newSWFMovieClip();
-               SWFMovieClip_add(ermc, newSWFAction(
+               SWFMovieClip_add(ermc, (SWFBlock)newSWFAction(
                        "_global.dumpObj = function(o,indent) {"
                        "       var s = '';"
                        "       if ( typeof(o) == 'object' ) {"
diff --git a/testsuite/misc-ming.all/DefineEditTextVariableNameTest.c 
b/testsuite/misc-ming.all/DefineEditTextVariableNameTest.c
index 82bf96a..94b8037 100644
--- a/testsuite/misc-ming.all/DefineEditTextVariableNameTest.c
+++ b/testsuite/misc-ming.all/DefineEditTextVariableNameTest.c
@@ -63,6 +63,7 @@ void add_text_field(SWFMovieClip mo, SWFBlock font, const 
char* varname, const c
 void set_text(SWFMovie mo, const char* txt, const char* varname);
 void shift_horizontally(SWFMovie mo, const char* what, int howmuch);
 void set_x(SWFMovie mo, const char* what, int x);
+void setVariableName(SWFMovie mo, const char* txt, const char* varname);
 
 void
 shift_horizontally(SWFMovie mo, const char* what, int howmuch)
diff --git a/testsuite/misc-ming.all/DefineTextTest.c 
b/testsuite/misc-ming.all/DefineTextTest.c
index a84c0c6..0bc26c3 100644
--- a/testsuite/misc-ming.all/DefineTextTest.c
+++ b/testsuite/misc-ming.all/DefineTextTest.c
@@ -85,7 +85,6 @@ main(int argc, char** argv)
       perror(fdbfont);
       exit(1);
     }
-    SWFBrowserFont bfont = newSWFBrowserFont("_sans");
     SWFFont efont = loadSWFFontFromFile(font_file);
 
     tf = newSWFText();
diff --git a/testsuite/misc-ming.all/DepthLimitsTest.c 
b/testsuite/misc-ming.all/DepthLimitsTest.c
index 70d5437..0e0c336 100644
--- a/testsuite/misc-ming.all/DepthLimitsTest.c
+++ b/testsuite/misc-ming.all/DepthLimitsTest.c
@@ -35,6 +35,8 @@
 #define OUTPUT_VERSION 6
 #define OUTPUT_FILENAME "DepthLimitsTest.swf"
 
+void addRedSquareExport(SWFMovie mo);
+
 void
 addRedSquareExport(SWFMovie mo)
 {
diff --git a/testsuite/misc-ming.all/DragDropTestRunner.cpp 
b/testsuite/misc-ming.all/DragDropTestRunner.cpp
index 5728507..319f853 100644
--- a/testsuite/misc-ming.all/DragDropTestRunner.cpp
+++ b/testsuite/misc-ming.all/DragDropTestRunner.cpp
@@ -60,8 +60,6 @@ main(int /*argc*/, char** /*argv*/)
        rgba green(0, 255, 0, 255);     // green circles fill color
        rgba red(255, 0, 0, 255);       // red circles fill color
 
-       int cs = 20;             // circles size
-
        point out(350, 100);  // out of any drawing
 
        point rc1(50, 50);    // first red circle
diff --git a/testsuite/misc-ming.all/TextSnapshotTest.c 
b/testsuite/misc-ming.all/TextSnapshotTest.c
index c996192..3cc64b1 100644
--- a/testsuite/misc-ming.all/TextSnapshotTest.c
+++ b/testsuite/misc-ming.all/TextSnapshotTest.c
@@ -106,7 +106,6 @@ main(int argc, char** argv)
       perror(fdbfont);
       exit(1);
     }
-    SWFBrowserFont bfont = newSWFBrowserFont("_sans");
     SWFFont efont = loadSWFFontFromFile(font_file);
 
     it = add_text_field(mo, efont, "First text");
diff --git a/testsuite/misc-ming.all/Video-EmbedSquareTest.c 
b/testsuite/misc-ming.all/Video-EmbedSquareTest.c
index ccc6657..5ba4d0f 100644
--- a/testsuite/misc-ming.all/Video-EmbedSquareTest.c
+++ b/testsuite/misc-ming.all/Video-EmbedSquareTest.c
@@ -52,7 +52,6 @@ main(int argc, char** argv)
   int frames;
   SWFVideoStream stream;
   SWFDisplayItem item;
-  SWFMovieClip mc;
   SWFMovieClip dejagnuclip;
   FILE *flv, *font_file;
   SWFFont font;
diff --git a/testsuite/misc-ming.all/Video-EmbedSquareTestRunner.cpp 
b/testsuite/misc-ming.all/Video-EmbedSquareTestRunner.cpp
index fa8d2c9..9d4748e 100644
--- a/testsuite/misc-ming.all/Video-EmbedSquareTestRunner.cpp
+++ b/testsuite/misc-ming.all/Video-EmbedSquareTestRunner.cpp
@@ -88,10 +88,12 @@ main(int /*argc*/, char** /*argv*/)
                {
                        // Frame X
                        tester.advance();
-                       int framenum = root->get_current_frame();
+                       size_t framenum = root->get_current_frame();
+            assert(framenum > 0);
+
                        cout << "---- Pixel checking in frame " << framenum+1 
<< " play state " << root->getPlayState() << endl;
                        
-                       int i = (framenum-1)*10;
+                       size_t i = (framenum-1)*10;
 
                        // Check the color in (5+i,5) - should be yellow
                        check_pixel((5 + i)*scale_x, 5, 2, yellow, 5);
@@ -108,8 +110,7 @@ main(int /*argc*/, char** /*argv*/)
                                check_pixel((45 + i)*scale_x, 5, 2, yellow, 5);
                        }
 
-                       if ( framenum == framecount-2 )
-                       {
+                       if (framenum + 2 == framecount) {
                                // check we're playing, or we'll never get to 
next loop...
                                check_equals(root->getPlayState(), 
MovieClip::PLAYSTATE_PLAY);
                                break;
diff --git a/testsuite/misc-ming.all/action_execution_order_test3.c 
b/testsuite/misc-ming.all/action_execution_order_test3.c
index 59c6341..63bbfcb 100644
--- a/testsuite/misc-ming.all/action_execution_order_test3.c
+++ b/testsuite/misc-ming.all/action_execution_order_test3.c
@@ -41,7 +41,7 @@ int
 main(int argc, char** argv)
 {
   SWFMovie mo;
-  SWFMovieClip  mc_red1, mc_red2, mc_red3, dejagnuclip;
+  SWFMovieClip  mc_red1, dejagnuclip;
   SWFShape  sh_red;
 
   const char *srcdir=".";
@@ -71,7 +71,7 @@ main(int argc, char** argv)
   SWFMovieClip_nextFrame(mc_red1); /* mc_red1, 1st frame */
    
   /* add mc_red1 to _root and name it as "mc_red1" */
-  SWFDisplayItem it_red1, it_red2, it_red3;
+  SWFDisplayItem it_red1, it_red2;
   it_red1 = SWFMovie_add(mo, (SWFBlock)mc_red1);  // PlaceObject2
   SWFDisplayItem_setDepth(it_red1, 10); 
   SWFDisplayItem_addAction(it_red1,
diff --git a/testsuite/misc-ming.all/action_execution_order_test4.c 
b/testsuite/misc-ming.all/action_execution_order_test4.c
index f0eba3d..428a2de 100644
--- a/testsuite/misc-ming.all/action_execution_order_test4.c
+++ b/testsuite/misc-ming.all/action_execution_order_test4.c
@@ -66,8 +66,8 @@ int
 main(int argc, char** argv)
 {
   SWFMovie mo;
-  SWFMovieClip  mc1, mc2, mc3, mc4, mc5, dejagnuclip;
-  SWFDisplayItem it1, it2, it3, it4, it5;
+  SWFMovieClip  mc1, mc2, mc3, dejagnuclip;
+  SWFDisplayItem it1, it2, it3;
   SWFShape  sh_red;
 
   const char *srcdir=".";
diff --git a/testsuite/misc-ming.all/action_execution_order_test9.c 
b/testsuite/misc-ming.all/action_execution_order_test9.c
index 2af4645..7a14a83 100644
--- a/testsuite/misc-ming.all/action_execution_order_test9.c
+++ b/testsuite/misc-ming.all/action_execution_order_test9.c
@@ -35,6 +35,8 @@
 #define OUTPUT_VERSION 6
 #define OUTPUT_FILENAME "action_execution_order_test9.swf"
 
+SWFDisplayItem add_static_mc(SWFMovie mo, const char* name,
+        const char* scripts, int depth);
 
 SWFDisplayItem
 add_static_mc(SWFMovie mo, const char* name, const char* scripts, int depth)
diff --git a/testsuite/misc-ming.all/attachMovieTest.c 
b/testsuite/misc-ming.all/attachMovieTest.c
index 8c15869..455da9f 100644
--- a/testsuite/misc-ming.all/attachMovieTest.c
+++ b/testsuite/misc-ming.all/attachMovieTest.c
@@ -35,6 +35,8 @@
 #define OUTPUT_VERSION 6
 #define OUTPUT_FILENAME "attachMovieTest.swf"
 
+void addRedSquareExport(SWFMovie mo);
+
 void
 addRedSquareExport(SWFMovie mo)
 {
diff --git a/testsuite/misc-ming.all/displaylist_depths_test10.c 
b/testsuite/misc-ming.all/displaylist_depths_test10.c
index cadd496..c5ac3df 100644
--- a/testsuite/misc-ming.all/displaylist_depths_test10.c
+++ b/testsuite/misc-ming.all/displaylist_depths_test10.c
@@ -60,7 +60,7 @@ SWFDisplayItem
 add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int 
width, int height)
 {
   SWFShape sh;
-  SWFMovieClip mc, mc2;
+  SWFMovieClip mc;
   SWFDisplayItem it;
 
   sh = make_fill_square (-(width/2), -(height/2), width, height, 255, 0, 0, 
255, 0, 0);
@@ -83,7 +83,6 @@ main(int argc, char** argv)
 {
   SWFMovie mo;
   SWFMovieClip dejagnuclip;
-  int i;
   SWFDisplayItem it1;
 
 
diff --git a/testsuite/misc-ming.all/displaylist_depths_test11.c 
b/testsuite/misc-ming.all/displaylist_depths_test11.c
index d1d3a86..845bea3 100644
--- a/testsuite/misc-ming.all/displaylist_depths_test11.c
+++ b/testsuite/misc-ming.all/displaylist_depths_test11.c
@@ -97,7 +97,6 @@ main(int argc, char** argv)
 {
   SWFMovie mo;
   SWFMovieClip dejagnuclip, static3;
-  int i;
   SWFDisplayItem it1;
 
 
diff --git a/testsuite/misc-ming.all/displaylist_depths_test2.c 
b/testsuite/misc-ming.all/displaylist_depths_test2.c
index 6df83c8..892e63b 100644
--- a/testsuite/misc-ming.all/displaylist_depths_test2.c
+++ b/testsuite/misc-ming.all/displaylist_depths_test2.c
@@ -71,7 +71,7 @@ SWFDisplayItem
 add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int 
width, int height)
 {
        SWFShape sh;
-       SWFMovieClip mc, mc2;
+       SWFMovieClip mc;
        SWFDisplayItem it;
 
        sh = make_fill_square (-(width/2), -(height/2), width, height, 255, 0, 
0, 255, 0, 0);
@@ -105,8 +105,7 @@ main(int argc, char** argv)
 {
        SWFMovie mo;
        SWFMovieClip dejagnuclip;
-       int i;
-       SWFDisplayItem it1,it2,it3,it4;
+       SWFDisplayItem it1;
 
 
        const char *srcdir=".";
diff --git a/testsuite/misc-ming.all/displaylist_depths_test3.c 
b/testsuite/misc-ming.all/displaylist_depths_test3.c
index c0406ae..c8dda99 100644
--- a/testsuite/misc-ming.all/displaylist_depths_test3.c
+++ b/testsuite/misc-ming.all/displaylist_depths_test3.c
@@ -68,7 +68,7 @@ SWFDisplayItem
 add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int 
width, int height)
 {
        SWFShape sh;
-       SWFMovieClip mc, mc2;
+       SWFMovieClip mc;
        SWFDisplayItem it;
 
        sh = make_fill_square (-(width/2), -(height/2), width, height, 255, 0, 
0, 255, 0, 0);
@@ -102,8 +102,7 @@ main(int argc, char** argv)
 {
        SWFMovie mo;
        SWFMovieClip dejagnuclip;
-       int i;
-       SWFDisplayItem it1,it2,it3,it4;
+       SWFDisplayItem it1;
 
 
        const char *srcdir=".";
diff --git a/testsuite/misc-ming.all/displaylist_depths_test4.c 
b/testsuite/misc-ming.all/displaylist_depths_test4.c
index 88fae4a..a329448 100644
--- a/testsuite/misc-ming.all/displaylist_depths_test4.c
+++ b/testsuite/misc-ming.all/displaylist_depths_test4.c
@@ -66,7 +66,7 @@ SWFDisplayItem
 add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int 
width, int height)
 {
        SWFShape sh;
-       SWFMovieClip mc, mc2;
+       SWFMovieClip mc;
        SWFDisplayItem it;
 
        sh = make_fill_square (-(width/2), -(height/2), width, height, 255, 0, 
0, 255, 0, 0);
@@ -100,8 +100,7 @@ main(int argc, char** argv)
 {
        SWFMovie mo;
        SWFMovieClip dejagnuclip;
-       int i;
-       SWFDisplayItem it1,it2,it3,it4;
+       SWFDisplayItem it1;
 
 
        const char *srcdir=".";
diff --git a/testsuite/misc-ming.all/displaylist_depths_test5.c 
b/testsuite/misc-ming.all/displaylist_depths_test5.c
index 83e680f..2fa41e6 100644
--- a/testsuite/misc-ming.all/displaylist_depths_test5.c
+++ b/testsuite/misc-ming.all/displaylist_depths_test5.c
@@ -65,7 +65,7 @@ SWFDisplayItem
 add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int 
width, int height)
 {
        SWFShape sh;
-       SWFMovieClip mc, mc2;
+       SWFMovieClip mc;
        SWFDisplayItem it;
 
        sh = make_fill_square (-(width/2), -(height/2), width, height, 255, 0, 
0, 255, 0, 0);
@@ -99,8 +99,7 @@ main(int argc, char** argv)
 {
        SWFMovie mo;
        SWFMovieClip dejagnuclip;
-       int i;
-       SWFDisplayItem it1,it2,it3,it4;
+       SWFDisplayItem it1;
 
 
        const char *srcdir=".";
diff --git a/testsuite/misc-ming.all/displaylist_depths_test6.c 
b/testsuite/misc-ming.all/displaylist_depths_test6.c
index 09dd9a4..8eb3039 100644
--- a/testsuite/misc-ming.all/displaylist_depths_test6.c
+++ b/testsuite/misc-ming.all/displaylist_depths_test6.c
@@ -67,7 +67,7 @@ SWFDisplayItem
 add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int 
width, int height)
 {
   SWFShape sh;
-  SWFMovieClip mc, mc2;
+  SWFMovieClip mc;
   SWFDisplayItem it;
 
   sh = make_fill_square (-(width/2), -(height/2), width, height, 255, 0, 0, 
255, 0, 0);
@@ -90,7 +90,6 @@ main(int argc, char** argv)
 {
   SWFMovie mo;
   SWFMovieClip dejagnuclip;
-  int i;
   SWFDisplayItem it1;
 
 
diff --git a/testsuite/misc-ming.all/displaylist_depths_test7.c 
b/testsuite/misc-ming.all/displaylist_depths_test7.c
index 8ebe6d6..28b8d31 100644
--- a/testsuite/misc-ming.all/displaylist_depths_test7.c
+++ b/testsuite/misc-ming.all/displaylist_depths_test7.c
@@ -68,7 +68,7 @@ SWFDisplayItem
 add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int 
width, int height)
 {
   SWFShape sh;
-  SWFMovieClip mc, mc2;
+  SWFMovieClip mc;
   SWFDisplayItem it;
 
   sh = make_fill_square (-(width/2), -(height/2), width, height, 255, 0, 0, 
255, 0, 0);
@@ -91,7 +91,6 @@ main(int argc, char** argv)
 {
   SWFMovie mo;
   SWFMovieClip dejagnuclip;
-  int i;
   SWFDisplayItem it1;
 
 
diff --git a/testsuite/misc-ming.all/displaylist_depths_test8.c 
b/testsuite/misc-ming.all/displaylist_depths_test8.c
index d5a0774..3da5b7c 100644
--- a/testsuite/misc-ming.all/displaylist_depths_test8.c
+++ b/testsuite/misc-ming.all/displaylist_depths_test8.c
@@ -70,7 +70,7 @@ SWFDisplayItem
 add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int 
width, int height)
 {
   SWFShape sh;
-  SWFMovieClip mc, mc2;
+  SWFMovieClip mc;
   SWFDisplayItem it;
 
   sh = make_fill_square (-(width/2), -(height/2), width, height, 255, 0, 0, 
255, 0, 0);
@@ -93,7 +93,6 @@ main(int argc, char** argv)
 {
   SWFMovie mo;
   SWFMovieClip dejagnuclip;
-  int i;
   SWFDisplayItem it1;
 
 
diff --git a/testsuite/misc-ming.all/displaylist_depths_test9.c 
b/testsuite/misc-ming.all/displaylist_depths_test9.c
index 6aca839..e9fa6ac 100644
--- a/testsuite/misc-ming.all/displaylist_depths_test9.c
+++ b/testsuite/misc-ming.all/displaylist_depths_test9.c
@@ -66,7 +66,7 @@ SWFDisplayItem
 add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int 
width, int height)
 {
   SWFShape sh;
-  SWFMovieClip mc, mc2;
+  SWFMovieClip mc;
   SWFDisplayItem it;
 
   sh = make_fill_square (-(width/2), -(height/2), width, height, 255, 0, 0, 
255, 0, 0);
@@ -89,7 +89,6 @@ main(int argc, char** argv)
 {
   SWFMovie mo;
   SWFMovieClip dejagnuclip;
-  int i;
   SWFDisplayItem it1, it2;
 
 
diff --git a/testsuite/misc-ming.all/eventSoundTest1-Runner.cpp 
b/testsuite/misc-ming.all/eventSoundTest1-Runner.cpp
index e578ab4..bf813ce 100644
--- a/testsuite/misc-ming.all/eventSoundTest1-Runner.cpp
+++ b/testsuite/misc-ming.all/eventSoundTest1-Runner.cpp
@@ -58,18 +58,12 @@ main(int /*argc*/, char** /*argv*/)
 
        tester.advance();
 
-       gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
-       //dbglogfile.setVerbosity(2);
-       //dbglogfile.setActionDump(1);
-
        MovieClip* root = tester.getRootMovie();
        assert(root);
 
        VM& vm = getVM(*getObject(root));
        string_table& st = vm.getStringTable();
 
-       //check_equals(root->get_frame_count(), 20);
-
        if ( ! tester.canTestSound() )
        {
                cout << "UNTESTED: sounds can't be tested with this build." << 
endl;
diff --git a/testsuite/misc-ming.all/goto_frame_test.c 
b/testsuite/misc-ming.all/goto_frame_test.c
index 13c5d1a..ee8b111 100644
--- a/testsuite/misc-ming.all/goto_frame_test.c
+++ b/testsuite/misc-ming.all/goto_frame_test.c
@@ -61,6 +61,9 @@
 #define OUTPUT_VERSION 6
 #define OUTPUT_FILENAME "goto_frame_test.swf"
 
+
+SWFDisplayItem add_static_mc(SWFMovie mo, const char* name, int depth);
+
 SWFDisplayItem
 add_static_mc(SWFMovie mo, const char* name, int depth)
 {
diff --git a/testsuite/misc-ming.all/instanceNameTest.c 
b/testsuite/misc-ming.all/instanceNameTest.c
index dc821cf..1bba76d 100644
--- a/testsuite/misc-ming.all/instanceNameTest.c
+++ b/testsuite/misc-ming.all/instanceNameTest.c
@@ -38,10 +38,8 @@ int
 main(int argc, char** argv)
 {
   SWFMovie mo;
-  SWFDisplayItem it1, it2, it3;
+  SWFDisplayItem it1, it2;
   SWFMovieClip mc1, mc2, dejagnuclip;
-  SWFAction ac;
-  int i;
   const char *srcdir=".";
 
   if ( argc>1 ) 
diff --git a/testsuite/misc-ming.all/key_event_test.c 
b/testsuite/misc-ming.all/key_event_test.c
index f23784a..a0d1b74 100644
--- a/testsuite/misc-ming.all/key_event_test.c
+++ b/testsuite/misc-ming.all/key_event_test.c
@@ -26,6 +26,8 @@
 #define OUTPUT_VERSION  6
 #define OUTPUT_FILENAME  "key_event_test.swf"
 
+SWFDisplayItem add_static_mc(SWFMovie mo, const char* name, int depth);
+
 SWFDisplayItem
 add_static_mc(SWFMovie mo, const char* name, int depth)
 {
@@ -50,7 +52,7 @@ int
 main(int argc, char** argv)
 {
   SWFMovie mo;
-  SWFMovieClip  mc, dejagnuclip;
+  SWFMovieClip dejagnuclip;
   SWFDisplayItem  it, it1, it2, it3;
 
   const char *srcdir=".";
diff --git a/testsuite/misc-ming.all/loop/loop_test.c 
b/testsuite/misc-ming.all/loop/loop_test.c
index b54d358..95a9858 100644
--- a/testsuite/misc-ming.all/loop/loop_test.c
+++ b/testsuite/misc-ming.all/loop/loop_test.c
@@ -87,16 +87,9 @@ main(int argc, char** argv)
   SWFMovieClip mc1, mc2, dejagnuclip;
   SWFShape  sh1,sh2;
   SWFAction ac;
-  int i;
 
   const char *srcdir=".";
-  if ( argc>1 ) 
-    srcdir=argv[1];
-  else
-  {
-      //fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
-      //return 1;
-  }
+  if (argc > 1) srcdir=argv[1];
 
   Ming_init();
   Ming_useSWFVersion (OUTPUT_VERSION);
@@ -107,19 +100,18 @@ main(int argc, char** argv)
 
   dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 
800, 600);
   SWFMovie_add(mo, (SWFBlock)dejagnuclip);
-  //SWFMovie_nextFrame(mo); 
 
 
   sh1 = make_fill_square (300, 300, 60, 60, 255, 0, 0, 255, 0, 0);
   mc1 = newSWFMovieClip();
   SWFMovieClip_add(mc1, (SWFBlock)sh1); 
-  SWFMovieClip_add(mc1, newSWFAction("_root.mc1Executed++;"));
+  SWFMovieClip_add(mc1, (SWFBlock)newSWFAction("_root.mc1Executed++;"));
   SWFMovieClip_nextFrame(mc1);
   
   sh2 = make_fill_square (330, 270, 120, 120, 0, 0, 0, 0, 0, 0);
   mc2 = newSWFMovieClip();
   SWFMovieClip_add(mc2, (SWFBlock)sh2);  
-  SWFMovieClip_add(mc2, newSWFAction("_root.mc2Executed++;"));
+  SWFMovieClip_add(mc2, (SWFBlock)newSWFAction("_root.mc2Executed++;"));
   SWFMovieClip_nextFrame(mc2); 
 
   SWFDisplayItem it1, it2;
diff --git a/testsuite/misc-ming.all/loop/loop_test10.c 
b/testsuite/misc-ming.all/loop/loop_test10.c
index 9d4eb63..e2c027f 100644
--- a/testsuite/misc-ming.all/loop/loop_test10.c
+++ b/testsuite/misc-ming.all/loop/loop_test10.c
@@ -109,14 +109,12 @@ main(int argc, char** argv)
 {
   SWFMovie mo;
   SWFDisplayItem it1, it2, it3;
-  SWFDisplayItem it4, it41;
-  SWFDisplayItem it5, it51;
+  SWFDisplayItem it41;
+  SWFDisplayItem it51;
   SWFMovieClip mc1, mc2, mc3, dejagnuclip;
   SWFMovieClip mc4, mc41;
   SWFMovieClip mc5, mc51;
   SWFShape  sh1, sh2, sh3;
-  SWFAction ac;
-  int i;
 
   const char *srcdir=".";
   if ( argc>1 ) 
diff --git a/testsuite/misc-ming.all/loop/loop_test2.c 
b/testsuite/misc-ming.all/loop/loop_test2.c
index 48ec835..65e27a1 100644
--- a/testsuite/misc-ming.all/loop/loop_test2.c
+++ b/testsuite/misc-ming.all/loop/loop_test2.c
@@ -62,8 +62,6 @@ main(int argc, char** argv)
   SWFMovie mo;
   SWFMovieClip mc1, mc2, dejagnuclip;
   SWFShape  sh1,sh2;
-  SWFAction ac;
-  int i;
 
   const char *srcdir=".";
   if ( argc>1 ) 
diff --git a/testsuite/misc-ming.all/loop/loop_test3.c 
b/testsuite/misc-ming.all/loop/loop_test3.c
index fd0dec9..952b288 100644
--- a/testsuite/misc-ming.all/loop/loop_test3.c
+++ b/testsuite/misc-ming.all/loop/loop_test3.c
@@ -64,8 +64,6 @@ main(int argc, char** argv)
   SWFMovieClip mc1, mc2, dejagnuclip;
   SWFDisplayItem it1, it2;
   SWFShape  sh1,sh2;
-  SWFAction ac;
-  int i;
 
   const char *srcdir=".";
   if ( argc>1 ) 
diff --git a/testsuite/misc-ming.all/loop/loop_test4.c 
b/testsuite/misc-ming.all/loop/loop_test4.c
index 396307a..a48b65e 100644
--- a/testsuite/misc-ming.all/loop/loop_test4.c
+++ b/testsuite/misc-ming.all/loop/loop_test4.c
@@ -73,8 +73,6 @@ main(int argc, char** argv)
   SWFMovieClip mc1, mc2, dejagnuclip;
   SWFDisplayItem it1, it2;
   SWFShape  sh1,sh2;
-  SWFAction ac;
-  int i;
 
   const char *srcdir=".";
   if ( argc>1 ) 
diff --git a/testsuite/misc-ming.all/loop/loop_test5.c 
b/testsuite/misc-ming.all/loop/loop_test5.c
index b5dcf0a..4dc4f98 100644
--- a/testsuite/misc-ming.all/loop/loop_test5.c
+++ b/testsuite/misc-ming.all/loop/loop_test5.c
@@ -72,8 +72,6 @@ main(int argc, char** argv)
   SWFMovieClip mc1, mc2, dejagnuclip;
   SWFDisplayItem it1, it2;
   SWFShape  sh1,sh2;
-  SWFAction ac;
-  int i;
 
   const char *srcdir=".";
   if ( argc>1 ) 
diff --git a/testsuite/misc-ming.all/loop/loop_test6.c 
b/testsuite/misc-ming.all/loop/loop_test6.c
index c78f112..385cb60 100644
--- a/testsuite/misc-ming.all/loop/loop_test6.c
+++ b/testsuite/misc-ming.all/loop/loop_test6.c
@@ -69,8 +69,6 @@ main(int argc, char** argv)
   SWFMovieClip mc1, mc2, dejagnuclip;
   SWFDisplayItem it1, it2;
   SWFShape  sh1,sh2;
-  SWFAction ac;
-  int i;
 
   const char *srcdir=".";
   if ( argc>1 ) 
diff --git a/testsuite/misc-ming.all/loop/loop_test7.c 
b/testsuite/misc-ming.all/loop/loop_test7.c
index 0aed4f4..f0658da 100644
--- a/testsuite/misc-ming.all/loop/loop_test7.c
+++ b/testsuite/misc-ming.all/loop/loop_test7.c
@@ -59,11 +59,9 @@ int
 main(int argc, char** argv)
 {
   SWFMovie mo;
-  SWFMovieClip mc1, mc2, dejagnuclip;
-  SWFDisplayItem it1, it2;
-  SWFShape  sh1,sh2;
-  SWFAction ac;
-  int i;
+  SWFMovieClip mc1, dejagnuclip;
+  SWFDisplayItem it1;
+  SWFShape sh1;
 
   const char *srcdir=".";
   if ( argc>1 ) 
diff --git a/testsuite/misc-ming.all/loop/loop_test8.c 
b/testsuite/misc-ming.all/loop/loop_test8.c
index e2a4bda..0ce6b33 100644
--- a/testsuite/misc-ming.all/loop/loop_test8.c
+++ b/testsuite/misc-ming.all/loop/loop_test8.c
@@ -64,6 +64,8 @@
 #define OUTPUT_VERSION 6
 #define OUTPUT_FILENAME "loop_test8.swf"
 
+SWFDisplayItem
+add_static_mc(SWFMovie mo, const char* name, const char* color, int depth, 
float ratio);
 
 SWFDisplayItem
 add_static_mc(SWFMovie mo, const char* name, const char* color, int depth, 
float ratio)
diff --git a/testsuite/misc-ming.all/loop/loop_test9.c 
b/testsuite/misc-ming.all/loop/loop_test9.c
index e75b0aa..a270cc8 100644
--- a/testsuite/misc-ming.all/loop/loop_test9.c
+++ b/testsuite/misc-ming.all/loop/loop_test9.c
@@ -62,8 +62,6 @@ main(int argc, char** argv)
   SWFMovieClip mc1, mc2, mc3, dejagnuclip;
   SWFShape  sh1, sh2, sh3;
   SWFDisplayItem it1, it2, it3;
-  SWFAction ac;
-  int i;
 
   const char *srcdir=".";
   if ( argc>1 ) 
diff --git a/testsuite/misc-ming.all/morph_test1runner.cpp 
b/testsuite/misc-ming.all/morph_test1runner.cpp
index 92444f0..ae09b7f 100644
--- a/testsuite/misc-ming.all/morph_test1runner.cpp
+++ b/testsuite/misc-ming.all/morph_test1runner.cpp
@@ -47,11 +47,6 @@ main(int /*argc*/, char** /*argv*/)
   rgba red(255,0,0,255);   //start color
   rgba green(0,255,0,255); //end color
 
-  int start_x = 0;  //start coordinates of LU point
-  int start_y = 0;
-  int end_x = 700;  //end coordinates of LU point
-  int end_y = 500;
-
   MovieClip* root = tester.getRootMovie();
   assert(root);
   check_equals(root->get_frame_count(), 7);
diff --git a/testsuite/misc-ming.all/moviecliploader_test.c 
b/testsuite/misc-ming.all/moviecliploader_test.c
index 46a0b45..a486119 100644
--- a/testsuite/misc-ming.all/moviecliploader_test.c
+++ b/testsuite/misc-ming.all/moviecliploader_test.c
@@ -38,6 +38,7 @@
 #define OUTPUT_VERSION 7
 #define OUTPUT_FILENAME "moviecliploader_test.swf"
 
+void add_clip(SWFMovie mo, char* file, char* name, char* url, int x, int y);
 
 void
 add_clip(SWFMovie mo, char* file, char* name,
diff --git a/testsuite/misc-ming.all/place_object_test.c 
b/testsuite/misc-ming.all/place_object_test.c
index 90cf173..4a16c5d 100644
--- a/testsuite/misc-ming.all/place_object_test.c
+++ b/testsuite/misc-ming.all/place_object_test.c
@@ -48,8 +48,6 @@ main(int argc, char** argv)
        SWFMovieClip mc1, mc2, dejagnuclip;
        SWFDisplayItem it;
        SWFShape  sh1,sh2;
-       SWFAction ac1, ac2;
-       int i;
 
        const char *srcdir=".";
        if ( argc>1 ) 
diff --git a/testsuite/misc-ming.all/registerClassTest2.c 
b/testsuite/misc-ming.all/registerClassTest2.c
index ac11067..f823b96 100644
--- a/testsuite/misc-ming.all/registerClassTest2.c
+++ b/testsuite/misc-ming.all/registerClassTest2.c
@@ -69,7 +69,7 @@ main(int argc, char** argv)
   SWFMovie mo;
   SWFMovieClip  mc1, mc2, mc3, dejagnuclip;
   SWFShape  sh1, sh2, sh3;
-  SWFDisplayItem it1, it2, it3, it4;
+  SWFDisplayItem it3, it4;
   const char *srcdir=".";
 
   if ( argc>1 ) srcdir=argv[1];
diff --git a/testsuite/misc-ming.all/replace_buttons1test.c 
b/testsuite/misc-ming.all/replace_buttons1test.c
index 4fccb6c..843f744 100644
--- a/testsuite/misc-ming.all/replace_buttons1test.c
+++ b/testsuite/misc-ming.all/replace_buttons1test.c
@@ -80,7 +80,7 @@ get_button(int width, int height, int r, int g, int b)
 
   sh = make_fill_square (0, 0, width, height, r, g, b, r, g, b);
 
-  SWFButton_addShape(bu, (SWFCharacter)sh, SWFBUTTON_UP );
+  SWFButton_addCharacter(bu, (SWFCharacter)sh, SWFBUTTON_UP );
 
   return bu;
 }
diff --git a/testsuite/misc-ming.all/shape_test.c 
b/testsuite/misc-ming.all/shape_test.c
index 7936afa..4d1f544 100644
--- a/testsuite/misc-ming.all/shape_test.c
+++ b/testsuite/misc-ming.all/shape_test.c
@@ -38,11 +38,9 @@ int
 main(int argc, char** argv)
 {
   SWFMovie mo;
-  SWFMovieClip mc1, mc2, dejagnuclip;
+  SWFMovieClip dejagnuclip;
   SWFDisplayItem it;
   SWFShape  sh1,sh2;
-  SWFAction ac1, ac2;
-  int i;
 
   const char *srcdir=".";
   if ( argc>1 ) 
diff --git a/testsuite/misc-ming.all/spritehier.c 
b/testsuite/misc-ming.all/spritehier.c
index 3a9a6d9..8d5f62a 100644
--- a/testsuite/misc-ming.all/spritehier.c
+++ b/testsuite/misc-ming.all/spritehier.c
@@ -35,26 +35,27 @@
 
 #define OUTPUT_FILENAME "spritehier.swf"
 
+static SWFAction frame_print(void);
+
 SWFAction
-frame_print()
+frame_print(void)
 {
        SWFAction ac;
-       ac = compileSWFActionCode("\
-trace(\"Current frame: \"+this._currentframe); \
-trace(\"Frames loaded: \"+this._framesloaded); \
-");
+       ac = newSWFAction(
+        "trace(\"Current frame: \"+this._currentframe); "
+        "trace(\"Frames loaded: \"+this._framesloaded); "
+    );
 
        return ac;
 }
 
 int
-main()
+main(void)
 {
        SWFMovie mo;
        SWFShape sh;
        SWFAction ac;
        SWFMovieClip mc1, mc2, mc3;
-       /*SWFDisplayItem it;*/
 
        Ming_init();
        mo = newSWFMovie();
diff --git a/testsuite/misc-ming.all/unload_movieclip_test1.c 
b/testsuite/misc-ming.all/unload_movieclip_test1.c
index 25ebe4b..af6cf31 100644
--- a/testsuite/misc-ming.all/unload_movieclip_test1.c
+++ b/testsuite/misc-ming.all/unload_movieclip_test1.c
@@ -34,11 +34,11 @@
 #define OUTPUT_VERSION 6
 #define OUTPUT_FILENAME "unload_movieclip_test1.swf"
 
+SWFDisplayItem add_static_mc(SWFMovie mo, const char* name, int depth);
 
 SWFDisplayItem
 add_static_mc(SWFMovie mo, const char* name, int depth)
 {
-  SWFShape sh;
   SWFMovieClip mc;
   SWFDisplayItem it;
    

-----------------------------------------------------------------------

Summary of changes:
 testsuite/misc-ming.all/BitmapDataTest.c           |    3 ++-
 testsuite/misc-ming.all/BitmapSmoothingTest.c      |    2 --
 testsuite/misc-ming.all/ButtonEventsTest.c         |    2 +-
 .../misc-ming.all/DefineEditTextVariableNameTest.c |    1 +
 testsuite/misc-ming.all/DefineTextTest.c           |    1 -
 testsuite/misc-ming.all/DepthLimitsTest.c          |    2 ++
 testsuite/misc-ming.all/DragDropTestRunner.cpp     |    2 --
 testsuite/misc-ming.all/TextSnapshotTest.c         |    1 -
 testsuite/misc-ming.all/Video-EmbedSquareTest.c    |    1 -
 .../misc-ming.all/Video-EmbedSquareTestRunner.cpp  |    9 +++++----
 .../misc-ming.all/action_execution_order_test3.c   |    4 ++--
 .../misc-ming.all/action_execution_order_test4.c   |    4 ++--
 .../misc-ming.all/action_execution_order_test9.c   |    2 ++
 testsuite/misc-ming.all/attachMovieTest.c          |    2 ++
 .../misc-ming.all/displaylist_depths_test10.c      |    3 +--
 .../misc-ming.all/displaylist_depths_test11.c      |    1 -
 testsuite/misc-ming.all/displaylist_depths_test2.c |    5 ++---
 testsuite/misc-ming.all/displaylist_depths_test3.c |    5 ++---
 testsuite/misc-ming.all/displaylist_depths_test4.c |    5 ++---
 testsuite/misc-ming.all/displaylist_depths_test5.c |    5 ++---
 testsuite/misc-ming.all/displaylist_depths_test6.c |    3 +--
 testsuite/misc-ming.all/displaylist_depths_test7.c |    3 +--
 testsuite/misc-ming.all/displaylist_depths_test8.c |    3 +--
 testsuite/misc-ming.all/displaylist_depths_test9.c |    3 +--
 testsuite/misc-ming.all/eventSoundTest1-Runner.cpp |    6 ------
 testsuite/misc-ming.all/goto_frame_test.c          |    3 +++
 testsuite/misc-ming.all/instanceNameTest.c         |    4 +---
 testsuite/misc-ming.all/key_event_test.c           |    4 +++-
 testsuite/misc-ming.all/loop/loop_test.c           |   14 +++-----------
 testsuite/misc-ming.all/loop/loop_test10.c         |    6 ++----
 testsuite/misc-ming.all/loop/loop_test2.c          |    2 --
 testsuite/misc-ming.all/loop/loop_test3.c          |    2 --
 testsuite/misc-ming.all/loop/loop_test4.c          |    2 --
 testsuite/misc-ming.all/loop/loop_test5.c          |    2 --
 testsuite/misc-ming.all/loop/loop_test6.c          |    2 --
 testsuite/misc-ming.all/loop/loop_test7.c          |    8 +++-----
 testsuite/misc-ming.all/loop/loop_test8.c          |    2 ++
 testsuite/misc-ming.all/loop/loop_test9.c          |    2 --
 testsuite/misc-ming.all/morph_test1runner.cpp      |    5 -----
 testsuite/misc-ming.all/moviecliploader_test.c     |    1 +
 testsuite/misc-ming.all/place_object_test.c        |    2 --
 testsuite/misc-ming.all/registerClassTest2.c       |    2 +-
 testsuite/misc-ming.all/replace_buttons1test.c     |    2 +-
 testsuite/misc-ming.all/shape_test.c               |    4 +---
 testsuite/misc-ming.all/spritehier.c               |   15 ++++++++-------
 testsuite/misc-ming.all/unload_movieclip_test1.c   |    2 +-
 46 files changed, 62 insertions(+), 102 deletions(-)


hooks/post-receive
-- 
Gnash



reply via email to

[Prev in Thread] Current Thread [Next in Thread]