[Swfdec-commits] 4 commits - swfdec/swfdec_as_context.c swfdec/swfdec_as_types.h test/swfdec_test_image.c

[Benjamin Otte]

 swfdec/swfdec_as_context.c |    2 +-
 swfdec/swfdec_as_types.h   |    2 +-
 test/swfdec_test_image.c   |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 5e954f6180220a3418f08a4cbb26f945105bead5
Merge: 61ff20c... 0a79003...
Author: Benjamin Otte <otte at gnome.org>
Date:   Tue Nov 4 13:08:30 2008 +0100

    Merge branch '0.8'

commit 0a79003d8e162faa22c5167a824f9155c8a0df03
Author: Benjamin Otte <otte at gnome.org>
Date:   Tue Nov 4 13:06:24 2008 +0100

    update .gitignore for new aclocal

diff --git a/.gitignore b/.gitignore
index 255ce62..39e029b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+m4/
+
 *~
 .cvsignore
 INSTALL
commit 912799c9779bb185ecee62308a03bb06a2e138bd
Author: Benjamin Otte <otte at gnome.org>
Date:   Tue Nov 4 13:05:09 2008 +0100

    fix cast alignment warning in testing code

diff --git a/test/swfdec_test_image.c b/test/swfdec_test_image.c
index b54f713..98cd559 100644
--- a/test/swfdec_test_image.c
+++ b/test/swfdec_test_image.c
@@ -99,9 +99,9 @@ buffer_diff_core (unsigned char *buf_a,
     guint32 *row_a, *row_b, *row;
 
     for (y = 0; y < height; y++) {
-	row_a = (guint32 *) (buf_a + y * stride_a);
-	row_b = (guint32 *) (buf_b + y * stride_b);
-	row = (guint32 *) (buf_diff + y * stride_diff);
+	row_a = (guint32 *) (gpointer) (buf_a + y * stride_a);
+	row_b = (guint32 *) (gpointer) (buf_b + y * stride_b);
+	row = (guint32 *) (gpointer) (buf_diff + y * stride_diff);
 	for (x = 0; x < width; x++) {
 	    /* check if the pixels are the same */
 	    if (row_a[x] != row_b[x]) {
commit 61ff20c9e2d47df48f08ba0e988846ab0501d190
Author: Benjamin Otte <otte at gnome.org>
Date:   Tue Nov 4 13:03:20 2008 +0100

    fix cast alignment warnings on ARM
    
    these casts are save, because we know the type of variable we got

diff --git a/swfdec/swfdec_as_context.c b/swfdec/swfdec_as_context.c
index 9f81253..6bf3749 100644
--- a/swfdec/swfdec_as_context.c
+++ b/swfdec/swfdec_as_context.c
@@ -326,7 +326,7 @@ swfdec_as_string_mark (const char *string)
 
   g_return_if_fail (string != NULL);
 
-  value = (SwfdecAsStringValue *) ((guint8 *) string - G_STRUCT_OFFSET (SwfdecAsStringValue, string));
+  value = (SwfdecAsStringValue *) (gpointer) ((guint8 *) string - G_STRUCT_OFFSET (SwfdecAsStringValue, string));
   if (!SWFDEC_AS_GCABLE_FLAG_IS_SET (value, SWFDEC_AS_GC_ROOT))
     SWFDEC_AS_GCABLE_SET_FLAG (value, SWFDEC_AS_GC_MARK);
 }
diff --git a/swfdec/swfdec_as_types.h b/swfdec/swfdec_as_types.h
index 4818542..6b0ddbc 100644
--- a/swfdec/swfdec_as_types.h
+++ b/swfdec/swfdec_as_types.h
@@ -96,7 +96,7 @@ struct _SwfdecAsDoubleValue {
 #define SWFDEC_AS_VALUE_GET_STRING(val) (((SwfdecAsStringValue *) (val)->value.gcable)->string)
 #define SWFDEC_AS_VALUE_SET_STRING(val,s) G_STMT_START { \
   SwfdecAsValue *__val = (val); \
-  (__val)->value.gcable = (SwfdecAsGcable *) ((guint8 *) (s) - G_STRUCT_OFFSET (SwfdecAsStringValue, string)); \
+  (__val)->value.gcable = (SwfdecAsGcable *) (gpointer) ((guint8 *) (s) - G_STRUCT_OFFSET (SwfdecAsStringValue, string)); \
   (__val)->type = SWFDEC_AS_TYPE_STRING; \
 } G_STMT_END