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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Sandro Santilli <address@hidden>        06/05/09 18:52:30

Modified files:
        .              : ChangeLog 
        testsuite/misc-ming.all: definebitsjpeg2.c Makefile.am 

Log message:
        * testsuite/misc-ming.all/definebits_jpeg2.c,
        testsuite/misc-ming.all/Makefile.am:
        use argument to definebits_jpeg2 to

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.287&tr2=1.288&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/testsuite/misc-ming.all/definebitsjpeg2.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/testsuite/misc-ming.all/Makefile.am.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.287 gnash/ChangeLog:1.288
--- gnash/ChangeLog:1.287       Tue May  9 17:48:21 2006
+++ gnash/ChangeLog     Tue May  9 18:52:30 2006
@@ -1,5 +1,8 @@
 2006-05-09 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-ming.all/definebits_jpeg2.c,
+       testsuite/misc-ming.all/Makefile.am:
+       use argument to definebits_jpeg2 to find jpeg.
        * testsuite/media: new dir for storing media files, moved
        jpegs from actionscript.all to this new dir
        * server/movie_definition.h: added get_url() virtual method
Index: gnash/testsuite/misc-ming.all/Makefile.am
diff -u gnash/testsuite/misc-ming.all/Makefile.am:1.2 
gnash/testsuite/misc-ming.all/Makefile.am:1.3
--- gnash/testsuite/misc-ming.all/Makefile.am:1.2       Tue May  9 13:53:30 2006
+++ gnash/testsuite/misc-ming.all/Makefile.am   Tue May  9 18:52:30 2006
@@ -70,7 +70,7 @@
        ./moviecliploader_test
 
 definebitsjpeg2.swf: definebitsjpeg2
-       ./definebitsjpeg2
+       ./definebitsjpeg2 $(srcdir)/../media/lynch.jpg
 
 spritehier.swf: spritehier
        ./spritehier
Index: gnash/testsuite/misc-ming.all/definebitsjpeg2.c
diff -u gnash/testsuite/misc-ming.all/definebitsjpeg2.c:1.1 
gnash/testsuite/misc-ming.all/definebitsjpeg2.c:1.2
--- gnash/testsuite/misc-ming.all/definebitsjpeg2.c:1.1 Tue May  9 10:31:36 2006
+++ gnash/testsuite/misc-ming.all/definebitsjpeg2.c     Tue May  9 18:52:30 2006
@@ -6,19 +6,15 @@
 
 #define URL_LYNCH "lynch.jpg"
 
-main()
+int
+main(int argc, char **argv)
 {
        SWFMovie mo;
-       const char *file_lynch="lynch.jpg";
-       const char *file_green="green.jpg";
-       const char *file_offspring="offspring.jpg";
-       FILE *fd_lynch, *fd_green, *fd_offspring;
-       SWFJpegBitmap bm_lynch, bm_green, bm_offspring;
-       SWFShape sh_lynch, sh_green, sh_offspring, sh_coverart;
-       SWFMovieClip mc_lynch, mc_green, mc_offspring, mc_coverart;
-       SWFFillStyle fstyle;
-       SWFDisplayItem it;
-       SWFAction ac;
+       const char *jpeg_filename="lynch.jpg";
+       FILE *jpeg_fd;
+       SWFJpegBitmap jpeg_bm;
+       SWFShape jpeg_sh;
+       SWFMovieClip jpeg_mc;
 
        /*********************************************
         *
@@ -26,6 +22,13 @@
         *
         *********************************************/
 
+       if ( argc > 1 ) jpeg_filename=argv[1];
+       else
+       {
+               fprintf(stderr, "Usage: %s <jpegfile>\n", argv[0]);
+               return 1;
+       }
+
        puts("Setting things up");
 
        Ming_init();
@@ -42,15 +45,18 @@
 
        puts("Adding lynch");
 
-       fd_lynch = fopen(file_lynch, "r");
-       if ( ! fd_lynch ) perror(file_lynch);
-       bm_lynch = newSWFJpegBitmap(fd_lynch);
-       sh_lynch = newSWFShapeFromBitmap((SWFBitmap)bm_lynch, 
SWFFILL_CLIPPED_BITMAP);
-       mc_lynch = newSWFMovieClip();
-       SWFMovieClip_add(mc_lynch, (SWFBlock)sh_lynch);
-       SWFMovieClip_nextFrame(mc_lynch); /* showFrame */
+       jpeg_fd = fopen(jpeg_filename, "r");
+       if ( ! jpeg_fd ) {
+               perror(jpeg_filename);
+               return 1;
+       }
+       jpeg_bm = newSWFJpegBitmap(jpeg_fd);
+       jpeg_sh = newSWFShapeFromBitmap((SWFBitmap)jpeg_bm, 
SWFFILL_CLIPPED_BITMAP);
+       jpeg_mc = newSWFMovieClip();
+       SWFMovieClip_add(jpeg_mc, (SWFBlock)jpeg_sh);
+       SWFMovieClip_nextFrame(jpeg_mc); /* showFrame */
 
-       SWFMovie_add(mo, (SWFBlock)mc_lynch);
+       SWFMovie_add(mo, (SWFBlock)jpeg_mc);
 
 
        puts("Saving " OUTPUT_FILENAME );