gegl r1809 - in trunk: . gegl/buffer gegl/operation gegl/property-types
- From: mitch svn gnome org
- To: svn-commits-list gnome org
- Subject: gegl r1809 - in trunk: . gegl/buffer gegl/operation gegl/property-types
- Date: Sun, 6 Jan 2008 15:36:54 +0000 (GMT)
Author: mitch
Date: Sun Jan 6 15:36:52 2008
New Revision: 1809
URL: http://svn.gnome.org/viewvc/gegl?rev=1809&view=rev
Log:
2008-01-06 Michael Natterer <mitch gimp org>
* gegl/buffer/gegl-buffer-allocator.h
* gegl/buffer/gegl-buffer-load.h
* gegl/buffer/gegl-buffer-private.h
* gegl/buffer/gegl-buffer-save.h
* gegl/buffer/gegl-buffer-types.h
* gegl/buffer/gegl-buffer.h
* gegl/buffer/gegl-cache.h
* gegl/buffer/gegl-handler-cache.h
* gegl/buffer/gegl-handler-empty.h
* gegl/buffer/gegl-handler-log.h
* gegl/buffer/gegl-handler-zoom.h
* gegl/buffer/gegl-handler.h
* gegl/buffer/gegl-handlers.h
* gegl/buffer/gegl-provider.h
* gegl/buffer/gegl-region-generic.h
* gegl/buffer/gegl-region.h
* gegl/buffer/gegl-sampler-lanczos.h
* gegl/buffer/gegl-sampler-linear.h
* gegl/buffer/gegl-sampler-nearest.h
* gegl/buffer/gegl-sampler.h
* gegl/buffer/gegl-storage.h
* gegl/buffer/gegl-tile-backend.h
* gegl/buffer/gegl-tile-disk.h
* gegl/buffer/gegl-tile-mem.h
* gegl/buffer/gegl-tile.h
* gegl/operation/gegl-extension-handler.h
* gegl/operation/gegl-operation-area-filter.h
* gegl/operation/gegl-operation-composer.h
* gegl/operation/gegl-operation-filter.h
* gegl/operation/gegl-operation-meta.h
* gegl/operation/gegl-operation-point-composer.h
* gegl/operation/gegl-operation-point-filter.h
* gegl/operation/gegl-operation-sink.h
* gegl/operation/gegl-operation-source.h
* gegl/operation/gegl-operation.h
* gegl/property-types/gegl-color.h
* gegl/property-types/gegl-curve.h: header cleanup: added missing
GEGL_IS_FOO() macros, unified include guards, indentation, remove
tons of includes, remove trailing whitespace, stuff...
Modified:
trunk/ChangeLog
trunk/gegl/buffer/gegl-buffer-allocator.h
trunk/gegl/buffer/gegl-buffer-load.h
trunk/gegl/buffer/gegl-buffer-private.h
trunk/gegl/buffer/gegl-buffer-save.h
trunk/gegl/buffer/gegl-buffer-types.h
trunk/gegl/buffer/gegl-buffer.h
trunk/gegl/buffer/gegl-cache.h
trunk/gegl/buffer/gegl-handler-cache.h
trunk/gegl/buffer/gegl-handler-empty.h
trunk/gegl/buffer/gegl-handler-log.h
trunk/gegl/buffer/gegl-handler-zoom.h
trunk/gegl/buffer/gegl-handler.h
trunk/gegl/buffer/gegl-handlers.h
trunk/gegl/buffer/gegl-provider.h
trunk/gegl/buffer/gegl-region-generic.h
trunk/gegl/buffer/gegl-region.h
trunk/gegl/buffer/gegl-sampler-lanczos.h
trunk/gegl/buffer/gegl-sampler-linear.h
trunk/gegl/buffer/gegl-sampler-nearest.h
trunk/gegl/buffer/gegl-sampler.h
trunk/gegl/buffer/gegl-storage.h
trunk/gegl/buffer/gegl-tile-backend.h
trunk/gegl/buffer/gegl-tile-disk.h
trunk/gegl/buffer/gegl-tile-mem.h
trunk/gegl/buffer/gegl-tile.h
trunk/gegl/operation/gegl-extension-handler.h
trunk/gegl/operation/gegl-operation-area-filter.h
trunk/gegl/operation/gegl-operation-composer.h
trunk/gegl/operation/gegl-operation-filter.h
trunk/gegl/operation/gegl-operation-meta.h
trunk/gegl/operation/gegl-operation-point-composer.h
trunk/gegl/operation/gegl-operation-point-filter.h
trunk/gegl/operation/gegl-operation-sink.h
trunk/gegl/operation/gegl-operation-source.h
trunk/gegl/operation/gegl-operation.h
trunk/gegl/property-types/gegl-color.h
trunk/gegl/property-types/gegl-curve.h
Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Sun Jan 6 15:36:52 2008
@@ -1,5 +1,47 @@
2008-01-06 Michael Natterer <mitch gimp org>
+ * gegl/buffer/gegl-buffer-allocator.h
+ * gegl/buffer/gegl-buffer-load.h
+ * gegl/buffer/gegl-buffer-private.h
+ * gegl/buffer/gegl-buffer-save.h
+ * gegl/buffer/gegl-buffer-types.h
+ * gegl/buffer/gegl-buffer.h
+ * gegl/buffer/gegl-cache.h
+ * gegl/buffer/gegl-handler-cache.h
+ * gegl/buffer/gegl-handler-empty.h
+ * gegl/buffer/gegl-handler-log.h
+ * gegl/buffer/gegl-handler-zoom.h
+ * gegl/buffer/gegl-handler.h
+ * gegl/buffer/gegl-handlers.h
+ * gegl/buffer/gegl-provider.h
+ * gegl/buffer/gegl-region-generic.h
+ * gegl/buffer/gegl-region.h
+ * gegl/buffer/gegl-sampler-lanczos.h
+ * gegl/buffer/gegl-sampler-linear.h
+ * gegl/buffer/gegl-sampler-nearest.h
+ * gegl/buffer/gegl-sampler.h
+ * gegl/buffer/gegl-storage.h
+ * gegl/buffer/gegl-tile-backend.h
+ * gegl/buffer/gegl-tile-disk.h
+ * gegl/buffer/gegl-tile-mem.h
+ * gegl/buffer/gegl-tile.h
+ * gegl/operation/gegl-extension-handler.h
+ * gegl/operation/gegl-operation-area-filter.h
+ * gegl/operation/gegl-operation-composer.h
+ * gegl/operation/gegl-operation-filter.h
+ * gegl/operation/gegl-operation-meta.h
+ * gegl/operation/gegl-operation-point-composer.h
+ * gegl/operation/gegl-operation-point-filter.h
+ * gegl/operation/gegl-operation-sink.h
+ * gegl/operation/gegl-operation-source.h
+ * gegl/operation/gegl-operation.h
+ * gegl/property-types/gegl-color.h
+ * gegl/property-types/gegl-curve.h: header cleanup: added missing
+ GEGL_IS_FOO() macros, unified include guards, indentation, remove
+ tons of includes, remove trailing whitespace, stuff...
+
+2008-01-06 Michael Natterer <mitch gimp org>
+
* gegl/buffer/gegl-buffer-save.c: #include "config.h"
2007-01-06 Hans Breuer <hans breuer org>
Modified: trunk/gegl/buffer/gegl-buffer-allocator.h
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-allocator.h (original)
+++ trunk/gegl/buffer/gegl-buffer-allocator.h Sun Jan 6 15:36:52 2008
@@ -15,13 +15,12 @@
*
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#include <glib.h>
-#include <glib-object.h>
-#include "gegl-buffer-types.h"
+#ifndef __GEGL_BUFFER_ALLOCATOR_H__
+#define __GEGL_BUFFER_ALLOCATOR_H__
-#ifndef _GEGL_BUFFER_ALLOCATOR_H
-#define _GEGL_BUFFER_ALLOCATOR_H
+#include "gegl-buffer.h"
+#include "gegl-buffer-private.h"
#define GEGL_TYPE_BUFFER_ALLOCATOR (gegl_buffer_allocator_get_type ())
#define GEGL_BUFFER_ALLOCATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_BUFFER_ALLOCATOR, GeglBufferAllocator))
@@ -30,12 +29,10 @@
#define GEGL_IS_BUFFER_ALLOCATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_BUFFER_ALLOCATOR))
#define GEGL_BUFFER_ALLOCATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_BUFFER_ALLOCATOR, GeglBufferAllocatorClass))
-#include "gegl-buffer.h"
-#include "gegl-buffer-private.h"
-
struct _GeglBufferAllocator
{
- GeglBuffer parent_object;
+ GeglBuffer parent_instance;
+
gint x_used; /* currently used in x direction */
gint max_height; /* height of the talles allocation in this run */
gint y_used; /* the current y pos used for returns */
@@ -46,15 +43,14 @@
GeglBufferClass parent_class;
};
-GType gegl_buffer_allocator_get_type (void) G_GNUC_CONST;
+GType gegl_buffer_allocator_get_type (void) G_GNUC_CONST;
-void gegl_buffer_allocators_free (void);
+void gegl_buffer_allocators_free (void);
-GeglBuffer *
-gegl_buffer_new_from_format (const void *babl_format,
- gint x,
- gint y,
- gint width,
- gint height);
+GeglBuffer * gegl_buffer_new_from_format (const void *babl_format,
+ gint x,
+ gint y,
+ gint width,
+ gint height);
#endif
Modified: trunk/gegl/buffer/gegl-buffer-load.h
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-load.h (original)
+++ trunk/gegl/buffer/gegl-buffer-load.h Sun Jan 6 15:36:52 2008
@@ -15,14 +15,14 @@
*
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#include <glib.h>
+
+#ifndef __GEGL_BUFFER_LOAD_H__
+#define __GEGL_BUFFER_LOAD_H__
+
#include <glib-object.h>
#include "gegl-buffer.h"
-#ifndef _GEGL_BUFFER_LOAD_H
-#define _GEGL_BUFFER_LOAD_H
-
void gegl_buffer_load (GeglBuffer *buffer,
const gchar *path);
Modified: trunk/gegl/buffer/gegl-buffer-private.h
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-private.h (original)
+++ trunk/gegl/buffer/gegl-buffer-private.h Sun Jan 6 15:36:52 2008
@@ -16,15 +16,10 @@
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef _GEGL_BUFFER_PRIVATE_H
-#define _GEGL_BUFFER_PRIVATE_H
+#ifndef __GEGL_BUFFER_PRIVATE_H__
+#define __GEGL_BUFFER_PRIVATE_H__
-#include <glib.h>
-#include <glib-object.h>
-
-#include "gegl-buffer-types.h"
#include "gegl-buffer.h"
-#include <babl/babl.h>
#include "gegl-handlers.h"
#define GEGL_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_BUFFER, GeglBufferClass))
@@ -34,15 +29,15 @@
struct _GeglBuffer
{
- GeglHandlers parent_object; /* which is a GeglHandler which has a
- provider field which is used for chaining
- sub buffers with their anchestors */
+ GeglHandlers parent_instance; /* which is a GeglHandler which has a
+ provider field which is used for chaining
+ sub buffers with their anchestors */
GeglRectangle extent; /* the dimensions of the buffer */
const Babl *format; /* the pixel format used for pixels in this
buffer */
-
+
gint shift_x; /* The relative offset of origins compared with */
gint shift_y; /* anchestral storage buffer, during */
/* construction relative to immediate provider */
@@ -84,7 +79,7 @@
/* flush any unwritten data (flushes the hot-cache of a single
* tile used by gegl_buffer_set for 1x1 pixel sized rectangles
*/
-void gegl_buffer_flush (GeglBuffer *buffer);
+void gegl_buffer_flush (GeglBuffer *buffer);
#endif
Modified: trunk/gegl/buffer/gegl-buffer-save.h
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-save.h (original)
+++ trunk/gegl/buffer/gegl-buffer-save.h Sun Jan 6 15:36:52 2008
@@ -15,14 +15,14 @@
*
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#include <glib.h>
+
+#ifndef __GEGL_BUFFER_SAVE_H__
+#define __GEGL_BUFFER_SAVE_H__
+
#include <glib-object.h>
#include "gegl-buffer.h"
-#ifndef _GEGL_BUFFER_SAVE_H
-#define _GEGL_BUFFER_SAVE_H
-
typedef struct {
gchar magic[16];
gint width, height, x, y;
Modified: trunk/gegl/buffer/gegl-buffer-types.h
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-types.h (original)
+++ trunk/gegl/buffer/gegl-buffer-types.h Sun Jan 6 15:36:52 2008
@@ -15,8 +15,9 @@
*
* Copyright 2006,2007 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef _GEGL_BUFFER_TYPES_H
-#define _GEGL_BUFFER_TYPES_H
+
+#ifndef __GEGL_BUFFER_TYPES_H__
+#define __GEGL_BUFFER_TYPES_H__
typedef struct _GeglSampler GeglSampler;
@@ -38,7 +39,7 @@
typedef struct _GeglStorage GeglStorage;
typedef struct _GeglStorageClass GeglStorageClass;
-#ifndef _GEGL_BUFFER_H
+#ifndef __GEGL_BUFFER_H__
typedef struct _GeglBuffer GeglBuffer;
#endif
typedef struct _GeglBufferClass GeglBufferClass;
Modified: trunk/gegl/buffer/gegl-buffer.h
==============================================================================
--- trunk/gegl/buffer/gegl-buffer.h (original)
+++ trunk/gegl/buffer/gegl-buffer.h Sun Jan 6 15:36:52 2008
@@ -15,17 +15,16 @@
*
* Copyright 2006, 2007 Ãyvind KolÃs <pippin gimp org>
*/
-#include <glib.h>
-#include <glib-object.h>
-#include <babl/babl.h>
+#ifndef __GEGL_BUFFER_H__
+#define __GEGL_BUFFER_H__
-#ifndef _GEGL_BUFFER_H
-#define _GEGL_BUFFER_H
+#include <glib-object.h>
+#include <babl/babl.h>
#define GEGL_TYPE_BUFFER (gegl_buffer_get_type ())
#define GEGL_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_BUFFER, GeglBuffer))
-#ifndef _GEGL_BUFFER_TYPES_H
+#ifndef __GEGL_BUFFER_TYPES_H__
typedef struct _GeglBuffer GeglBuffer;
#endif
Modified: trunk/gegl/buffer/gegl-cache.h
==============================================================================
--- trunk/gegl/buffer/gegl-cache.h (original)
+++ trunk/gegl/buffer/gegl-cache.h Sun Jan 6 15:36:52 2008
@@ -19,10 +19,8 @@
#ifndef __GEGL_CACHE_H__
#define __GEGL_CACHE_H__
-#ifndef __GEGL_H__
-#include "gegl-types.h"
-#endif
#include "gegl-buffer.h"
+#include "gegl-buffer-private.h"
G_BEGIN_DECLS
@@ -33,11 +31,10 @@
#define GEGL_IS_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_CACHE))
#define GEGL_CACHE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_CACHE, GeglCacheClass))
-#include "gegl-buffer-private.h"
-
struct _GeglCache
{
- GeglBuffer parent;
+ GeglBuffer parent_instance;
+
GeglNode *node;
const void *format;
GeglRegion *valid_region;
@@ -45,7 +42,7 @@
struct _GeglCacheClass
{
- GeglBufferClass buffer_class;
+ GeglBufferClass parent_class;
};
GType gegl_cache_get_type (void) G_GNUC_CONST;
Modified: trunk/gegl/buffer/gegl-handler-cache.h
==============================================================================
--- trunk/gegl/buffer/gegl-handler-cache.h (original)
+++ trunk/gegl/buffer/gegl-handler-cache.h Sun Jan 6 15:36:52 2008
@@ -15,10 +15,10 @@
*
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef _HANDLER_CACHE_H
-#define _HANDLER_CACHE_H
-#include "gegl-buffer-types.h"
+#ifndef __GEGL_HANDLER_CACHE_H__
+#define __GEGL_HANDLER_CACHE_H__
+
#include "gegl-handler.h"
#define GEGL_TYPE_HANDLER_CACHE (gegl_handler_cache_get_type ())
@@ -29,18 +29,19 @@
#define GEGL_HANDLER_CACHE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_HANDLER_CACHE, GeglHandlerCacheClass))
-typedef struct _GeglHandlerCache GeglHandlerCache;
-typedef struct _GeglHandlerCacheClass GeglHandlerCacheClass;
+typedef struct _GeglHandlerCache GeglHandlerCache;
+typedef struct _GeglHandlerCacheClass GeglHandlerCacheClass;
struct _GeglHandlerCache
{
GeglHandler parent_instance;
+
GSList *list;
gint size;
gint hits;
gint misses;
- gint wash_percentage;
+ gint wash_percentage;
};
struct _GeglHandlerCacheClass
@@ -48,7 +49,6 @@
GeglHandlerClass parent_class;
};
-GType gegl_handler_cache_get_type (void) G_GNUC_CONST;
-
+GType gegl_handler_cache_get_type (void) G_GNUC_CONST;
#endif
Modified: trunk/gegl/buffer/gegl-handler-empty.h
==============================================================================
--- trunk/gegl/buffer/gegl-handler-empty.h (original)
+++ trunk/gegl/buffer/gegl-handler-empty.h Sun Jan 6 15:36:52 2008
@@ -15,12 +15,10 @@
*
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef _GEGL_HANDLER_EMPTY_H
-#define _GEGL_HANDLER_EMPTY_H
-#include <glib.h>
-#include "gegl-buffer-types.h"
-#include "gegl-tile.h"
+#ifndef __GEGL_HANDLER_EMPTY_H__
+#define __GEGL_HANDLER_EMPTY_H__
+
#include "gegl-handler.h"
G_BEGIN_DECLS
@@ -39,6 +37,7 @@
struct _GeglHandlerEmpty
{
GeglHandler parent_instance;
+
GeglTile *tile;
GeglTileBackend *backend;
};
Modified: trunk/gegl/buffer/gegl-handler-log.h
==============================================================================
--- trunk/gegl/buffer/gegl-handler-log.h (original)
+++ trunk/gegl/buffer/gegl-handler-log.h Sun Jan 6 15:36:52 2008
@@ -15,11 +15,10 @@
*
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef _GEGL_HANDLER_LOG_H
-#define _GEGL_HANDLER_LOG_H
-#include <glib.h>
-#include "gegl-tile.h"
+#ifndef __GEGL_HANDLER_LOG_H__
+#define __GEGL_HANDLER_LOG_H__
+
#include "gegl-handler.h"
G_BEGIN_DECLS
@@ -42,7 +41,7 @@
struct _GeglHandlerLogClass
{
- GeglHandlerClass parent_class;
+ GeglHandlerClass parent_class;
};
GType gegl_handler_log_get_type (void) G_GNUC_CONST;
Modified: trunk/gegl/buffer/gegl-handler-zoom.h
==============================================================================
--- trunk/gegl/buffer/gegl-handler-zoom.h (original)
+++ trunk/gegl/buffer/gegl-handler-zoom.h Sun Jan 6 15:36:52 2008
@@ -15,14 +15,11 @@
*
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef _GEGL_HANDLER_ZOOM_H
-#define _GEGL_HANDLER_ZOOM_H
-#include <glib.h>
-#include "gegl-buffer-types.h"
-#include "gegl-tile.h"
+#ifndef __GEGL_HANDLER_ZOOM_H__
+#define __GEGL_HANDLER_ZOOM_H__
+
#include "gegl-handler.h"
-#include "gegl-storage.h"
G_BEGIN_DECLS
@@ -40,13 +37,14 @@
struct _GeglHandlerZoom
{
GeglHandler parent_instance;
+
GeglTileBackend *backend;
GeglStorage *storage;
};
struct _GeglHandlerZoomClass
{
- GeglHandlerClass parent_class;
+ GeglHandlerClass parent_class;
};
GType gegl_handler_zoom_get_type (void) G_GNUC_CONST;
Modified: trunk/gegl/buffer/gegl-handler.h
==============================================================================
--- trunk/gegl/buffer/gegl-handler.h (original)
+++ trunk/gegl/buffer/gegl-handler.h Sun Jan 6 15:36:52 2008
@@ -15,13 +15,11 @@
*
* Copyright 2006,2007 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef _TILE_TRAIT_H
-#define _TILE_TRAIT_H
-#include <glib.h>
-#include "gegl-tile.h"
+#ifndef __TILE_TRAIT_H__
+#define __TILE_TRAIT_H__
+
#include "gegl-provider.h"
-#include "gegl-handler.h"
G_BEGIN_DECLS
@@ -33,10 +31,10 @@
#define GEGL_HANDLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_TILE_TRAIT, GeglHandlerClass))
-
struct _GeglHandler
{
GeglProvider parent_instance;
+
GeglProvider *provider;
};
Modified: trunk/gegl/buffer/gegl-handlers.h
==============================================================================
--- trunk/gegl/buffer/gegl-handlers.h (original)
+++ trunk/gegl/buffer/gegl-handlers.h Sun Jan 6 15:36:52 2008
@@ -15,27 +15,23 @@
*
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#include <glib.h>
-#include <glib-object.h>
-#include "gegl-buffer-types.h"
-#include "gegl-tile.h"
-
-#ifndef _GEGL_HANDLERS_H
-#define _GEGL_HANDLERS_H
-
-#define GEGL_TYPE_TILE_TRAITS (gegl_handlers_get_type ())
-#define GEGL_HANDLERS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE_TRAITS, GeglHandlers))
-#define GEGL_HANDLERS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_TILE_TRAITS, GeglHandlersClass))
-#define GEGL_IS_TILE_TRAITS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE_TRAITS))
-#define GEGL_IS_TILE_TRAITS_CLASS(klass)(G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_TILE_TRAITS))
-#define GEGL_HANDLERS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_TILE_TRAITS, GeglHandlersClass))
+#ifndef __GEGL_HANDLERS_H__
+#define __GEGL_HANDLERS_H__
#include "gegl-handler.h"
+#define GEGL_TYPE_TILE_TRAITS (gegl_handlers_get_type ())
+#define GEGL_HANDLERS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE_TRAITS, GeglHandlers))
+#define GEGL_HANDLERS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_TILE_TRAITS, GeglHandlersClass))
+#define GEGL_IS_TILE_TRAITS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE_TRAITS))
+#define GEGL_IS_TILE_TRAITS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_TILE_TRAITS))
+#define GEGL_HANDLERS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_TILE_TRAITS, GeglHandlersClass))
+
struct _GeglHandlers
{
- GeglHandler parent_object;
+ GeglHandler parent_instance;
+
GSList *chain;
};
@@ -44,7 +40,7 @@
GeglHandlerClass parent_class;
};
-GType gegl_handlers_get_type (void) G_GNUC_CONST;
+GType gegl_handlers_get_type (void) G_GNUC_CONST;
/* NOTE: gegl_handlers_add steals the initial assumed reference */
GeglHandler * gegl_handlers_add (GeglHandlers *handlers,
@@ -52,6 +48,6 @@
/* returns the first matching handler of a specified type (or NULL) */
GeglHandler * gegl_handlers_get_first (GeglHandlers *handlers,
- GType type);
+ GType type);
#endif
Modified: trunk/gegl/buffer/gegl-provider.h
==============================================================================
--- trunk/gegl/buffer/gegl-provider.h (original)
+++ trunk/gegl/buffer/gegl-provider.h Sun Jan 6 15:36:52 2008
@@ -15,10 +15,12 @@
*
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef _GEGL_PROVIDER_H
-#define _GEGL_PROVIDER_H
-#include <glib.h>
+#ifndef __GEGL_PROVIDER_H__
+#define __GEGL_PROVIDER_H__
+
+#include <glib-object.h>
+#include <babl/babl.h>
#include "gegl-buffer-types.h"
#include "gegl-tile.h"
@@ -50,12 +52,12 @@
struct _GeglProvider
{
- GObject parent_instance;
+ GObject parent_instance;
};
struct _GeglProviderClass
{
- GObjectClass parent_class;
+ GObjectClass parent_class;
GeglTile *(*get_tile) (GeglProvider *gegl_provider,
gint x,
@@ -72,17 +74,17 @@
GType gegl_provider_get_type (void) G_GNUC_CONST;
-GeglTile * gegl_provider_get_tile (GeglProvider *gegl_provider,
- gint x,
- gint y,
- gint z);
-
-gboolean gegl_provider_message (GeglProvider *gegl_provider,
- GeglTileMessage message,
- gint x,
- gint y,
- gint z,
- gpointer data);
+GeglTile * gegl_provider_get_tile (GeglProvider *gegl_provider,
+ gint x,
+ gint y,
+ gint z);
+
+gboolean gegl_provider_message (GeglProvider *gegl_provider,
+ GeglTileMessage message,
+ gint x,
+ gint y,
+ gint z,
+ gpointer data);
G_END_DECLS
Modified: trunk/gegl/buffer/gegl-region-generic.h
==============================================================================
--- trunk/gegl/buffer/gegl-region-generic.h (original)
+++ trunk/gegl/buffer/gegl-region-generic.h Sun Jan 6 15:36:52 2008
@@ -24,13 +24,13 @@
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -47,7 +47,7 @@
typedef GeglSegment GeglRegionBox;
-/*
+/*
* clip region
*/
@@ -61,7 +61,7 @@
/* 1 if two BOXs overlap.
* 0 if two BOXs do not overlap.
- * Remember, x2 and y2 are not in the region
+ * Remember, x2 and y2 are not in the region
*/
#define EXTENTCHECK(r1, r2) \
((r1)->x2 > (r2)->x1 && \
@@ -91,7 +91,7 @@
else \
(reg)->rects = g_renew (GeglRegionBox, (reg)->rects, (nRects)); \
(reg)->size = (nRects); \
- }
+ }
/*
* Check to see if there is enough memory in the present region.
Modified: trunk/gegl/buffer/gegl-region.h
==============================================================================
--- trunk/gegl/buffer/gegl-region.h (original)
+++ trunk/gegl/buffer/gegl-region.h Sun Jan 6 15:36:52 2008
@@ -19,7 +19,7 @@
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GEGL_REGION_H__
@@ -30,8 +30,6 @@
G_BEGIN_DECLS
-
-
struct _GeglSegment
{
gint x1;
Modified: trunk/gegl/buffer/gegl-sampler-lanczos.h
==============================================================================
--- trunk/gegl/buffer/gegl-sampler-lanczos.h (original)
+++ trunk/gegl/buffer/gegl-sampler-lanczos.h Sun Jan 6 15:36:52 2008
@@ -14,35 +14,37 @@
* License along with GEGL; if not, see <http://www.gnu.org/licenses/>.
*
*/
-#ifndef _GEGL_SAMPLER_LANCZOS_H__
-#define _GEGL_SAMPLER_LANCZOS_H__
-#include <glib-object.h>
-#include "gegl-types.h"
+#ifndef __GEGL_SAMPLER_LANCZOS_H__
+#define __GEGL_SAMPLER_LANCZOS_H__
+
#include "gegl-sampler.h"
G_BEGIN_DECLS
-#define GEGL_TYPE_SAMPLER_LANCZOS (gegl_sampler_lanczos_get_type ())
-#define GEGL_SAMPLER_LANCZOS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_SAMPLER_LANCZOS, GeglSamplerLanczos))
-#define GEGL_SAMPLER_LANCZOS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_SAMPLER_LANCZOS, GeglSamplerLanczosClass))
-#define GEGL_SAMPLER_LANCZOS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_SAMPLER_LANCZOS, GeglSamplerLanczosClass))
+#define GEGL_TYPE_SAMPLER_LANCZOS (gegl_sampler_lanczos_get_type ())
+#define GEGL_SAMPLER_LANCZOS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_SAMPLER_LANCZOS, GeglSamplerLanczos))
+#define GEGL_SAMPLER_LANCZOS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_SAMPLER_LANCZOS, GeglSamplerLanczosClass))
+#define GEGL_IS_SAMPLER_LANCZOS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_SAMPLER_LANCZOS))
+#define GEGL_IS_SAMPLER_LANCZOS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_SAMPLER_LANCZOS))
+#define GEGL_SAMPLER_LANCZOS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_SAMPLER_LANCZOS, GeglSamplerLanczosClass))
+
+typedef struct _GeglSamplerLanczos GeglSamplerLanczos;
+typedef struct _GeglSamplerLanczosClass GeglSamplerLanczosClass;
-typedef struct _GeglSamplerLanczos GeglSamplerLanczos;
struct _GeglSamplerLanczos
{
- GeglSampler parent_instance;
+ GeglSampler parent_instance;
/*< private >*/
- gfloat *lanczos_lookup;
- gint lanczos_width;
- gint lanczos_spp;
+ gfloat *lanczos_lookup;
+ gint lanczos_width;
+ gint lanczos_spp;
};
-typedef struct _GeglSamplerLanczosClass GeglSamplerLanczosClass;
struct _GeglSamplerLanczosClass
{
- GeglSamplerClass parent_class;
+ GeglSamplerClass parent_class;
};
GType gegl_sampler_lanczos_get_type (void) G_GNUC_CONST;
Modified: trunk/gegl/buffer/gegl-sampler-linear.h
==============================================================================
--- trunk/gegl/buffer/gegl-sampler-linear.h (original)
+++ trunk/gegl/buffer/gegl-sampler-linear.h Sun Jan 6 15:36:52 2008
@@ -14,21 +14,24 @@
* License along with GEGL; if not, see <http://www.gnu.org/licenses/>.
*
*/
-#ifndef _GEGL_SAMPLER_LINEAR_H__
-#define _GEGL_SAMPLER_LINEAR_H__
-#include <glib-object.h>
-#include "gegl-types.h"
+#ifndef __GEGL_SAMPLER_LINEAR_H__
+#define __GEGL_SAMPLER_LINEAR_H__
+
#include "gegl-sampler.h"
G_BEGIN_DECLS
-#define GEGL_TYPE_SAMPLER_LINEAR (gegl_sampler_linear_get_type ())
-#define GEGL_SAMPLER_LINEAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_SAMPLER_LINEAR, GeglSamplerLinear))
-#define GEGL_SAMPLER_LINEAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_SAMPLER_LINEAR, GeglSamplerLinearClass))
-#define GEGL_SAMPLER_LINEAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_SAMPLER_LINEAR, GeglSamplerLinearClass))
+#define GEGL_TYPE_SAMPLER_LINEAR (gegl_sampler_linear_get_type ())
+#define GEGL_SAMPLER_LINEAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_SAMPLER_LINEAR, GeglSamplerLinear))
+#define GEGL_SAMPLER_LINEAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_SAMPLER_LINEAR, GeglSamplerLinearClass))
+#define GEGL_IS_SAMPLER_LINEAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_SAMPLER_LINEAR))
+#define GEGL_IS_SAMPLER_LINEAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_SAMPLER_LINEAR))
+#define GEGL_SAMPLER_LINEAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_SAMPLER_LINEAR, GeglSamplerLinearClass))
+
+typedef struct _GeglSamplerLinear GeglSamplerLinear;
+typedef struct _GeglSamplerLinearClass GeglSamplerLinearClass;
-typedef struct _GeglSamplerLinear GeglSamplerLinear;
struct _GeglSamplerLinear
{
GeglSampler parent_instance;
@@ -36,7 +39,6 @@
/*< private >*/
};
-typedef struct _GeglSamplerLinearClass GeglSamplerLinearClass;
struct _GeglSamplerLinearClass
{
GeglSamplerClass parent_class;
Modified: trunk/gegl/buffer/gegl-sampler-nearest.h
==============================================================================
--- trunk/gegl/buffer/gegl-sampler-nearest.h (original)
+++ trunk/gegl/buffer/gegl-sampler-nearest.h Sun Jan 6 15:36:52 2008
@@ -14,28 +14,30 @@
* License along with GEGL; if not, see <http://www.gnu.org/licenses/>.
*
*/
-#ifndef _GEGL_SAMPLER_NEAREST_H__
-#define _GEGL_SAMPLER_NEAREST_H__
-#include <glib-object.h>
-#include "gegl-types.h"
+#ifndef __GEGL_SAMPLER_NEAREST_H__
+#define __GEGL_SAMPLER_NEAREST_H__
+
#include "gegl-sampler.h"
G_BEGIN_DECLS
-#define GEGL_TYPE_SAMPLER_NEAREST (gegl_sampler_nearest_get_type ())
-#define GEGL_SAMPLER_NEAREST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_SAMPLER_NEAREST, GeglSamplerNearest))
-#define GEGL_SAMPLER_NEAREST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_SAMPLER_NEAREST, GeglSamplerNearestClass))
-#define GEGL_SAMPLER_NEAREST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_SAMPLER_NEAREST, GeglSamplerNearestClass))
+#define GEGL_TYPE_SAMPLER_NEAREST (gegl_sampler_nearest_get_type ())
+#define GEGL_SAMPLER_NEAREST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_SAMPLER_NEAREST, GeglSamplerNearest))
+#define GEGL_SAMPLER_NEAREST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_SAMPLER_NEAREST, GeglSamplerNearestClass))
+#define GEGL_IS_SAMPLER_NEAREST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_SAMPLER_NEAREST))
+#define GEGL_IS_SAMPLER_NEAREST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_SAMPLER_NEAREST))
+#define GEGL_SAMPLER_NEAREST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_SAMPLER_NEAREST, GeglSamplerNearestClass))
+
+typedef struct _GeglSamplerNearest GeglSamplerNearest;
+typedef struct _GeglSamplerNearestClass GeglSamplerNearestClass;
-typedef struct _GeglSamplerNearest GeglSamplerNearest;
struct _GeglSamplerNearest
{
GeglSampler parent_instance;
/*< private >*/
};
-typedef struct _GeglSamplerNearestClass GeglSamplerNearestClass;
struct _GeglSamplerNearestClass
{
GeglSamplerClass parent_class;
Modified: trunk/gegl/buffer/gegl-sampler.h
==============================================================================
--- trunk/gegl/buffer/gegl-sampler.h (original)
+++ trunk/gegl/buffer/gegl-sampler.h Sun Jan 6 15:36:52 2008
@@ -14,28 +14,30 @@
* License along with GEGL; if not, see <http://www.gnu.org/licenses/>.
*
*/
-#ifndef _GEGL_SAMPLER_H__
-#define _GEGL_SAMPLER_H__
+
+#ifndef __GEGL_SAMPLER_H__
+#define __GEGL_SAMPLER_H__
#include <glib-object.h>
+#include <babl/babl.h>
#include "gegl-types.h"
#include "buffer/gegl-buffer-types.h"
-#include <babl/babl.h>
G_BEGIN_DECLS
-#define GEGL_TYPE_SAMPLER (gegl_sampler_get_type ())
-#define GEGL_SAMPLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_SAMPLER, GeglSampler))
-#define GEGL_SAMPLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_SAMPLER, GeglSamplerClass))
-#define GEGL_IS_SAMPLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_SAMPLER))
-#define GEGL_IS_SAMPLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_SAMPLER))
-#define GEGL_SAMPLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_SAMPLER, GeglSamplerClass))
+#define GEGL_TYPE_SAMPLER (gegl_sampler_get_type ())
+#define GEGL_SAMPLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_SAMPLER, GeglSampler))
+#define GEGL_SAMPLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_SAMPLER, GeglSamplerClass))
+#define GEGL_IS_SAMPLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_SAMPLER))
+#define GEGL_IS_SAMPLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_SAMPLER))
+#define GEGL_SAMPLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_SAMPLER, GeglSamplerClass))
typedef struct _GeglSamplerClass GeglSamplerClass;
-
+
struct _GeglSampler
{
- GObject parent_instance;
+ GObject parent_instance;
+
/*< private >*/
GeglBuffer *buffer;
Babl *format;
@@ -49,25 +51,27 @@
struct _GeglSamplerClass
{
GObjectClass parent_class;
- void (*prepare) (GeglSampler *self);
- void (*get) (GeglSampler *self,
- gdouble x,
- gdouble y,
- void *output);
+
+ void (* prepare) (GeglSampler *self);
+ void (* get) (GeglSampler *self,
+ gdouble x,
+ gdouble y,
+ void *output);
};
+GType gegl_sampler_get_type (void) G_GNUC_CONST;
+
/* virtual method invokers */
-void gegl_sampler_prepare (GeglSampler *self);
-void gegl_sampler_get (GeglSampler *self,
- gdouble x,
- gdouble y,
- void *output);
-GType gegl_sampler_get_type (void) G_GNUC_CONST;
-
-void gegl_sampler_fill_buffer (GeglSampler *sampler,
- gdouble x,
- gdouble y);
+void gegl_sampler_prepare (GeglSampler *self);
+void gegl_sampler_get (GeglSampler *self,
+ gdouble x,
+ gdouble y,
+ void *output);
+
+void gegl_sampler_fill_buffer (GeglSampler *sampler,
+ gdouble x,
+ gdouble y);
G_END_DECLS
-#endif /* __GEGL_OPERATION_H__ */
+#endif /* __GEGL_SAMPLER_H__ */
Modified: trunk/gegl/buffer/gegl-storage.h
==============================================================================
--- trunk/gegl/buffer/gegl-storage.h (original)
+++ trunk/gegl/buffer/gegl-storage.h Sun Jan 6 15:36:52 2008
@@ -15,14 +15,11 @@
*
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#include <glib.h>
-#include <glib-object.h>
-#include <babl/babl.h>
-#include "gegl-buffer-types.h"
+#ifndef __GEGL_STORAGE_H__
+#define __GEGL_STORAGE_H__
-#ifndef _GEGL_STORAGE_H
-#define _GEGL_STORAGE_H
+#include "gegl-handlers.h"
#define GEGL_TYPE_STORAGE (gegl_storage_get_type ())
#define GEGL_STORAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_STORAGE, GeglStorage))
@@ -31,11 +28,10 @@
#define GEGL_IS_STORAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_STORAGE))
#define GEGL_STORAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_STORAGE, GeglStorageClass))
-#include "gegl-handlers.h"
-
struct _GeglStorage
{
- GeglHandlers parent_object;
+ GeglHandlers parent_instance;
+
Babl *format;
gint tile_width;
gint tile_height;
@@ -45,7 +41,7 @@
gint height;
gchar *path;
- guint idle_swapper;
+ guint idle_swapper;
};
struct _GeglStorageClass
@@ -53,6 +49,6 @@
GeglHandlersClass parent_class;
};
-GType gegl_storage_get_type (void) G_GNUC_CONST;
+GType gegl_storage_get_type (void) G_GNUC_CONST;
#endif
Modified: trunk/gegl/buffer/gegl-tile-backend.h
==============================================================================
--- trunk/gegl/buffer/gegl-tile-backend.h (original)
+++ trunk/gegl/buffer/gegl-tile-backend.h Sun Jan 6 15:36:52 2008
@@ -15,12 +15,10 @@
*
* Copyright 2006, 2007 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef _TILE_BACKEND_H
-#define _TILE_BACKEND_H
-#include <glib.h>
-#include "gegl-buffer-types.h"
-#include "gegl-tile.h"
+#ifndef __GEGL_TILE_BACKEND_H__
+#define __GEGL_TILE_BACKEND_H__
+
#include "gegl-provider.h"
G_BEGIN_DECLS
@@ -35,11 +33,12 @@
struct _GeglTileBackend
{
GeglProvider parent_instance;
- gint tile_width;
- gint tile_height;
- void *format; /* defaults to the babl format "R'G'B'A u8" */
- gint px_size; /* size of a single pixel in bytes */
- gint tile_size; /* size of an entire tile in bytes */
+
+ gint tile_width;
+ gint tile_height;
+ void *format; /* defaults to the babl format "R'G'B'A u8" */
+ gint px_size; /* size of a single pixel in bytes */
+ gint tile_size; /* size of an entire tile in bytes */
};
struct _GeglTileBackendClass
Modified: trunk/gegl/buffer/gegl-tile-disk.h
==============================================================================
--- trunk/gegl/buffer/gegl-tile-disk.h (original)
+++ trunk/gegl/buffer/gegl-tile-disk.h Sun Jan 6 15:36:52 2008
@@ -15,11 +15,10 @@
*
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef _GEGL_TILE_DISK_H
-#define _GEGL_TILE_DISK_H
-#include <glib.h>
-#include "gegl-buffer-types.h"
+#ifndef __GEGL_TILE_DISK_H__
+#define __GEGL_TILE_DISK_H__
+
#include "gegl-tile-backend.h"
G_BEGIN_DECLS
@@ -39,12 +38,12 @@
{
GeglTileBackend parent_instance;
- gchar *path;
- gint fd;
- GHashTable *entries;
- GSList *free_list;
- guint next_unused;
- guint total;
+ gchar *path;
+ gint fd;
+ GHashTable *entries;
+ GSList *free_list;
+ guint next_unused;
+ guint total;
};
struct _GeglTileDiskClass
@@ -54,7 +53,7 @@
GType gegl_tile_disk_get_type (void) G_GNUC_CONST;
-void gegl_tile_disk_stats (void);
+void gegl_tile_disk_stats (void);
G_END_DECLS
Modified: trunk/gegl/buffer/gegl-tile-mem.h
==============================================================================
--- trunk/gegl/buffer/gegl-tile-mem.h (original)
+++ trunk/gegl/buffer/gegl-tile-mem.h Sun Jan 6 15:36:52 2008
@@ -15,11 +15,10 @@
*
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef _GEGL_TILE_MEM_H
-#define _GEGL_TILE_MEM_H
-#include <glib.h>
-#include "gegl-buffer-types.h"
+#ifndef __GEGL_TILE_MEM_H__
+#define __GEGL_TILE_MEM_H__
+
#include "gegl-tile-backend.h"
G_BEGIN_DECLS
@@ -31,14 +30,14 @@
#define GEGL_IS_TILE_MEM_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_TILE_MEM_STORE))
#define GEGL_TILE_MEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_TILE_MEM_STORE, GeglTileMemClass))
-
typedef struct _GeglTileMem GeglTileMem;
typedef struct _GeglTileMemClass GeglTileMemClass;
struct _GeglTileMem
{
GeglTileBackend parent_instance;
- GHashTable *entries;
+
+ GHashTable *entries;
};
struct _GeglTileMemClass
@@ -48,7 +47,7 @@
GType gegl_tile_mem_get_type (void) G_GNUC_CONST;
-void gegl_tile_mem_stats (void);
+void gegl_tile_mem_stats (void);
G_END_DECLS
Modified: trunk/gegl/buffer/gegl-tile.h
==============================================================================
--- trunk/gegl/buffer/gegl-tile.h (original)
+++ trunk/gegl/buffer/gegl-tile.h Sun Jan 6 15:36:52 2008
@@ -15,8 +15,13 @@
*
* Copyright 2006,2007 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef GEGL_TILE_H
-#define GEGL_TILE_H
+
+#ifndef __GEGL_TILE_H__
+#define __GEGL_TILE_H__
+
+#include <glib-object.h>
+
+#include "gegl-buffer-types.h"
#define GEGL_TYPE_TILE (gegl_tile_get_type ())
#define GEGL_TILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE, GeglTile))
@@ -24,16 +29,14 @@
#define GEGL_IS_TILE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE))
#define GEGL_IS_TILE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_TILE))
#define GEGL_TILE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_TILE, GeglTileClass))
-#include <glib-object.h>
-
-#include "gegl-buffer-types.h"
/* the instance size of a GeglTile is a bit large, and should if possible be
* trimmed down
*/
struct _GeglTile
{
- GObject parent_object;
+ GObject parent_instance;
+
guchar *data; /* A small linear buffer for pixel data */
gint size; /* The size of the data element in bytes */
@@ -69,10 +72,10 @@
struct _GeglTileClass
{
- GObjectClass parent_class;
+ GObjectClass parent_class;
};
-GType gegl_tile_get_type (void) G_GNUC_CONST;
+GType gegl_tile_get_type (void) G_GNUC_CONST;
GeglTile * gegl_tile_new (gint size);
guchar * gegl_tile_get_data (GeglTile *tile);
Modified: trunk/gegl/operation/gegl-extension-handler.h
==============================================================================
--- trunk/gegl/operation/gegl-extension-handler.h (original)
+++ trunk/gegl/operation/gegl-extension-handler.h Sun Jan 6 15:36:52 2008
@@ -15,8 +15,9 @@
*
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef GEGL_EXTENSION_HANDLER_H
-#define GEGL_EXTENSION_HANDLER_H
+
+#ifndef __GEGL_EXTENSION_HANDLER_H__
+#define __GEGL_EXTENSION_HANDLER_H__
#include <glib.h>
Modified: trunk/gegl/operation/gegl-operation-area-filter.h
==============================================================================
--- trunk/gegl/operation/gegl-operation-area-filter.h (original)
+++ trunk/gegl/operation/gegl-operation-area-filter.h Sun Jan 6 15:36:52 2008
@@ -15,8 +15,9 @@
*
* Copyright 2007 Ãyvind KolÃs
*/
-#ifndef _GEGL_OPERATION_AREA_FILTER_H
-#define _GEGL_OPERATION_AREA_FILTER_H
+
+#ifndef __GEGL_OPERATION_AREA_FILTER_H__
+#define __GEGL_OPERATION_AREA_FILTER_H__
#include <glib-object.h>
#include "gegl-types.h"
@@ -24,10 +25,12 @@
G_BEGIN_DECLS
-#define GEGL_TYPE_OPERATION_AREA_FILTER (gegl_operation_area_filter_get_type ())
-#define GEGL_OPERATION_AREA_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_AREA_FILTER, GeglOperationAreaFilter))
-#define GEGL_OPERATION_AREA_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_AREA_FILTER, GeglOperationAreaFilterClass))
-#define GEGL_OPERATION_AREA_FILTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_AREA_FILTER, GeglOperationAreaFilterClass))
+#define GEGL_TYPE_OPERATION_AREA_FILTER (gegl_operation_area_filter_get_type ())
+#define GEGL_OPERATION_AREA_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_AREA_FILTER, GeglOperationAreaFilter))
+#define GEGL_OPERATION_AREA_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_AREA_FILTER, GeglOperationAreaFilterClass))
+#define GEGL_IS_OPERATION_AREA_FILTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_OPERATION_AREA_FILTER))
+#define GEGL_IS_OPERATION_AREA_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_OPERATION_AREA_FILTER))
+#define GEGL_OPERATION_AREA_FILTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_AREA_FILTER, GeglOperationAreaFilterClass))
typedef struct _GeglOperationAreaFilter GeglOperationAreaFilter;
struct _GeglOperationAreaFilter
Modified: trunk/gegl/operation/gegl-operation-composer.h
==============================================================================
--- trunk/gegl/operation/gegl-operation-composer.h (original)
+++ trunk/gegl/operation/gegl-operation-composer.h Sun Jan 6 15:36:52 2008
@@ -15,8 +15,9 @@
*
* Copyright 2006 Ãyvind KolÃs
*/
-#ifndef _GEGL_OPERATION_COMPOSER_H__
-#define _GEGL_OPERATION_COMPOSER_H__
+
+#ifndef __GEGL_OPERATION_COMPOSER_H__
+#define __GEGL_OPERATION_COMPOSER_H__
#include <glib-object.h>
#include "gegl-types.h"
@@ -24,10 +25,12 @@
G_BEGIN_DECLS
-#define GEGL_TYPE_OPERATION_COMPOSER (gegl_operation_composer_get_type ())
-#define GEGL_OPERATION_COMPOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_COMPOSER, GeglOperationComposer))
-#define GEGL_OPERATION_COMPOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_COMPOSER, GeglOperationComposerClass))
-#define GEGL_OPERATION_COMPOSER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_COMPOSER, GeglOperationComposerClass))
+#define GEGL_TYPE_OPERATION_COMPOSER (gegl_operation_composer_get_type ())
+#define GEGL_OPERATION_COMPOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_COMPOSER, GeglOperationComposer))
+#define GEGL_OPERATION_COMPOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_COMPOSER, GeglOperationComposerClass))
+#define GEGL_IS_OPERATION_COMPOSER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_OPERATION_COMPOSER))
+#define GEGL_IS_OPERATION_COMPOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_OPERATION_COMPOSER))
+#define GEGL_OPERATION_COMPOSER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_COMPOSER, GeglOperationComposerClass))
typedef struct _GeglOperationComposer GeglOperationComposer;
struct _GeglOperationComposer
Modified: trunk/gegl/operation/gegl-operation-filter.h
==============================================================================
--- trunk/gegl/operation/gegl-operation-filter.h (original)
+++ trunk/gegl/operation/gegl-operation-filter.h Sun Jan 6 15:36:52 2008
@@ -15,8 +15,9 @@
*
* Copyright 2006 Ãyvind KolÃs
*/
-#ifndef _GEGL_OPERATION_FILTER_H
-#define _GEGL_OPERATION_FILTER_H
+
+#ifndef __GEGL_OPERATION_FILTER_H__
+#define __GEGL_OPERATION_FILTER_H__
#include <glib-object.h>
#include "gegl-types.h"
@@ -24,10 +25,12 @@
G_BEGIN_DECLS
-#define GEGL_TYPE_OPERATION_FILTER (gegl_operation_filter_get_type ())
-#define GEGL_OPERATION_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_FILTER, GeglOperationFilter))
-#define GEGL_OPERATION_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_FILTER, GeglOperationFilterClass))
-#define GEGL_OPERATION_FILTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_FILTER, GeglOperationFilterClass))
+#define GEGL_TYPE_OPERATION_FILTER (gegl_operation_filter_get_type ())
+#define GEGL_OPERATION_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_FILTER, GeglOperationFilter))
+#define GEGL_OPERATION_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_FILTER, GeglOperationFilterClass))
+#define GEGL_IS_OPERATION_FILTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_OPERATION_FILTER))
+#define GEGL_IS_OPERATION_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_OPERATION_FILTER))
+#define GEGL_OPERATION_FILTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_FILTER, GeglOperationFilterClass))
typedef struct _GeglOperationFilter GeglOperationFilter;
struct _GeglOperationFilter
Modified: trunk/gegl/operation/gegl-operation-meta.h
==============================================================================
--- trunk/gegl/operation/gegl-operation-meta.h (original)
+++ trunk/gegl/operation/gegl-operation-meta.h Sun Jan 6 15:36:52 2008
@@ -15,8 +15,9 @@
*
* Copyright 2006 Ãyvind KolÃs
*/
-#ifndef _GEGL_OPERATION_META_H
-#define _GEGL_OPERATION_META_H
+
+#ifndef __GEGL_OPERATION_META_H__
+#define __GEGL_OPERATION_META_H__
#include <glib-object.h>
#include "gegl-types.h"
@@ -24,11 +25,12 @@
G_BEGIN_DECLS
-#define GEGL_TYPE_OPERATION_META (gegl_operation_meta_get_type ())
-#define GEGL_OPERATION_META(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_META, GeglOperationMeta))
-#define GEGL_IS_OPERATION_META(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_OPERATION_META))
-#define GEGL_OPERATION_META_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_META, GeglOperationMetaClass))
-#define GEGL_OPERATION_META_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_META, GeglOperationMetaClass))
+#define GEGL_TYPE_OPERATION_META (gegl_operation_meta_get_type ())
+#define GEGL_OPERATION_META(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_META, GeglOperationMeta))
+#define GEGL_OPERATION_META_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_META, GeglOperationMetaClass))
+#define GEGL_IS_OPERATION_META(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_OPERATION_META))
+#define GEGL_IS_OPERATION_META_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_OPERATION_META))
+#define GEGL_OPERATION_META_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_META, GeglOperationMetaClass))
typedef struct _GeglOperationMeta GeglOperationMeta;
struct _GeglOperationMeta
@@ -45,16 +47,16 @@
};
-GType gegl_operation_meta_get_type (void) G_GNUC_CONST;
+GType gegl_operation_meta_get_type (void) G_GNUC_CONST;
-void gegl_operation_meta_redirect (GeglOperation *operation,
- const gchar *name,
- GeglNode *internal,
- const gchar *internal_name);
-
-void gegl_operation_meta_property_changed (GeglOperationMeta *self,
- GParamSpec *arg1,
- gpointer user_data);
+void gegl_operation_meta_redirect (GeglOperation *operation,
+ const gchar *name,
+ GeglNode *internal,
+ const gchar *internal_name);
+
+void gegl_operation_meta_property_changed (GeglOperationMeta *self,
+ GParamSpec *arg1,
+ gpointer user_data);
G_END_DECLS
Modified: trunk/gegl/operation/gegl-operation-point-composer.h
==============================================================================
--- trunk/gegl/operation/gegl-operation-point-composer.h (original)
+++ trunk/gegl/operation/gegl-operation-point-composer.h Sun Jan 6 15:36:52 2008
@@ -15,8 +15,9 @@
*
* Copyright 2006 Ãyvind KolÃs
*/
-#ifndef _GEGL_OPERATION_POINT_COMPOSER_H
-#define _GEGL_OPERATION_POINT_COMPOSER_H
+
+#ifndef __GEGL_OPERATION_POINT_COMPOSER_H__
+#define __GEGL_OPERATION_POINT_COMPOSER_H__
#include <glib-object.h>
#include "gegl-types.h"
@@ -24,10 +25,12 @@
G_BEGIN_DECLS
-#define GEGL_TYPE_OPERATION_POINT_COMPOSER (gegl_operation_point_composer_get_type ())
-#define GEGL_OPERATION_POINT_COMPOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_POINT_COMPOSER, GeglOperationPointComposer))
-#define GEGL_OPERATION_POINT_COMPOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_POINT_COMPOSER, GeglOperationPointComposerClass))
-#define GEGL_OPERATION_POINT_COMPOSER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_POINT_COMPOSER, GeglOperationPointComposerClass))
+#define GEGL_TYPE_OPERATION_POINT_COMPOSER (gegl_operation_point_composer_get_type ())
+#define GEGL_OPERATION_POINT_COMPOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_POINT_COMPOSER, GeglOperationPointComposer))
+#define GEGL_OPERATION_POINT_COMPOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_POINT_COMPOSER, GeglOperationPointComposerClass))
+#define GEGL_IS_OPERATION_POINT_COMPOSER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_OPERATION_POINT_COMPOSER))
+#define GEGL_IS_OPERATION_POINT_COMPOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_OPERATION_POINT_COMPOSER))
+#define GEGL_OPERATION_POINT_COMPOSER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_POINT_COMPOSER, GeglOperationPointComposerClass))
typedef struct _GeglOperationPointComposer GeglOperationPointComposer;
struct _GeglOperationPointComposer
Modified: trunk/gegl/operation/gegl-operation-point-filter.h
==============================================================================
--- trunk/gegl/operation/gegl-operation-point-filter.h (original)
+++ trunk/gegl/operation/gegl-operation-point-filter.h Sun Jan 6 15:36:52 2008
@@ -15,19 +15,20 @@
*
* Copyright 2006 Ãyvind KolÃs
*/
-#ifndef _GEGL_OPERATION_POINT_FILTER_H
-#define _GEGL_OPERATION_POINT_FILTER_H
-#include <glib-object.h>
-#include "gegl-types.h"
+#ifndef __GEGL_OPERATION_POINT_FILTER_H__
+#define __GEGL_OPERATION_POINT_FILTER_H__
+
#include "gegl-operation-filter.h"
G_BEGIN_DECLS
-#define GEGL_TYPE_OPERATION_POINT_FILTER (gegl_operation_point_filter_get_type ())
-#define GEGL_OPERATION_POINT_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_POINT_FILTER, GeglOperationPointFilter))
-#define GEGL_OPERATION_POINT_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_POINT_FILTER, GeglOperationPointFilterClass))
-#define GEGL_OPERATION_POINT_FILTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_POINT_FILTER, GeglOperationPointFilterClass))
+#define GEGL_TYPE_OPERATION_POINT_FILTER (gegl_operation_point_filter_get_type ())
+#define GEGL_OPERATION_POINT_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_POINT_FILTER, GeglOperationPointFilter))
+#define GEGL_OPERATION_POINT_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_POINT_FILTER, GeglOperationPointFilterClass))
+#define GEGL_IS_OPERATION_POINT_FILTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_OPERATION_POINT_FILTER))
+#define GEGL_IS_OPERATION_POINT_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_OPERATION_POINT_FILTER))
+#define GEGL_OPERATION_POINT_FILTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_POINT_FILTER, GeglOperationPointFilterClass))
typedef struct _GeglOperationPointFilter GeglOperationPointFilter;
struct _GeglOperationPointFilter
@@ -44,7 +45,6 @@
void *in_buf, /* input buffer */
void *out_buf, /* output buffer */
glong samples); /* number of samples */
-
};
GType gegl_operation_point_filter_get_type (void) G_GNUC_CONST;
Modified: trunk/gegl/operation/gegl-operation-sink.h
==============================================================================
--- trunk/gegl/operation/gegl-operation-sink.h (original)
+++ trunk/gegl/operation/gegl-operation-sink.h Sun Jan 6 15:36:52 2008
@@ -15,11 +15,10 @@
*
* Copyright 2006 Ãyvind KolÃs
*/
-#ifndef _GEGL_OPERATION_SINK_H
-#define _GEGL_OPERATION_SINK_H
-#include <glib-object.h>
-#include "gegl-types.h"
+#ifndef __GEGL_OPERATION_SINK_H__
+#define __GEGL_OPERATION_SINK_H__
+
#include "gegl-operation.h"
G_BEGIN_DECLS
@@ -27,9 +26,9 @@
#define GEGL_TYPE_OPERATION_SINK (gegl_operation_sink_get_type ())
#define GEGL_OPERATION_SINK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_SINK, GeglOperationSink))
#define GEGL_OPERATION_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_SINK, GeglOperationSinkClass))
-#define GEGL_OPERATION_SINK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_SINK, GeglOperationSinkClass))
#define GEGL_IS_OPERATION_SINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_OPERATION_SINK))
#define GEGL_IS_OPERATION_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_OPERATION_SINK))
+#define GEGL_OPERATION_SINK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_SINK, GeglOperationSinkClass))
typedef struct _GeglOperationSink GeglOperationSink;
struct _GeglOperationSink
@@ -44,8 +43,8 @@
gboolean needs_full;
- gboolean (* process) (GeglOperation *self,
- GeglNodeContext *context,
+ gboolean (* process) (GeglOperation *self,
+ GeglNodeContext *context,
const GeglRectangle *result);
};
Modified: trunk/gegl/operation/gegl-operation-source.h
==============================================================================
--- trunk/gegl/operation/gegl-operation-source.h (original)
+++ trunk/gegl/operation/gegl-operation-source.h Sun Jan 6 15:36:52 2008
@@ -15,19 +15,20 @@
*
* Copyright 2006 Ãyvind KolÃs
*/
+
#ifndef __GEGL_OPERATION_SOURCE_H__
#define __GEGL_OPERATION_SOURCE_H__
-#include <glib-object.h>
-#include "gegl-types.h"
#include "gegl-operation.h"
G_BEGIN_DECLS
-#define GEGL_TYPE_OPERATION_SOURCE (gegl_operation_source_get_type ())
-#define GEGL_OPERATION_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_SOURCE, GeglOperationSource))
-#define GEGL_OPERATION_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_SOURCE, GeglOperationSourceClass))
-#define GEGL_OPERATION_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_SOURCE, GeglOperationSourceClass))
+#define GEGL_TYPE_OPERATION_SOURCE (gegl_operation_source_get_type ())
+#define GEGL_OPERATION_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_SOURCE, GeglOperationSource))
+#define GEGL_OPERATION_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_SOURCE, GeglOperationSourceClass))
+#define GEGL_IS_OPERATION_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_OPERATION_SOURCE, GeglOperationSource))
+#define GEGL_IS_OPERATION_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_OPERATION_SOURCE, GeglOperationSourceClass))
+#define GEGL_OPERATION_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_SOURCE, GeglOperationSourceClass))
typedef struct _GeglOperationSource GeglOperationSource;
struct _GeglOperationSource
@@ -38,9 +39,10 @@
typedef struct _GeglOperationSourceClass GeglOperationSourceClass;
struct _GeglOperationSourceClass
{
- GeglOperationClass parent_class;
- gboolean (*process) (GeglOperation *self,
- GeglNodeContext *context,
+ GeglOperationClass parent_class;
+
+ gboolean (* process) (GeglOperation *self,
+ GeglNodeContext *context,
const GeglRectangle *result);
};
Modified: trunk/gegl/operation/gegl-operation.h
==============================================================================
--- trunk/gegl/operation/gegl-operation.h (original)
+++ trunk/gegl/operation/gegl-operation.h Sun Jan 6 15:36:52 2008
@@ -20,13 +20,13 @@
#ifndef __GEGL_OPERATION_H__
#define __GEGL_OPERATION_H__
+#include <glib-object.h>
+#include <babl/babl.h>
#include "gegl-types.h"
#include "buffer/gegl-buffer-types.h"
-#include <babl/babl.h>
G_BEGIN_DECLS
-
#define GEGL_TYPE_OPERATION (gegl_operation_get_type ())
#define GEGL_OPERATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION, GeglOperation))
#define GEGL_OPERATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION, GeglOperationClass))
Modified: trunk/gegl/property-types/gegl-color.h
==============================================================================
--- trunk/gegl/property-types/gegl-color.h (original)
+++ trunk/gegl/property-types/gegl-color.h Sun Jan 6 15:36:52 2008
@@ -36,14 +36,18 @@
struct _GeglColor
{
- GObject parent;
+ GObject parent_instance;
};
struct _GeglColorClass
{
- GObjectClass parent;
+ GObjectClass parent_class;
};
+GType gegl_color_get_type (void) G_GNUC_CONST;
+
+GeglColor * gegl_color_new (const gchar *string);
+
void gegl_color_get_rgba (GeglColor *self,
gfloat *r,
gfloat *g,
@@ -56,9 +60,8 @@
gfloat b,
gfloat a);
-GeglColor * gegl_color_new (const gchar *string);
-GType gegl_color_get_type (void) G_GNUC_CONST;
+GType gegl_param_color_get_type (void) G_GNUC_CONST;
GParamSpec * gegl_param_spec_color (const gchar *name,
const gchar *nick,
@@ -72,8 +75,6 @@
const gchar *default_color_string,
GParamFlags flags);
-GType gegl_param_color_get_type (void) G_GNUC_CONST;
-
G_END_DECLS
#endif /* __GEGL_COLOR_H__ */
Modified: trunk/gegl/property-types/gegl-curve.h
==============================================================================
--- trunk/gegl/property-types/gegl-curve.h (original)
+++ trunk/gegl/property-types/gegl-curve.h Sun Jan 6 15:36:52 2008
@@ -37,21 +37,21 @@
struct _GeglCurve
{
- GObject parent;
+ GObject parent_instance;
};
struct _GeglCurveClass
{
- GObjectClass parent;
+ GObjectClass parent_class;
};
+GType gegl_curve_get_type (void) G_GNUC_CONST;
+
GeglCurve * gegl_curve_new (gdouble y_min,
gdouble y_max);
GeglCurve * gegl_curve_default_curve (void) G_GNUC_CONST;
-GType gegl_curve_get_type (void) G_GNUC_CONST;
-
void gegl_curve_get_y_bounds (GeglCurve *self,
gdouble *min_y,
gdouble *max_y);
@@ -88,14 +88,15 @@
gdouble *xs,
gdouble *ys);
+
+GType gegl_param_curve_get_type (void) G_GNUC_CONST;
+
GParamSpec * gegl_param_spec_curve (const gchar *name,
const gchar *nick,
const gchar *blurb,
GeglCurve *default_curve,
GParamFlags flags);
-GType gegl_param_curve_get_type (void) G_GNUC_CONST;
-
G_END_DECLS
#endif /* __GEGL_CURVE_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
