gegl r2060 - in trunk: . gegl/buffer gegl/property-types

[neo svn gnome org]

Author: neo
Date: Tue Feb 19 09:36:25 2008
New Revision: 2060
URL: http://svn.gnome.org/viewvc/gegl?rev=2060&view=rev

Log:
2008-02-19  Sven Neumann  <sven gimp org>

	* gegl/buffer/gegl-buffer-allocator.c
	* gegl/buffer/gegl-handler.c
	* gegl/buffer/gegl-handlers.c
	* gegl/buffer/gegl-storage.c
	* gegl/buffer/gegl-tile-mem.c
	* gegl/buffer/gegl-tile.c
	* gegl/property-types/gegl-color.c
	* gegl/property-types/gegl-curve.c
	* gegl/property-types/gegl-vector.c: organized includes.


Modified:
   trunk/ChangeLog
   trunk/gegl/buffer/gegl-buffer-allocator.c
   trunk/gegl/buffer/gegl-handler.c
   trunk/gegl/buffer/gegl-handlers.c
   trunk/gegl/buffer/gegl-storage.c
   trunk/gegl/buffer/gegl-tile-mem.c
   trunk/gegl/buffer/gegl-tile.c
   trunk/gegl/property-types/gegl-color.c
   trunk/gegl/property-types/gegl-curve.c
   trunk/gegl/property-types/gegl-vector.c

Modified: trunk/gegl/buffer/gegl-buffer-allocator.c
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-allocator.c	(original)
+++ trunk/gegl/buffer/gegl-buffer-allocator.c	Tue Feb 19 09:36:25 2008
@@ -15,6 +15,7 @@
  *
  * Copyright 2006 Ãyvind KolÃs <pippin gimp org>
  */
+
 #include "config.h"
 
 #include <sys/types.h>
@@ -22,17 +23,16 @@
 #include <unistd.h>
 #endif
 
-#include <glib.h>
-#include <glib/gprintf.h>
-#include <glib/gstdio.h>
 #include <glib-object.h>
+#include <glib/gstdio.h>
 
 #ifdef G_OS_WIN32
 #include <process.h>
 #define getpid() _getpid()
 #endif
 
-#include "../gegl-types.h"
+#include "gegl-types.h"
+
 #include "gegl-buffer-types.h"
 #include "gegl-storage.h"
 #include "gegl-buffer-allocator.h"

Modified: trunk/gegl/buffer/gegl-handler.c
==============================================================================
--- trunk/gegl/buffer/gegl-handler.c	(original)
+++ trunk/gegl/buffer/gegl-handler.c	Tue Feb 19 09:36:25 2008
@@ -16,14 +16,17 @@
  * Copyright 2006,2007 Ãyvind KolÃs <pippin gimp org>
  */
 
-#include <glib.h>
-#include <glib-object.h>
+#include "config.h"
+
 #include <string.h>
 
+#include <glib-object.h>
+
 #include "gegl-provider.h"
 #include "gegl-handler.h"
 #include "gegl-handlers.h"
 
+
 G_DEFINE_TYPE (GeglHandler, gegl_handler, GEGL_TYPE_PROVIDER)
 
 enum

Modified: trunk/gegl/buffer/gegl-handlers.c
==============================================================================
--- trunk/gegl/buffer/gegl-handlers.c	(original)
+++ trunk/gegl/buffer/gegl-handlers.c	Tue Feb 19 09:36:25 2008
@@ -15,12 +15,15 @@
  *
  * Copyright 2006, 2007 Ãyvind KolÃs <pippin gimp org>
  */
+
+#include "config.h"
+
 #include <glib.h>
-#include <glib/gprintf.h>
-#include <glib/gstdio.h>
+
 #include "gegl-handlers.h"
 #include "gegl-handler-cache.h"
 
+
 G_DEFINE_TYPE (GeglHandlers, gegl_handlers, GEGL_TYPE_HANDLER)
 
 static void   gegl_handlers_rebind (GeglHandlers *handlers);
