Merge branch 'master' into 0.11

[platform/upstream/gst-plugins-good.git] / gst / flx / flx_color.c

diff --git a/gst/flx/flx_color.c b/gst/flx/flx_color.c
index c61052d..854010a 100644 (file)
--- a/gst/flx/flx_color.c
+++ b/gst/flx/flx_color.c
@@ -1,5 +1,5 @@
-/* Gnome-Streamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
+/* GStreamer
+ * Copyright (C) <1999> Erik Walthinsen <omega@temple-baptist.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -17,78 +17,102 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 #include <gst/gst.h>
 
-
 #include "flx_color.h"
 
 FlxColorSpaceConverter *
-flx_colorspace_converter_new(gint width, gint height)
+flx_colorspace_converter_new (gint width, gint height)
 {
-  FlxColorSpaceConverter *new = g_malloc(sizeof(FlxColorSpaceConverter));
+  FlxColorSpaceConverter *new = g_malloc (sizeof (FlxColorSpaceConverter));
 
   new->width = width;
   new->height = height;
 
-  memset(new->palvec, 0, sizeof(new->palvec));  
+  memset (new->palvec, 0, sizeof (new->palvec));
   return new;
 }
 
 void
-flx_colorspace_converter_destroy(FlxColorSpaceConverter *flxpal)
+flx_colorspace_converter_destroy (FlxColorSpaceConverter * flxpal)
 {
-  g_return_if_fail(flxpal != NULL);
+  g_return_if_fail (flxpal != NULL);
 
-  g_free(flxpal);
+  g_free (flxpal);
 }
 
 void
-flx_colorspace_convert(FlxColorSpaceConverter *flxpal, guchar *src, guchar *dest)
+flx_colorspace_convert (FlxColorSpaceConverter * flxpal, guchar * src,
+    guchar * dest)
 {
   guint size, col;
 
-  g_return_if_fail(flxpal != NULL);
-  g_return_if_fail(src != dest);
+  g_return_if_fail (flxpal != NULL);
+  g_return_if_fail (src != dest);
 
 
   size = flxpal->width * flxpal->height;
 
-  while(size--) {
-    col     = (*src++ * 3);
-    *dest++ = flxpal->palvec[col+2];
-    *dest++ = flxpal->palvec[col+1];
+  while (size--) {
+    col = (*src++ * 3);
+
+#if G_BYTE_ORDER == G_BIG_ENDIAN
+    *dest++ = 0;
+    *dest++ = flxpal->palvec[col];
+    *dest++ = flxpal->palvec[col + 1];
+    *dest++ = flxpal->palvec[col + 2];
+#else
+    *dest++ = flxpal->palvec[col + 2];
+    *dest++ = flxpal->palvec[col + 1];
     *dest++ = flxpal->palvec[col];
     *dest++ = 0;
+#endif
   }
 
 }
 
 
-void 
-flx_set_palette_vector(FlxColorSpaceConverter *flxpal, guint start, guint num, guchar *newpal)
+void
+flx_set_palette_vector (FlxColorSpaceConverter * flxpal, guint start, guint num,
+    guchar * newpal, gint scale)
 {
-  guint  grab;
-  
-  g_return_if_fail(flxpal != NULL);
-  g_return_if_fail(start < 0x100);
+  guint grab;
+
+  g_return_if_fail (flxpal != NULL);
+  g_return_if_fail (start < 0x100);
 
   grab = ((start + num) > 0x100 ? 0x100 - start : num);
 
-  memcpy(&flxpal->palvec[start * 3], newpal, grab*3);
+  if (scale) {
+    gint i = 0;
+
+    start *= 3;
+    while (grab) {
+      flxpal->palvec[start++] = newpal[i++] << scale;
+      flxpal->palvec[start++] = newpal[i++] << scale;
+      flxpal->palvec[start++] = newpal[i++] << scale;
+      grab--;
+    }
+  } else {
+    memcpy (&flxpal->palvec[start * 3], newpal, grab * 3);
+  }
 
 }
 
 void
-flx_set_color(FlxColorSpaceConverter *flxpal, guint colr, guint red, guint green, guint blue)
+flx_set_color (FlxColorSpaceConverter * flxpal, guint colr, guint red,
+    guint green, guint blue, gint scale)
 {
-  
-  g_return_if_fail(flxpal != NULL);
-  g_return_if_fail(colr < 0x100);
-
-  flxpal->palvec[(colr * 3)]     = red;
-  flxpal->palvec[(colr * 3) + 1] = green;
-  flxpal->palvec[(colr * 3) + 2] = blue;
-}
 
+  g_return_if_fail (flxpal != NULL);
+  g_return_if_fail (colr < 0x100);
 
+  flxpal->palvec[(colr * 3)] = red << scale;
+  flxpal->palvec[(colr * 3) + 1] = green << scale;
+  flxpal->palvec[(colr * 3) + 2] = blue << scale;
+}