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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/06/12 23:05:42

Modified files:
        .              : ChangeLog 
        testsuite/misc-ming.all: Makefile.am 
Added files:
        testsuite/misc-ming.all: DefineEditTextTest.c 
Removed files:
        testsuite/misc-ming.all: defineedittext.c 

Log message:
                defineedittext.c renamed to DefineEditTextTest.c,
                added some more code to get closer to what's in the
                testfile from bug #16637 (missing embedded fonts)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.401&r2=1.402
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DefineEditTextTest.c?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/defineedittext.c?cvsroot=gnash&r1=1.1&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -b -r1.401 -r1.402
--- ChangeLog   12 Jun 2006 21:56:37 -0000      1.401
+++ ChangeLog   12 Jun 2006 23:05:41 -0000      1.402
@@ -1,5 +1,11 @@
 2006-06-12 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-ming.all/DefineEditTextTest.c,
+       testsuite/misc-ming.all/Makefile.am,
+       testsuite/misc-ming.all/defineedittext.c:
+       defineedittext.c renamed to DefineEditTextTest.c,
+       added some more code to get closer to what's in the
+       testfile from bug #16637 (missing embedded fonts)
        * server/swf/ASHandler.cpp: (ActionDeleteVar): fixed
        call to as_object::set_member (as_value passed by
        const ref, not pointer).

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/misc-ming.all/Makefile.am 26 May 2006 19:18:46 -0000      1.7
+++ testsuite/misc-ming.all/Makefile.am 12 Jun 2006 23:05:41 -0000      1.8
@@ -55,7 +55,7 @@
 noinst_PROGRAMS = \
        moviecliploader_test \
        definebitsjpeg2 \
-       defineedittext \
+       DefineEditTextTest \
        spritehier \
        PlaceObject2Test \
        RemoveObject2Test
@@ -66,8 +66,8 @@
 moviecliploader_test_SOURCES =  moviecliploader_test.c
 moviecliploader_test_LDADD = $(MING_LIBS)
 
-defineedittext_SOURCES =  defineedittext.c
-defineedittext_LDADD = $(MING_LIBS)
+DefineEditTextTest_SOURCES =  DefineEditTextTest.c
+DefineEditTextTest_LDADD = $(MING_LIBS)
 
 spritehier_SOURCES =  spritehier.c
 spritehier_LDADD = $(MING_LIBS)
@@ -89,8 +89,8 @@
 definebitsjpeg2.swf: definebitsjpeg2
        ./definebitsjpeg2 $(srcdir)/../media/lynch.jpg
 
-defineedittext.swf: defineedittext
-       ./defineedittext
+DefineEditTextTest.swf: DefineEditTextTest
+       ./DefineEditTextTest
 
 spritehier.swf: spritehier
        ./spritehier

Index: testsuite/misc-ming.all/DefineEditTextTest.c
===================================================================
RCS file: testsuite/misc-ming.all/DefineEditTextTest.c
diff -N testsuite/misc-ming.all/DefineEditTextTest.c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/DefineEditTextTest.c        12 Jun 2006 23:05:41 
-0000      1.1
@@ -0,0 +1,125 @@
+/* 
+ *   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linking Gnash statically or dynamically with other modules is making a
+ * combined work based on Gnash. Thus, the terms and conditions of the GNU
+ * General Public License cover the whole combination.
+ *
+ * As a special exception, the copyright holders of Gnash give you
+ * permission to combine Gnash with free software programs or libraries
+ * that are released under the GNU LGPL and with code included in any
+ * release of Talkback distributed by the Mozilla Foundation. You may
+ * copy and distribute such a system following the terms of the GNU GPL
+ * for all but the LGPL-covered parts and Talkback, and following the
+ * LGPL for the LGPL-covered parts.
+ *
+ * Note that people who make modified versions of Gnash are not obligated
+ * to grant this special exception for their modified versions; it is their
+ * choice whether to do so. The GNU General Public License gives permission
+ * to release a modified version without this exception; this exception
+ * also makes it possible to release a modified version which carries
+ * forward this exception.
+ *
+ */ 
+
+/*
+ * Test DefineEditText tag.
+ * Currently only uses "device" (browser) font
+ *
+ * run as ./DefineEditTextTest
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ming.h>
+
+#define OUTPUT_VERSION 7
+#define OUTPUT_FILENAME "DefineEditTextTest.swf"
+
+void add_text_field(SWFMovie mo, SWFBlock font, const char* text);
+
+void
+add_text_field(SWFMovie mo, SWFBlock font, const char* text)
+{
+       SWFTextField tf;
+
+       tf = newSWFTextField();
+
+       SWFTextField_addString(tf, text);
+
+       SWFTextField_setFont(tf, (SWFBlock)font);
+
+       SWFTextField_setBounds(tf, 160, 338);
+       SWFTextField_setHeight(tf, 240);
+       SWFTextField_setColor(tf, 0x00, 0x00, 0x00, 0xff);
+       SWFTextField_setAlignment(tf, SWFTEXTFIELD_ALIGN_LEFT);
+       SWFTextField_setLeftMargin(tf, 0);
+       SWFTextField_setRightMargin(tf, 0);
+       SWFTextField_setIndentation(tf, 0);
+       SWFTextField_setLineSpacing(tf, 40);
+       SWFTextField_setLineSpacing(tf, 40);
+       /* SWFTextField_setName(tf, ""); */
+
+       SWFMovie_add(mo, (SWFBlock)tf);
+}
+
+int
+main(int argc, char** argv)
+{
+       SWFMovie mo;
+
+       /*********************************************
+        *
+        * Initialization
+        *
+        *********************************************/
+
+       puts("Setting things up");
+
+       Ming_init();
+        Ming_useSWFVersion (OUTPUT_VERSION);
+       Ming_setScale(1.0); /* so we talk twips */
+ 
+       mo = newSWFMovie();
+       SWFMovie_setRate(mo, 24);
+       SWFMovie_setDimension(mo, 12560, 9020);
+
+       /*********************************************
+        *
+        * Add some textfields
+        *
+        *********************************************/
+
+       /* This is with browser font, not working */
+       {
+               SWFBrowserFont bfont = newSWFBrowserFont("_sans");
+               add_text_field(mo, (SWFBlock)bfont, "Hello world");
+       }
+
+       /*****************************************************
+        *
+        * Output movie
+        *
+        *****************************************************/
+
+       puts("Saving " OUTPUT_FILENAME );
+
+       SWFMovie_nextFrame(mo); /* showFrame */
+
+       SWFMovie_save(mo, OUTPUT_FILENAME);
+
+       return 0;
+}

