[Swfdec-commits] 8 commits - NEWS test/image

[Benjamin Otte]

 NEWS                                            |    5 +++++
 test/image/gradient-beginGradientFill-6.swf.png |binary
 test/image/gradient-beginGradientFill-7.swf.png |binary
 test/image/gradient-beginGradientFill-8.swf.png |binary
 test/image/gradient-ratios.swf.png              |binary
 5 files changed, 5 insertions(+)

New commits:
commit ea7800efb80814838772ca277c5384b428eda861
Merge: 31434d2... 84e7bfe...
Author: Benjamin Otte <otte at gnome.org>
Date:   Sat Mar 29 15:42:13 2008 +0100

    Merge branch '0.6'
    
    Conflicts:
    
    	configure.ac

commit 84e7bfec6175ca6ff7517f04b99cee42aed03bd3
Author: Benjamin Otte <otte at gnome.org>
Date:   Sat Mar 29 15:30:34 2008 +0100

    back to development

diff --git a/configure.ac b/configure.ac
index 248cb96..8b5bbc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.58])
-AC_INIT(swfdec,0.6.2)
+AC_INIT(swfdec,0.6.3)
 
 [is_dev=$(echo $PACKAGE_VERSION | sed 's/[0-9]\.[0-9][0-9]*\.[0-9]*[13579]/1/')]
 if test x"$is_dev" = x1 ; then
commit 83f16ce9f7669e7f03444d204ff1611b84a63608
Author: Benjamin Otte <otte at gnome.org>
Date:   Sat Mar 29 15:20:08 2008 +0100

    release 0.6.2

diff --git a/configure.ac b/configure.ac
index 07fcddf..248cb96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.58])
-AC_INIT(swfdec,0.6.1)
+AC_INIT(swfdec,0.6.2)
 
 [is_dev=$(echo $PACKAGE_VERSION | sed 's/[0-9]\.[0-9][0-9]*\.[0-9]*[13579]/1/')]
 if test x"$is_dev" = x1 ; then
commit 0907a63d490133e7077f3ddbecc803499c90d446
Author: Benjamin Otte <otte at gnome.org>
Date:   Sat Mar 29 01:05:26 2008 +0100

    update reference images for Cairo 1.6
    
    The gradient code changed slightly

diff --git a/test/image/gradient-beginGradientFill-6.swf.png b/test/image/gradient-beginGradientFill-6.swf.png
index 338d94a..da39a7f 100644
Binary files a/test/image/gradient-beginGradientFill-6.swf.png and b/test/image/gradient-beginGradientFill-6.swf.png differ
diff --git a/test/image/gradient-beginGradientFill-7.swf.png b/test/image/gradient-beginGradientFill-7.swf.png
index 338d94a..da39a7f 100644
Binary files a/test/image/gradient-beginGradientFill-7.swf.png and b/test/image/gradient-beginGradientFill-7.swf.png differ
diff --git a/test/image/gradient-beginGradientFill-8.swf.png b/test/image/gradient-beginGradientFill-8.swf.png
index 338d94a..da39a7f 100644
Binary files a/test/image/gradient-beginGradientFill-8.swf.png and b/test/image/gradient-beginGradientFill-8.swf.png differ
diff --git a/test/image/gradient-ratios.swf.png b/test/image/gradient-ratios.swf.png
index cb3c43f..855eba3 100644
Binary files a/test/image/gradient-ratios.swf.png and b/test/image/gradient-ratios.swf.png differ
commit 5fa15d6c4eed7847b8631f92ca98267e36d281e0
Author: Benjamin Otte <otte at gnome.org>
Date:   Fri Mar 28 18:01:39 2008 +0100

    we can include noinst_HEADERS all the time

diff --git a/test/Makefile.am b/test/Makefile.am
index 042ade1..ace9c5e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -6,12 +6,8 @@ if WITH_GTK
 swfdec_gtk_test_sources = \
 	swfdec_test_http_request.c \
 	swfdec_test_http_server.c
-swfdef_gtk_test_headers = \
-	swfdec_test_http_request.h \
-	swfdec_test_http_server.h
 else
 swfdec_gtk_test_sources =
-swfdec_gtk_test_headers =
 endif
 
 swfdec_test_sources = \
@@ -44,7 +40,8 @@ noinst_HEADERS = \
 	swfdec_test_buffer.h \
 	swfdec_test_function.h \
 	swfdec_test_function_list.h \
-	$(swfdec_gtk_test_headers) \
+	swfdec_test_http_request.h \
+	swfdec_test_http_server.h \
 	swfdec_test_image.h \
 	swfdec_test_initialize.h \
 	swfdec_test_plugin.h \
commit e33aecedcf77ea823e7e2b56af6d50ad611f7290
Merge: 5d36eec... 2f7cdb8...
Author: Benjamin Otte <otte at gnome.org>
Date:   Fri Mar 28 18:00:34 2008 +0100

    Merge branch '0.6' of ssh://company@git.freedesktop.org/git/swfdec/swfdec into 0.6

commit 5d36eec8f99bd12ca0524b103a100fda91b5fb52
Author: Benjamin Otte <otte at gnome.org>
Date:   Fri Mar 28 16:39:29 2008 +0100

    update NEWS

diff --git a/NEWS b/NEWS
index d325fa6..af1a959 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,9 @@
 
+ 0.6.2 ("Badger Badger Badger")
+
+This is the first bugfix release in the stable release series. It contains 
+mostly compilation fixes. No new features were added.
+
  0.6.0 ("Fedora TV")
 
 Here is the first API/ABI-stable release of Swfdec. Enjoy!
commit 2f7cdb81a4153588ccde32ee4566a2d8fc689781
Author: Pekka Lampila <pekka.lampila at iki.fi>
Date:   Wed Mar 26 19:21:47 2008 +0200

    Fix a warning on amd64

diff --git a/vivified/core/vivi_ming.c b/vivified/core/vivi_ming.c
index c015c1a..ed0102d 100644
--- a/vivified/core/vivi_ming.c
+++ b/vivified/core/vivi_ming.c
@@ -88,7 +88,7 @@ vivi_ming_compile (const char *code, char **error)
 {
   byte *data;
   SWFAction action;
-  gssize len;
+  int len;
   SwfdecBuffer *buffer;
   SwfdecScript *script;