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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/06/12 16:38:36

Modified files:
        .              : ChangeLog 
        testsuite/misc-ming.all: DefineEditTextTest.c 

Log message:
                * testsuite/misc-ming.all/DefineEditTextTest.c:
                  Test both embedded and device fonts.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3512&r2=1.3513
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DefineEditTextTest.c?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3512
retrieving revision 1.3513
diff -u -b -r1.3512 -r1.3513
--- ChangeLog   12 Jun 2007 12:33:20 -0000      1.3512
+++ ChangeLog   12 Jun 2007 16:38:35 -0000      1.3513
@@ -1,5 +1,10 @@
 2007-06-12 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-ming.all/DefineEditTextTest.c:
+         Test both embedded and device fonts.
+
+2007-06-12 Sandro Santilli <address@hidden>
+
        * configure.ac: Look for libfreetype using GNASH_PKG_FIND
        * server/FreetypeRasterizer.{cpp,h}: use HAVE_FREETYPE_H,
          use intrusive_ptr for bitmap_info, not auto_ptr; add missing

Index: testsuite/misc-ming.all/DefineEditTextTest.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DefineEditTextTest.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/misc-ming.all/DefineEditTextTest.c        29 Oct 2006 18:34:18 
-0000      1.4
+++ testsuite/misc-ming.all/DefineEditTextTest.c        12 Jun 2007 16:38:36 
-0000      1.5
@@ -19,8 +19,9 @@
 
 /*
  * Test DefineEditText tag.
- * Uses "embedded" font and defines a smaller rectangle then required.
- * The text written is 'Hello world', expected result is a single 'H'.
+ * Uses both "embedded" font and device fonts.
+ * The text written is 'Hello world' in both cases.
+ * Text at the bottom is the one with embedded fonts.
  *
  * run as ./DefineEditTextTest
  */
@@ -32,9 +33,9 @@
 #define OUTPUT_VERSION 7
 #define OUTPUT_FILENAME "DefineEditTextTest.swf"
 
-void add_text_field(SWFMovie mo, SWFBlock font, const char* text);
+SWFDisplayItem add_text_field(SWFMovie mo, SWFBlock font, const char* text);
 
-void
+SWFDisplayItem
 add_text_field(SWFMovie mo, SWFBlock font, const char* text)
 {
        SWFTextField tf;
@@ -56,7 +57,8 @@
         *
         * Ref: https://savannah.gnu.org/bugs/?func=detailitem&item_id=16637.
         */
-       SWFTextField_setBounds(tf, 160, 338);
+       //SWFTextField_setBounds(tf, 160, 338);
+       SWFTextField_setBounds(tf, 60000, 338);
 
        /*
         * The following settings (found in the reported SWF)
@@ -72,7 +74,7 @@
        /*SWFTextField_setLineSpacing(tf, 40);*/
        /*SWFTextField_setLineSpacing(tf, 40);*/
 
-       SWFMovie_add(mo, (SWFBlock)tf);
+       return SWFMovie_add(mo, (SWFBlock)tf);
 }
 
 int
@@ -101,11 +103,11 @@
 
        Ming_init();
         Ming_useSWFVersion (OUTPUT_VERSION);
-       Ming_setScale(1.0); /* so we talk twips */
+       //Ming_setScale(20.0); /* so we talk twips */
  
        mo = newSWFMovie();
        SWFMovie_setRate(mo, 24);
-       SWFMovie_setDimension(mo, 12560, 9020);
+       //SWFMovie_setDimension(mo, 12560, 9020);
 
        /*********************************************
         *
@@ -115,15 +117,19 @@
 
        /* This is with embedded fonts, not working */
        {
+               SWFDisplayItem it;
                FILE *font_file = fopen(fdbfont, "r");
                if ( font_file == NULL )
                {
                        perror(fdbfont);
                        exit(1);
                }
-               /*SWFBrowserFont bfont = newSWFBrowserFont("_sans");*/
-               SWFFont bfont = loadSWFFontFromFile(font_file);
-               add_text_field(mo, (SWFBlock)bfont, "Hello world");
+               SWFBrowserFont bfont = newSWFBrowserFont("_sans");
+               SWFFont efont = loadSWFFontFromFile(font_file);
+
+               it = add_text_field(mo, (SWFBlock)bfont, "Hello world");
+               it = add_text_field(mo, (SWFBlock)efont, "Hello world");
+               SWFDisplayItem_moveTo(it, 0, 30);
        }
 
        /*****************************************************