Index: testsuite/misc-ming.all/defineedittext.c
===================================================================
RCS file: testsuite/misc-ming.all/defineedittext.c
diff -N testsuite/misc-ming.all/defineedittext.c
--- testsuite/misc-ming.all/defineedittext.c    19 May 2006 14:12:36 -0000      
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,154 +0,0 @@
-/* 
- *   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Linking Gnash statically or dynamically with other modules is making a
- * combined work based on Gnash. Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of Gnash give you
- * permission to combine Gnash with free software programs or libraries
- * that are released under the GNU LGPL and with code included in any
- * release of Talkback distributed by the Mozilla Foundation. You may
- * copy and distribute such a system following the terms of the GNU GPL
- * for all but the LGPL-covered parts and Talkback, and following the
- * LGPL for the LGPL-covered parts.
- *
- * Note that people who make modified versions of Gnash are not obligated
- * to grant this special exception for their modified versions; it is their
- * choice whether to do so. The GNU General Public License gives permission
- * to release a modified version without this exception; this exception
- * also makes it possible to release a modified version which carries
- * forward this exception.
- *
- */ 
-
-/*
- * Test DefineEditText tag.
- * Currently only uses "device" (browser) font
- *
- * run as ./defineedittext
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <ming.h>
-
-#define OUTPUT_VERSION 7
-#define OUTPUT_FILENAME "defineedittext.swf"
-
-
-void
-add_clip(SWFMovie mo, char* file, char* name,
-               char* url, int x, int y)
-{
-       FILE *fd;
-       SWFJpegBitmap bm;
-       SWFShape sh;
-       SWFMovieClip mc;
-       SWFDisplayItem it;
-       SWFAction ac;
-       char action[1024];
-
-       printf("Adding %s\n", file);
-
-       fd = fopen(file, "r");
-       if ( ! fd ) {
-               perror(file);
-               exit(1);
-       }
-       bm = newSWFJpegBitmap(fd);
-       sh = newSWFShapeFromBitmap((SWFBitmap)bm, SWFFILL_CLIPPED_BITMAP);
-       mc = newSWFMovieClip();
-       SWFMovieClip_add(mc, (SWFBlock)sh);
-       SWFMovieClip_nextFrame(mc); /* showFrame */
-       it = SWFMovie_add(mo, (SWFBlock)mc);
-       SWFDisplayItem_setName(it, name);
-       SWFDisplayItem_moveTo(it, x, y);
-
-       /* "Click" handler */
-       sprintf(action, " \
-%s.onPress = function () { \
-       _root.CoverArtLoader.loadClip('%s', coverart); \
-}; \
-", name, url);
-
-       ac = compileSWFActionCode(action);
-
-       SWFMovie_add(mo, (SWFBlock)ac);
-}
-
-void
-add_text_field(SWFMovie mo, SWFBlock font, const char* text)
-{
-       SWFTextField tf;
-
-       tf = newSWFTextField();
-
-       SWFTextField_addString(tf, text);
-
-       SWFTextField_setFont(tf, (SWFBlock)font);
-
-       SWFMovie_add(mo, (SWFBlock)tf);
-}
-
-int
-main(int argc, char** argv)
-{
-       SWFMovie mo;
-
-       /*********************************************
-        *
-        * Initialization
-        *
-        *********************************************/
-
-       puts("Setting things up");
-
-       Ming_init();
-        Ming_useSWFVersion (OUTPUT_VERSION);
-       Ming_setScale(1.0); /* so we talk twips */
- 
-       mo = newSWFMovie();
-        SWFMovie_setDimension (mo, 11000, 8000); 
-        SWFMovie_setRate (mo, 12.0); 
-        SWFMovie_setBackground (mo, 255, 255, 255); 
-
-       /*********************************************
-        *
-        * Add some textfields
-        *
-        *********************************************/
-
-       /* This is with browser font */
-       {
-               SWFBrowserFont bfont = newSWFBrowserFont("_sans");
-               add_text_field(mo, (SWFBlock)bfont, "Test");
-       }
-
-       /*****************************************************
-        *
-        * Output movie
-        *
-        *****************************************************/
-
-       puts("Saving " OUTPUT_FILENAME );
-
-       SWFMovie_nextFrame(mo); /* showFrame */
-
-       SWFMovie_save(mo, OUTPUT_FILENAME);
-
-       return 0;
-}