[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-486-g95837e7 |
|
Date: |
Thu, 14 Jul 2011 08:09:29 +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 95837e79a321a361ecb105cf93db9804360f537a (commit)
from 350a2e250bef6cea2da103af8896affeb6c49afa (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=95837e79a321a361ecb105cf93db9804360f537a
commit 95837e79a321a361ecb105cf93db9804360f537a
Author: Sandro Santilli <address@hidden>
Date: Thu Jul 14 10:09:09 2011 +0200
Substitute "lynch" album cover with focused red-toned image (#33764)
Updates testcases accordingly.
diff --git a/testsuite/media/Makefile.am b/testsuite/media/Makefile.am
index 2f156e6..84b4a65 100644
--- a/testsuite/media/Makefile.am
+++ b/testsuite/media/Makefile.am
@@ -24,8 +24,8 @@ EXTRA_DIST = \
offspring.jpg \
green.jpg \
green.swf \
- lynch.swf \
- lynch.jpg \
+ red.swf \
+ red.jpg \
sound1.wav \
sound1.mp3 \
mono44.mp2 \
diff --git a/testsuite/media/README b/testsuite/media/README
index 32b69c7..2fcece1 100644
--- a/testsuite/media/README
+++ b/testsuite/media/README
@@ -41,10 +41,16 @@ green.swf
0x00ff00, 0x008800, 0x004400, 0x002200, 0x000000.
The SWF embeds the .jpg.
+red.swf
+red.jpg
+
+ 171x171 image with 5 concentric squares filled with tones of red,
+ from outer to inner (steps of 20 pixels):
+ 0xff0000, 0x880000, 0x440000, 0x220000, 0x000000.
+ The SWF embeds the .jpg.
+
offspring.swf
offspring.jpg
-lynch.swf
-lynch.jpg
The swfs display the associated jpgs.
diff --git a/testsuite/media/lynch.jpg b/testsuite/media/lynch.jpg
deleted file mode 100644
index 638703e..0000000
Binary files a/testsuite/media/lynch.jpg and /dev/null differ
diff --git a/testsuite/media/lynch.swf b/testsuite/media/lynch.swf
deleted file mode 100644
index 97d3043..0000000
Binary files a/testsuite/media/lynch.swf and /dev/null differ
diff --git a/testsuite/media/red.jpg b/testsuite/media/red.jpg
new file mode 100644
index 0000000..5ed22ac
Binary files /dev/null and b/testsuite/media/red.jpg differ
diff --git a/testsuite/media/red.swf b/testsuite/media/red.swf
new file mode 100644
index 0000000..fab8701
Binary files /dev/null and b/testsuite/media/red.swf differ
diff --git a/testsuite/misc-ming.all/Makefile.am
b/testsuite/misc-ming.all/Makefile.am
index aea4462..e5866fd 100644
--- a/testsuite/misc-ming.all/Makefile.am
+++ b/testsuite/misc-ming.all/Makefile.am
@@ -315,7 +315,7 @@ libgnashmingutils_la_SOURCES = \
definebitsjpeg2_SOURCES = definebitsjpeg2.c
definebitsjpeg2_LDADD = $(MING_LIBS)
definebitsjpeg2.swf: definebitsjpeg2
- ./definebitsjpeg2 $(srcdir)/../media/lynch.jpg
+ ./definebitsjpeg2 $(srcdir)/../media/red.jpg
DefineTextTest.swf: DefineTextTest
./DefineTextTest $(abs_mediadir)
diff --git a/testsuite/misc-ming.all/definebitsjpeg2.c
b/testsuite/misc-ming.all/definebitsjpeg2.c
index d8ed411..b388038 100644
--- a/testsuite/misc-ming.all/definebitsjpeg2.c
+++ b/testsuite/misc-ming.all/definebitsjpeg2.c
@@ -30,13 +30,13 @@
#define OUTPUT_VERSION 6
#define OUTPUT_FILENAME "definebitsjpeg2.swf"
-#define URL_LYNCH "lynch.jpg"
+#define URL_RED "red.jpg"
int
main(int argc, char **argv)
{
SWFMovie mo;
- const char *jpeg_filename="lynch.jpg";
+ const char *jpeg_filename="red.jpg";
FILE *jpeg_fd;
SWFJpegBitmap jpeg_bm;
SWFShape jpeg_sh;
@@ -65,11 +65,11 @@ main(int argc, char **argv)
/*****************************************************
*
- * Add the LYNCH clip
+ * Add the RED clip
*
*****************************************************/
- puts("Adding lynch");
+ puts("Adding red");
jpeg_fd = fopen(jpeg_filename, "r");
if ( ! jpeg_fd ) {
diff --git a/testsuite/misc-ming.all/loading/loadImageTest.c
b/testsuite/misc-ming.all/loading/loadImageTest.c
index c8366d4..3183858 100644
--- a/testsuite/misc-ming.all/loading/loadImageTest.c
+++ b/testsuite/misc-ming.all/loading/loadImageTest.c
@@ -27,7 +27,7 @@
/*
* run as ./loadMovieTest <mediadir>
*
- * mediadir is where lynch.{jpg,swf}, green.{jpg,swf}
+ * mediadir is where red.{jpg,swf}, green.{jpg,swf}
* and offspring.{jpg,swf} are located
*
*/
diff --git a/testsuite/misc-ming.all/loading/loadMovieTest.c
b/testsuite/misc-ming.all/loading/loadMovieTest.c
index e18224e..b5ee791 100644
--- a/testsuite/misc-ming.all/loading/loadMovieTest.c
+++ b/testsuite/misc-ming.all/loading/loadMovieTest.c
@@ -27,7 +27,7 @@
/*
* run as ./loadMovieTest <mediadir>
*
- * mediadir is where lynch.{jpg,swf}, green.{jpg,swf}
+ * mediadir is where red.{jpg,swf}, green.{jpg,swf}
* and offspring.{jpg,swf} are located
*
*/
@@ -251,10 +251,10 @@ main(int argc, char** argv)
SWFMovieClip dejagnuclip;
SWFDisplayItem it;
- char file_lynch[256];
+ char file_red[256];
char file_green[256];
char file_offspring[256];
- char url_lynch[256];
+ char url_red[256];
char url_green[256];
char url_offspring[256];
@@ -271,7 +271,7 @@ main(int argc, char** argv)
return 1;
}
- sprintf(file_lynch, "%s/lynch.jpg", mediadir);
+ sprintf(file_red, "%s/red.jpg", mediadir);
sprintf(file_green, "%s/green.jpg", mediadir);
sprintf(file_offspring, "%s/offspring.jpg", mediadir);
@@ -280,7 +280,7 @@ main(int argc, char** argv)
* NOTE: testing of urls with and w/out 'file://' prefix
* disabled to reduce test complexity.
*/
- sprintf(url_lynch, "%s/lynch.swf", mediadir);
+ sprintf(url_red, "%s/red.swf", mediadir);
sprintf(url_green, "%s/green.jpg", mediadir);
sprintf(url_offspring, "%s/offspring.swf", mediadir);
@@ -314,7 +314,7 @@ main(int argc, char** argv)
*****************************************************/
/* Add the LYNCH clip */
- add_clip(mo, file_lynch, "lynch", url_lynch, 0, 0);
+ add_clip(mo, file_red, "red", url_red, 0, 0);
/* Add the GREEN clip */
add_clip(mo, file_green, "green", url_green, 200, 0);
diff --git a/testsuite/misc-ming.all/loading/loadMovieTestRunner.cpp
b/testsuite/misc-ming.all/loading/loadMovieTestRunner.cpp
index 44be6b3..239f93c 100644
--- a/testsuite/misc-ming.all/loading/loadMovieTestRunner.cpp
+++ b/testsuite/misc-ming.all/loading/loadMovieTestRunner.cpp
@@ -97,24 +97,24 @@ clickCycle(MovieClip* coverart)
{
URL mediaURL(MEDIADIR"/");
- URL lynchURL("lynch.swf", mediaURL);
+ URL redURL("red.swf", mediaURL);
URL greenURL("green.jpg", mediaURL);
URL offspringURL("offspring.swf", mediaURL);
/*------------------------------------- */
- // Click on the first (lynch)
+ // Click on the first (red)
tester->movePointerTo(80, 80);
check(tester->isMouseOverMouseEntity());
tester->pressMouseButton();
coverart = waitForLoad(coverart);
- check_equals(coverart->get_root()->url(), lynchURL.str());
+ check_equals(coverart->get_root()->url(), redURL.str());
tester->depressMouseButton();
- // Check scribbling on the lynch
+ // Check scribbling on the red
checkScribbling();
// Run 'coverart' tests..
diff --git a/testsuite/misc-ming.all/loading/moviecliploader_test.c
b/testsuite/misc-ming.all/loading/moviecliploader_test.c
index 4cc78c0..a77cd6c 100644
--- a/testsuite/misc-ming.all/loading/moviecliploader_test.c
+++ b/testsuite/misc-ming.all/loading/moviecliploader_test.c
@@ -27,7 +27,7 @@
/*
* run as ./movieclip_loader <mediadir>
*
- * srcdir is where lynch.jpg, green.jp and offspring.jpg are located
+ * srcdir is where red.jpg, green.jp and offspring.jpg are located
*
*/
@@ -84,10 +84,10 @@ int
main(int argc, char** argv)
{
SWFMovie mo;
- char file_lynch[256];
+ char file_red[256];
char file_green[256];
char file_offspring[256];
- char url_lynch[256];
+ char url_red[256];
char url_green[256];
char url_offspring[256];
const char *srcdir=".";
@@ -110,7 +110,7 @@ main(int argc, char** argv)
return 1;
}
- sprintf(file_lynch, "%s/lynch.jpg", srcdir);
+ sprintf(file_red, "%s/red.jpg", srcdir);
sprintf(file_green, "%s/green.jpg", srcdir);
sprintf(file_offspring, "%s/offspring.jpg", srcdir);
@@ -118,7 +118,7 @@ main(int argc, char** argv)
* Test urls with and w/out 'file://' prefix.
* Test both jpeg and swf loading.
*/
- sprintf(url_lynch, "file://%s/lynch.swf", srcdir);
+ sprintf(url_red, "file://%s/red.swf", srcdir);
sprintf(url_green, "file://%s/green.jpg", srcdir);
sprintf(url_offspring, "%s/offspring.swf", srcdir);
@@ -151,7 +151,7 @@ CoverArtLoader = new MovieClipLoader(); \
SWFMovie_add(mo, (SWFBlock)ac);
/* Add the LYNCH clip */
- add_clip(mo, file_lynch, "lynch", url_lynch, 200, 4419);
+ add_clip(mo, file_red, "red", url_red, 200, 4419);
/* Add the GREEN clip */
add_clip(mo, file_green, "green", url_green, 3800, 4419);
-----------------------------------------------------------------------
Summary of changes:
testsuite/media/Makefile.am | 4 ++--
testsuite/media/README | 10 ++++++++--
testsuite/media/lynch.jpg | Bin 34661 -> 0 bytes
testsuite/media/lynch.swf | Bin 34744 -> 0 bytes
testsuite/media/red.jpg | Bin 0 -> 4169 bytes
testsuite/media/red.swf | Bin 0 -> 3467 bytes
testsuite/misc-ming.all/Makefile.am | 2 +-
testsuite/misc-ming.all/definebitsjpeg2.c | 8 ++++----
testsuite/misc-ming.all/loading/loadImageTest.c | 2 +-
testsuite/misc-ming.all/loading/loadMovieTest.c | 12 ++++++------
.../misc-ming.all/loading/loadMovieTestRunner.cpp | 8 ++++----
.../misc-ming.all/loading/moviecliploader_test.c | 12 ++++++------
12 files changed, 32 insertions(+), 26 deletions(-)
delete mode 100644 testsuite/media/lynch.jpg
delete mode 100644 testsuite/media/lynch.swf
create mode 100644 testsuite/media/red.jpg
create mode 100644 testsuite/media/red.swf
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-486-g95837e7,
Sandro Santilli <=