gegl r2211 - in trunk: . gegl operations/common

[ok svn gnome org]

Author: ok
Date: Mon Apr 21 12:29:39 2008
New Revision: 2211
URL: http://svn.gnome.org/viewvc/gegl?rev=2211&view=rev

Log:
* gegl/gegl-plugin.h: made USE_GCC_VECTORS define possible to check
with both #if and #ifdef.
* operations/common/brightness-contrast.c: renamed process_sse to
process_gcc_vectors.


Modified:
   trunk/ChangeLog
   trunk/gegl/gegl-plugin.h
   trunk/operations/common/brightness-contrast.c

Modified: trunk/gegl/gegl-plugin.h
==============================================================================
--- trunk/gegl/gegl-plugin.h	(original)
+++ trunk/gegl/gegl-plugin.h	Mon Apr 21 12:29:39 2008
@@ -86,23 +86,10 @@
 const gchar * gegl_extension_handler_get      (const gchar *extension);
 
 
-#if 1
+#define CHECK_GCC_VECTORS defined(__GNUC__) && (__GNUC__ >= 4)
 
-#include <glib-object.h>
-#include <babl/babl.h>
-#include <operation/gegl-operation.h>
-#include <operation/gegl-operation-filter.h>
-#include <operation/gegl-operation-area-filter.h>
-#include <operation/gegl-operation-point-filter.h>
-#include <operation/gegl-operation-composer.h>
-#include <operation/gegl-operation-point-composer.h>
-#include <operation/gegl-operation-source.h>
-#include <operation/gegl-operation-sink.h>
-#include <operation/gegl-operation-meta.h>
-
-#define USE_GCC_VECTORS defined(__GNUC__) && (__GNUC__ >= 4)
-
-#if USE_GCC_VECTORS
+#if CHECK_GCC_VECTORS
+#define USE_GCC_VECTORS 1
 
 typedef float Gegl4float __attribute__ ((vector_size (4*sizeof(float))));
 
@@ -120,8 +107,24 @@
 
 #define Gegl4float_mul(vec,val)  ((vec) * Gegl4float_all(val))
 
+
 #endif
 
+#if 1
+
+#include <glib-object.h>
+#include <babl/babl.h>
+#include <operation/gegl-operation.h>
+#include <operation/gegl-operation-filter.h>
+#include <operation/gegl-operation-area-filter.h>
+#include <operation/gegl-operation-point-filter.h>
+#include <operation/gegl-operation-composer.h>
+#include <operation/gegl-operation-point-composer.h>
+#include <operation/gegl-operation-source.h>
+#include <operation/gegl-operation-sink.h>
+#include <operation/gegl-operation-meta.h>
+
+
 #else
 
 /***** ***/

Modified: trunk/operations/common/brightness-contrast.c
==============================================================================
--- trunk/operations/common/brightness-contrast.c	(original)
+++ trunk/operations/common/brightness-contrast.c	Mon Apr 21 12:29:39 2008
@@ -111,10 +111,10 @@
 #ifdef USE_GCC_VECTORS
 
 static gboolean
-process_sse (GeglOperation *op,
-             void          *in_buf,
-             void          *out_buf,
-             glong          samples)
+process_gcc_vectors (GeglOperation *op,
+                     void          *in_buf,
+                     void          *out_buf,
+                     glong          samples)
 {
   GeglChantO *o = GEGL_CHANT_PROPERTIES (op);
   Gegl4float *in  = in_buf;
@@ -175,7 +175,7 @@
    * broken and not conforming to the reference implementation.
    */
   gegl_operation_class_add_processor (operation_class,
-                                      G_CALLBACK (process_sse), "gcc-vectors");
+                                      G_CALLBACK (process_gcc_vectors), "gcc-vectors");
 #endif
 }