gst/goom/: Compile fixes for x86-64.

Original commit message from CVS:
* gst/goom/goomsl_heap.c: (align_it):
* gst/goom/plugin_info.c: (setOptimizedMethods):
Compile fixes for x86-64.

diff --git a/ChangeLog b/ChangeLog
index 870b847..da33c5f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-23  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * gst/goom/goomsl_heap.c: (align_it):
+       * gst/goom/plugin_info.c: (setOptimizedMethods):
+         Compile fixes for x86-64.
+
 2008-02-23  Bastien Nocera  <hadess@hadess.net>
 
        * gst/goom/Makefile.am: Don't compile lex or yacc outputs

diff --git a/gst/goom/goomsl_heap.c b/gst/goom/goomsl_heap.c
index 4cbab5c..e418a2a 100644 (file)
--- a/gst/goom/goomsl_heap.c
+++ b/gst/goom/goomsl_heap.c
@@ -46,8 +46,8 @@ align_it (GoomHeap * _this, int alignment)
 {
   if ((alignment > 1) && (_this->number_of_arrays > 0)) {
     void *last_array = _this->arrays[_this->number_of_arrays - 1];
-    int last_address = (int) last_array + _this->consumed_in_last_array;
-    int decal = (last_address % alignment);
+    long last_address = (long) last_array + _this->consumed_in_last_array;
+    long decal = (last_address % alignment);
 
     if (decal != 0) {
       _this->consumed_in_last_array += alignment - decal;

diff --git a/gst/goom/plugin_info.c b/gst/goom/plugin_info.c
index 465c290..f5d04ba 100644 (file)
--- a/gst/goom/plugin_info.c
+++ b/gst/goom/plugin_info.c
@@ -36,11 +36,12 @@ setOptimizedMethods (PluginInfo * p)
   p->methods.zoom_filter = zoom_filter_c;
 /*    p->methods.create_output_with_brightness = create_output_with_brightness;*/
 
+/* FIXME: what about HAVE_CPU_X86_64 ? */
 #ifdef HAVE_CPU_I386
   printf ("have an x86\n");
   if (cpuFlavour & OIL_IMPL_FLAG_MMXEXT) {
 #ifdef VERBOSE
-    printf ("Extented MMX detected. Using the fastest methods !\n");
+    printf ("Extended MMX detected. Using the fastest methods !\n");
 #endif
     p->methods.draw_line = draw_line_mmx;
     p->methods.zoom_filter = zoom_filter_xmmx;
@@ -74,6 +75,7 @@ setOptimizedMethods (PluginInfo * p)
   }
 #endif /* HAVE_CPU_PPC */
 
+  cpuFlavour = 0;               /* trick compiler into thinking variable is used */
 }
 
 void