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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/12 11:03:22

Modified files:
        .              : ChangeLog 
        testsuite/misc-ming.all: Makefile.am PlaceObject2Test.c 
                                 ming_utils.c ming_utils.h 

Log message:
        moved ming utility function from test file to ming_utils.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1160&r2=1.1161
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/PlaceObject2Test.c?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ming_utils.c?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ming_utils.h?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1160
retrieving revision 1.1161
diff -u -b -r1.1160 -r1.1161
--- ChangeLog   12 Oct 2006 01:09:28 -0000      1.1160
+++ ChangeLog   12 Oct 2006 11:03:22 -0000      1.1161
@@ -1,3 +1,11 @@
+2006-10-12 Sandro Santilli <address@hidden>
+
+       * testsuite/misc-ming.all/Makefile.am,
+         testsuite/misc-ming.all/PlaceObject2Test.c,
+         testsuite/misc-ming.all/ming_utils.c,
+         testsuite/misc-ming.all/ming_utils.h:
+         moved ming utility function from test file to ming_utils.
+
 2006-10-12 Markus Gothe <address@hidden>
 
        * configure.ac: Check if strlcpy and strlcat already is defined.

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- testsuite/misc-ming.all/Makefile.am 11 Oct 2006 16:36:45 -0000      1.16
+++ testsuite/misc-ming.all/Makefile.am 12 Oct 2006 11:03:22 -0000      1.17
@@ -95,7 +95,11 @@
 spritehier_SOURCES =  spritehier.c
 spritehier_LDADD = $(MING_LIBS)
 
-PlaceObject2Test_SOURCES = PlaceObject2Test.c
+PlaceObject2Test_SOURCES =     \
+       PlaceObject2Test.c      \
+       ming_utils.h            \
+       ming_utils.c            \
+       $(NULL)
 PlaceObject2Test_LDADD = $(MING_LIBS)
 
 RemoveObject2Test_SOURCES = RemoveObject2Test.c

Index: testsuite/misc-ming.all/PlaceObject2Test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/PlaceObject2Test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/PlaceObject2Test.c  26 May 2006 19:18:46 -0000      
1.1
+++ testsuite/misc-ming.all/PlaceObject2Test.c  12 Oct 2006 11:03:22 -0000      
1.2
@@ -44,26 +44,14 @@
  *
  ***********************************************************************/
 
+#include "ming_utils.h"
+
 #include <stdio.h>
 #include <ming.h>
 
 #define OUTPUT_VERSION 6
 #define OUTPUT_FILENAME "PlaceObject2Test.swf"
 
-SWFShape
-make_square(int x, int y, int width, int height, byte r, byte g, byte b)
-{
-       SWFShape sh = newSWFShape();
-       SWFShape_setLineStyle(sh, 1, r, g, b, 255);
-       SWFShape_movePenTo(sh, x, y);
-       SWFShape_drawLineTo(sh, x, y+height);
-       SWFShape_drawLineTo(sh, x+width, y+height);
-       SWFShape_drawLineTo(sh, x+width, y);
-       SWFShape_drawLineTo(sh, x, y);
-
-       return sh;
-}
-
 int
 main(int argc, char **argv)
 {

Index: testsuite/misc-ming.all/ming_utils.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ming_utils.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/ming_utils.c        11 Oct 2006 16:36:45 -0000      
1.1
+++ testsuite/misc-ming.all/ming_utils.c        12 Oct 2006 11:03:22 -0000      
1.2
@@ -56,3 +56,17 @@
        SWFMovie_add(mo, (SWFBlock)ac);
 }
 
+SWFShape
+make_square(int x, int y, int width, int height, byte r, byte g, byte b)
+{
+       SWFShape sh = newSWFShape();
+       SWFShape_setLineStyle(sh, 1, r, g, b, 255);
+       SWFShape_movePenTo(sh, x, y);
+       SWFShape_drawLineTo(sh, x, y+height);
+       SWFShape_drawLineTo(sh, x+width, y+height);
+       SWFShape_drawLineTo(sh, x+width, y);
+       SWFShape_drawLineTo(sh, x, y);
+
+       return sh;
+}
+

Index: testsuite/misc-ming.all/ming_utils.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ming_utils.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/ming_utils.h        11 Oct 2006 16:36:45 -0000      
1.1
+++ testsuite/misc-ming.all/ming_utils.h        12 Oct 2006 11:03:22 -0000      
1.2
@@ -44,4 +44,7 @@
 /// printing to a textfield created using the given depth, position and size
 void add_xtrace_function(SWFMovie mo, int depth, int x, int y, int width, int 
height);
 
+/// Create a square shape with given offset, size and colors
+SWFShape make_square(int x, int y, int width, int height, byte r, byte g, byte 
b);
+
 #endif // GNASH_MING_UTILS_H