@@ -87,12 +90,12 @@
           gint          y,
           gint          z)
 {
-  GeglHandlers  *handlers = (GeglHandlers*)tile_store;
-  GeglProvider  *provider = ((GeglHandler*)tile_store)->provider;
-  GeglTile       *tile   = NULL;
+  GeglHandlers  *handlers = (GeglHandlers *) tile_store;
+  GeglProvider  *provider = ((GeglHandler *) tile_store)->provider;
+  GeglTile      *tile     = NULL;
 
   if (handlers->chain != NULL)
-    tile = gegl_provider_get_tile ((GeglProvider*)(handlers->chain->data),
+    tile = gegl_provider_get_tile ((GeglProvider *) (handlers->chain->data),
                                      x, y, z);
   else if (provider)
     tile = gegl_provider_get_tile (provider, x, y, z);
@@ -109,11 +112,12 @@
          gint            z,
          gpointer        data)
 {
-  GeglHandlers *handlers = (GeglHandlers*)tile_store;
-  GeglProvider *provider = ((GeglHandler*)tile_store)->provider;
+  GeglHandlers *handlers = (GeglHandlers *) tile_store;
+  GeglProvider *provider = ((GeglHandler *) tile_store)->provider;
 
   if (handlers->chain != NULL)
-    return gegl_provider_message ((GeglProvider*)(handlers->chain->data), message, x, y, z, data);
+    return gegl_provider_message ((GeglProvider *)(handlers->chain->data),
+                                  message, x, y, z, data);
   else if (provider)
     return gegl_provider_message (provider, message, x, y, z, data);
   else
@@ -125,7 +129,7 @@
 static void
 gegl_handlers_class_init (GeglHandlersClass *class)
 {
-  GObjectClass       *gobject_class;
+  GObjectClass      *gobject_class;
   GeglProviderClass *tile_store_class;
 
   gobject_class    = (GObjectClass *) class;
@@ -155,7 +159,7 @@
   iter = handlers->chain;
   while (iter)
     {
-      GeglHandler   *handler;
+      GeglHandler  *handler;
       GeglProvider *provider = NULL;
 
       handler = iter->data;

Modified: trunk/gegl/buffer/gegl-storage.c
==============================================================================
--- trunk/gegl/buffer/gegl-storage.c	(original)
+++ trunk/gegl/buffer/gegl-storage.c	Tue Feb 19 09:36:25 2008
@@ -16,10 +16,9 @@
  * Copyright 2006, 2007 Ãyvind KolÃs <pippin gimp org>
  */
 
-#include <stdlib.h>
-#include <glib.h>
-#include <glib/gprintf.h>
-#include <glib/gstdio.h>
+#include "config.h"
+
+#include <glib-object.h>
 
 #include "gegl-storage.h"
 #include "gegl-tile.h"
@@ -30,6 +29,7 @@
 #include "gegl-handler-cache.h"
 #include "gegl-handler-log.h"
 
+
 G_DEFINE_TYPE (GeglStorage, gegl_storage, GEGL_TYPE_TILE_TRAITS)
 
 #define TILE_WIDTH  128

Modified: trunk/gegl/buffer/gegl-tile-mem.c
==============================================================================
--- trunk/gegl/buffer/gegl-tile-mem.c	(original)
+++ trunk/gegl/buffer/gegl-tile-mem.c	Tue Feb 19 09:36:25 2008
@@ -15,21 +15,23 @@
  *
  * Copyright 2006,2007 Ãyvind KolÃs <pippin gimp org>
  */
+
 #include "config.h"
 
+#include <string.h>
+#include <errno.h>
+
 #include <fcntl.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <errno.h>
-#include <glib.h>
+
 #include <glib-object.h>
-#include <glib/gprintf.h>
 #include <glib/gstdio.h>
+
 #include "gegl-tile-backend.h"
 #include "gegl-tile-mem.h"
-#include <string.h>
-#include <stdio.h>
+
 
 static void dbg_alloc (int size);
 static void dbg_dealloc (int size);

Modified: trunk/gegl/buffer/gegl-tile.c
==============================================================================
--- trunk/gegl/buffer/gegl-tile.c	(original)
+++ trunk/gegl/buffer/gegl-tile.c	Tue Feb 19 09:36:25 2008
@@ -15,20 +15,24 @@
  *
  * Copyright 2006,2007 Ãyvind KolÃs <pippin gimp org>
  */
+
 #include "config.h"
 
-#include <glib.h>
-#include <glib-object.h>
-#include <glib/gprintf.h>
+#include "string.h" /* memcpy */
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include "string.h" /* memcpy */
-#include "../gegl-types.h"
+
+#include <glib-object.h>
+
+#include "gegl-types.h"
+
 #include "gegl-buffer.h"
 #include "gegl-buffer-private.h"
 #include "gegl-tile.h"
 
+
 G_DEFINE_TYPE (GeglTile, gegl_tile, G_TYPE_OBJECT)
 enum
 {

Modified: trunk/gegl/property-types/gegl-color.c
==============================================================================
--- trunk/gegl/property-types/gegl-color.c	(original)
+++ trunk/gegl/property-types/gegl-color.c	Tue Feb 19 09:36:25 2008
@@ -16,15 +16,17 @@
  * Copyright 2006 Martin Nordholts <enselic hotmail com>
  */
 
-#include <glib.h>
-#include <glib/gprintf.h>
-#include <glib-object.h>
+#include "config.h"
+
 #include <string.h>
 
+#include <glib-object.h>
+
 #include "gegl-types.h"
 
 #include "gegl-color.h"
 
+
 enum
 {
   PROP_0,

Modified: trunk/gegl/property-types/gegl-curve.c
==============================================================================
--- trunk/gegl/property-types/gegl-curve.c	(original)
+++ trunk/gegl/property-types/gegl-curve.c	Tue Feb 19 09:36:25 2008
@@ -17,16 +17,18 @@
  * Spline Code Copyright 1997 David Mosberger
  */
 
-#include <glib.h>
-#include <glib/gprintf.h>
-#include <glib-object.h>
+#include "config.h"
+
 #include <string.h>
 #include <stdlib.h>
 
+#include <glib-object.h>
+
 #include "gegl-types.h"
 
 #include "gegl-curve.h"
 
+
 enum
 {
   PROP_0

Modified: trunk/gegl/property-types/gegl-vector.c
==============================================================================
--- trunk/gegl/property-types/gegl-vector.c	(original)
+++ trunk/gegl/property-types/gegl-vector.c	Tue Feb 19 09:36:25 2008
@@ -17,11 +17,11 @@
  * Spline Code Copyright 1997 David Mosberger
  */
 
-#include <glib.h>
-#include <glib/gprintf.h>
-#include <glib-object.h>
+#include "config.h"
+
 #include <string.h>
-#include <stdlib.h>
+
+#include <glib-object.h>
 
 #include "gegl-types.h"