gegl r1811 - in trunk: . gegl/buffer
- From: mitch svn gnome org
- To: svn-commits-list gnome org
- Subject: gegl r1811 - in trunk: . gegl/buffer
- Date: Sun, 6 Jan 2008 16:26:22 +0000 (GMT)
Author: mitch
Date: Sun Jan 6 16:26:21 2008
New Revision: 1811
URL: http://svn.gnome.org/viewvc/gegl?rev=1811&view=rev
Log:
2008-01-06 Michael Natterer <mitch gimp org>
* gegl/buffer/gegl-handler-cache.c
* gegl/buffer/gegl-handler-empty.c
* gegl/buffer/gegl-handler-log.c
* gegl/buffer/gegl-handler-zoom.c
* gegl/buffer/gegl-handler.c
* gegl/buffer/gegl-handler.h
* gegl/buffer/gegl-handlers.c
* gegl/buffer/gegl-provider.h
* gegl/buffer/gegl-tile-backend.c: some forgotten
s/TILE_STORE/PROVIDER/ and s/TILE_TRAIT/HANDLER/ plus some
cleanups.
Modified:
trunk/ChangeLog
trunk/gegl/buffer/gegl-handler-cache.c
trunk/gegl/buffer/gegl-handler-empty.c
trunk/gegl/buffer/gegl-handler-log.c
trunk/gegl/buffer/gegl-handler-zoom.c
trunk/gegl/buffer/gegl-handler.c
trunk/gegl/buffer/gegl-handler.h
trunk/gegl/buffer/gegl-handlers.c
trunk/gegl/buffer/gegl-provider.h
trunk/gegl/buffer/gegl-tile-backend.c
Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Sun Jan 6 16:26:21 2008
@@ -1,3 +1,17 @@
+2008-01-06 Michael Natterer <mitch gimp org>
+
+ * gegl/buffer/gegl-handler-cache.c
+ * gegl/buffer/gegl-handler-empty.c
+ * gegl/buffer/gegl-handler-log.c
+ * gegl/buffer/gegl-handler-zoom.c
+ * gegl/buffer/gegl-handler.c
+ * gegl/buffer/gegl-handler.h
+ * gegl/buffer/gegl-handlers.c
+ * gegl/buffer/gegl-provider.h
+ * gegl/buffer/gegl-tile-backend.c: some forgotten
+ s/TILE_STORE/PROVIDER/ and s/TILE_TRAIT/HANDLER/ plus some
+ cleanups.
+
2008-01-06 Ãyvind KolÃs <pippin gimp org>
* gegl/process/gegl-eval-visitor.c: (visit_pad): added some comments.
Modified: trunk/gegl/buffer/gegl-handler-cache.c
==============================================================================
--- trunk/gegl/buffer/gegl-handler-cache.c (original)
+++ trunk/gegl/buffer/gegl-handler-cache.c Sun Jan 6 16:26:21 2008
@@ -32,24 +32,24 @@
gboolean gegl_handler_cache_wash (GeglHandlerCache *cache);
static
-GeglTile *gegl_handler_cache_get_tile (GeglHandlerCache *cache,
- gint x,
- gint y,
- gint z);
+GeglTile * gegl_handler_cache_get_tile (GeglHandlerCache *cache,
+ gint x,
+ gint y,
+ gint z);
static
gboolean gegl_handler_cache_has_tile (GeglHandlerCache *cache,
- gint x,
- gint y,
- gint z);
+ gint x,
+ gint y,
+ gint z);
static
void gegl_handler_cache_insert (GeglHandlerCache *cache,
- GeglTile *tile,
- gint x,
- gint y,
- gint z);
+ GeglTile *tile,
+ gint x,
+ gint y,
+ gint z);
-G_DEFINE_TYPE (GeglHandlerCache, gegl_handler_cache, GEGL_TYPE_TILE_TRAIT)
+G_DEFINE_TYPE (GeglHandlerCache, gegl_handler_cache, GEGL_TYPE_HANDLER)
enum
{
@@ -57,7 +57,6 @@
PROP_SIZE,
PROP_WASH_PERCENTAGE
};
-static GObjectClass *parent_class = NULL;
typedef struct CacheItem
{
@@ -70,8 +69,9 @@
static void
finalize (GObject *object)
{
- (*G_OBJECT_CLASS (parent_class)->finalize)(object);
+ G_OBJECT_CLASS (gegl_handler_cache_parent_class)->finalize(object);
}
+
static void
dispose (GObject *object)
{
@@ -93,7 +93,7 @@
g_free (item);
}
- (*G_OBJECT_CLASS (parent_class)->dispose)(object);
+ G_OBJECT_CLASS (gegl_handler_cache_parent_class)->dispose (object);
}
static GeglTile *
@@ -218,30 +218,32 @@
static void
gegl_handler_cache_class_init (GeglHandlerCacheClass *class)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- GeglProviderClass *tile_store_class = GEGL_PROVIDER_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+ GeglProviderClass *provider_class = GEGL_PROVIDER_CLASS (class);
- parent_class = g_type_class_peek_parent (class);
gobject_class->set_property = set_property;
gobject_class->get_property = get_property;
+ gobject_class->finalize = finalize;
+ gobject_class->dispose = dispose;
- gobject_class->finalize = finalize;
- gobject_class->dispose = dispose;
+ provider_class->get_tile = get_tile;
+ provider_class->message = message;
g_object_class_install_property (gobject_class, PROP_SIZE,
- g_param_spec_int ("size", "size", "Number of tiles in cache",
+ g_param_spec_int ("size",
+ "size",
+ "Number of tiles in cache",
0, G_MAXINT, 32,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT));
g_object_class_install_property (gobject_class, PROP_WASH_PERCENTAGE,
- g_param_spec_int ("wash-percentage", "wash percentage", "(integer 0..100, percentage to wash)",
+ g_param_spec_int ("wash-percentage",
+ "wash percentage",
+ "(integer 0..100, percentage to wash)",
0, 100, 20,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-
-
-
- tile_store_class->get_tile = get_tile;
- tile_store_class->message = message;
+ G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT));
}
static void
@@ -299,10 +301,11 @@
/* returns the requested Tile * if it is in the cache NULL
* otherwize.
*/
-GeglTile *gegl_handler_cache_get_tile (GeglHandlerCache *cache,
- gint x,
- gint y,
- gint z)
+GeglTile *
+gegl_handler_cache_get_tile (GeglHandlerCache *cache,
+ gint x,
+ gint y,
+ gint z)
{
GeglTile *tile = NULL;
@@ -354,9 +357,9 @@
gboolean
gegl_handler_cache_has_tile (GeglHandlerCache *cache,
- gint x,
- gint y,
- gint z)
+ gint x,
+ gint y,
+ gint z)
{
GeglTile *tile = gegl_handler_cache_get_tile (cache, x, y, z);
@@ -395,7 +398,10 @@
static gboolean
-gegl_handler_cache_void (GeglHandlerCache *cache, gint x, gint y, gint z)
+gegl_handler_cache_void (GeglHandlerCache *cache,
+ gint x,
+ gint y,
+ gint z)
{
CacheItem *item = NULL;
@@ -452,10 +458,10 @@
void
gegl_handler_cache_insert (GeglHandlerCache *cache,
- GeglTile *tile,
- gint x,
- gint y,
- gint z)
+ GeglTile *tile,
+ gint x,
+ gint y,
+ gint z)
{
guint count;
CacheItem *item = g_malloc (sizeof (CacheItem));
Modified: trunk/gegl/buffer/gegl-handler-empty.c
==============================================================================
--- trunk/gegl/buffer/gegl-handler-empty.c (original)
+++ trunk/gegl/buffer/gegl-handler-empty.c Sun Jan 6 16:26:21 2008
@@ -22,8 +22,8 @@
#include "gegl-handler.h"
#include "gegl-handler-empty.h"
-G_DEFINE_TYPE (GeglHandlerEmpty, gegl_handler_empty, GEGL_TYPE_TILE_TRAIT)
-static GObjectClass * parent_class = NULL;
+G_DEFINE_TYPE (GeglHandlerEmpty, gegl_handler_empty, GEGL_TYPE_HANDLER)
+
enum
{
PROP_0,
@@ -37,7 +37,8 @@
if (empty->tile)
g_object_unref (empty->tile);
- (*G_OBJECT_CLASS (parent_class)->finalize)(object);
+
+ G_OBJECT_CLASS (gegl_handler_empty_parent_class)->finalize (object);
}
static GeglTile *
@@ -112,7 +113,8 @@
gint tile_height;
gint tile_size;
- object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
+ object = G_OBJECT_CLASS (gegl_handler_empty_parent_class)->constructor (type, n_params, params);
+
empty = GEGL_HANDLER_EMPTY (object);
g_assert (empty->backend);
@@ -131,23 +133,23 @@
static void
gegl_handler_empty_class_init (GeglHandlerEmptyClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- GeglProviderClass *gegl_provider_class = GEGL_PROVIDER_CLASS (klass);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ GeglProviderClass *provider_class = GEGL_PROVIDER_CLASS (klass);
- gegl_provider_class->get_tile = get_tile;
- gobject_class->set_property = set_property;
- gobject_class->get_property = get_property;
- gobject_class->constructor = constructor;
+ gobject_class->constructor = constructor;
+ gobject_class->finalize = finalize;
+ gobject_class->set_property = set_property;
+ gobject_class->get_property = get_property;
+
+ provider_class->get_tile = get_tile;
g_object_class_install_property (gobject_class, PROP_BACKEND,
g_param_spec_object ("backend",
"backend",
"backend for this tilestore (needed for tile size data)",
G_TYPE_OBJECT,
- G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
- gobject_class->finalize = finalize;
- parent_class = g_type_class_peek_parent (klass);
+ G_PARAM_WRITABLE |
+ G_PARAM_CONSTRUCT_ONLY));
}
static void
Modified: trunk/gegl/buffer/gegl-handler-log.c
==============================================================================
--- trunk/gegl/buffer/gegl-handler-log.c (original)
+++ trunk/gegl/buffer/gegl-handler-log.c Sun Jan 6 16:26:21 2008
@@ -22,8 +22,7 @@
#include "gegl-handler.h"
#include "gegl-handler-log.h"
-G_DEFINE_TYPE (GeglHandlerLog, gegl_handler_log, GEGL_TYPE_TILE_TRAIT)
-static GObjectClass * parent_class = NULL;
+G_DEFINE_TYPE (GeglHandlerLog, gegl_handler_log, GEGL_TYPE_HANDLER)
static GeglTile *
get_tile (GeglProvider *gegl_provider,
@@ -67,12 +66,10 @@
static void
gegl_handler_log_class_init (GeglHandlerLogClass *klass)
{
- GeglProviderClass *gegl_provider_class = GEGL_PROVIDER_CLASS (klass);
+ GeglProviderClass *provider_class = GEGL_PROVIDER_CLASS (klass);
- gegl_provider_class->get_tile = get_tile;
- gegl_provider_class->message = message;
-
- parent_class = g_type_class_peek_parent (klass);
+ provider_class->get_tile = get_tile;
+ provider_class->message = message;
}
static void
Modified: trunk/gegl/buffer/gegl-handler-zoom.c
==============================================================================
--- trunk/gegl/buffer/gegl-handler-zoom.c (original)
+++ trunk/gegl/buffer/gegl-handler-zoom.c Sun Jan 6 16:26:21 2008
@@ -22,8 +22,8 @@
#include "gegl-handler.h"
#include "gegl-handler-zoom.h"
-G_DEFINE_TYPE (GeglHandlerZoom, gegl_handler_zoom, GEGL_TYPE_TILE_TRAIT)
-static GObjectClass * parent_class = NULL;
+G_DEFINE_TYPE (GeglHandlerZoom, gegl_handler_zoom, GEGL_TYPE_HANDLER)
+
enum
{
PROP_0,
@@ -434,7 +434,8 @@
GObject *object;
GeglHandlerZoom *zoom;
- object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
+ object = G_OBJECT_CLASS (gegl_handler_zoom_parent_class)->constructor (type, n_params, params);
+
zoom = GEGL_HANDLER_ZOOM (object);
return object;
@@ -444,21 +445,23 @@
static void
gegl_handler_zoom_class_init (GeglHandlerZoomClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- GeglProviderClass *gegl_provider_class = GEGL_PROVIDER_CLASS (klass);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ GeglProviderClass *provider_class = GEGL_PROVIDER_CLASS (klass);
- gegl_provider_class->get_tile = get_tile;
- gegl_provider_class->message = message;
- gobject_class->set_property = set_property;
- gobject_class->get_property = get_property;
- gobject_class->constructor = constructor;
+ gobject_class->constructor = constructor;
+ gobject_class->set_property = set_property;
+ gobject_class->get_property = get_property;
+
+ provider_class->get_tile = get_tile;
+ provider_class->message = message;
g_object_class_install_property (gobject_class, PROP_STORAGE,
g_param_spec_object ("storage",
"storage",
"storage for this tilestore (needed for tile size data)",
G_TYPE_OBJECT,
- G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+ G_PARAM_WRITABLE |
+ G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (gobject_class, PROP_BACKEND,
@@ -466,9 +469,8 @@
"backend",
"backend for this tilestore (needed for tile size data)",
G_TYPE_OBJECT,
- G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
- parent_class = g_type_class_peek_parent (klass);
+ G_PARAM_WRITABLE |
+ G_PARAM_CONSTRUCT_ONLY));
}
static void
Modified: trunk/gegl/buffer/gegl-handler.c
==============================================================================
--- trunk/gegl/buffer/gegl-handler.c (original)
+++ trunk/gegl/buffer/gegl-handler.c Sun Jan 6 16:26:21 2008
@@ -24,8 +24,7 @@
#include "gegl-handler.h"
#include "gegl-handlers.h"
-G_DEFINE_TYPE (GeglHandler, gegl_handler, GEGL_TYPE_TILE_STORE)
-static GObjectClass * parent_class = NULL;
+G_DEFINE_TYPE (GeglHandler, gegl_handler, GEGL_TYPE_PROVIDER)
enum
{
@@ -44,7 +43,7 @@
handler->provider = NULL;
}
- (*G_OBJECT_CLASS (parent_class)->dispose)(object);
+ G_OBJECT_CLASS (gegl_handler_parent_class)->dispose (object);
}
static GeglTile *
@@ -138,23 +137,22 @@
static void
gegl_handler_class_init (GeglHandlerClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- GeglProviderClass *tile_store_class = GEGL_PROVIDER_CLASS (klass);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ GeglProviderClass *provider_class = GEGL_PROVIDER_CLASS (klass);
gobject_class->set_property = set_property;
gobject_class->get_property = get_property;
- parent_class = g_type_class_peek_parent (klass);
gobject_class->dispose = dispose;
+ provider_class->get_tile = get_tile;
+ provider_class->message = message;
+
g_object_class_install_property (gobject_class, PROP_SOURCE,
g_param_spec_object ("provider",
"GeglBuffer",
"The tilestore to be a facade for",
G_TYPE_OBJECT,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-
- tile_store_class->get_tile = get_tile;
- tile_store_class->message = message;
}
static void
Modified: trunk/gegl/buffer/gegl-handler.h
==============================================================================
--- trunk/gegl/buffer/gegl-handler.h (original)
+++ trunk/gegl/buffer/gegl-handler.h Sun Jan 6 16:26:21 2008
@@ -16,19 +16,19 @@
* Copyright 2006,2007 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef __TILE_TRAIT_H__
-#define __TILE_TRAIT_H__
+#ifndef __GEGL_HANDLER_H__
+#define __GEGL_HANDLER_H__
#include "gegl-provider.h"
G_BEGIN_DECLS
-#define GEGL_TYPE_TILE_TRAIT (gegl_handler_get_type ())
-#define GEGL_HANDLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE_TRAIT, GeglHandler))
-#define GEGL_HANDLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_TILE_TRAIT, GeglHandlerClass))
-#define GEGL_IS_TILE_TRAIT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE_TRAIT))
-#define GEGL_IS_TILE_TRAIT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_TILE_TRAIT))
-#define GEGL_HANDLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_TILE_TRAIT, GeglHandlerClass))
+#define GEGL_TYPE_HANDLER (gegl_handler_get_type ())
+#define GEGL_HANDLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_HANDLER, GeglHandler))
+#define GEGL_HANDLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_HANDLER, GeglHandlerClass))
+#define GEGL_IS_HANDLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_HANDLER))
+#define GEGL_IS_HANDLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_HANDLER))
+#define GEGL_HANDLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_HANDLER, GeglHandlerClass))
struct _GeglHandler
Modified: trunk/gegl/buffer/gegl-handlers.c
==============================================================================
--- trunk/gegl/buffer/gegl-handlers.c (original)
+++ trunk/gegl/buffer/gegl-handlers.c Sun Jan 6 16:26:21 2008
@@ -21,11 +21,9 @@
#include "gegl-handlers.h"
#include "gegl-handler-cache.h"
-G_DEFINE_TYPE (GeglHandlers, gegl_handlers, GEGL_TYPE_TILE_TRAIT)
-static GObjectClass * parent_class = NULL;
+G_DEFINE_TYPE (GeglHandlers, gegl_handlers, GEGL_TYPE_HANDLER)
-static void
-gegl_handlers_rebind (GeglHandlers *handlers);
+static void gegl_handlers_rebind (GeglHandlers *handlers);
static void
gegl_handlers_nuke_cache (GeglHandlers *handlers)
@@ -73,14 +71,14 @@
g_slist_free (handlers->chain);
handlers->chain = NULL;
- (*G_OBJECT_CLASS (parent_class)->dispose)(object);
+ G_OBJECT_CLASS (gegl_handlers_parent_class)->dispose (object);
}
static void
finalize (GObject *object)
{
- (*G_OBJECT_CLASS (parent_class)->finalize)(object);
+ G_OBJECT_CLASS (gegl_handlers_parent_class)->finalize (object);
}
static GeglTile *
@@ -136,7 +134,6 @@
tile_store_class->get_tile = get_tile;
tile_store_class->message = message;
- parent_class = g_type_class_peek_parent (class);
gobject_class->finalize = finalize;
gobject_class->dispose = dispose;
}
Modified: trunk/gegl/buffer/gegl-provider.h
==============================================================================
--- trunk/gegl/buffer/gegl-provider.h (original)
+++ trunk/gegl/buffer/gegl-provider.h Sun Jan 6 16:26:21 2008
@@ -26,12 +26,12 @@
G_BEGIN_DECLS
-#define GEGL_TYPE_TILE_STORE (gegl_provider_get_type ())
-#define GEGL_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE_STORE, GeglProvider))
-#define GEGL_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_TILE_STORE, GeglProviderClass))
-#define GEGL_IS_TILE_STORE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE_STORE))
-#define GEGL_IS_TILE_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_TILE_STORE))
-#define GEGL_PROVIDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_TILE_STORE, GeglProviderClass))
+#define GEGL_TYPE_PROVIDER (gegl_provider_get_type ())
+#define GEGL_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_PROVIDER, GeglProvider))
+#define GEGL_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_PROVIDER, GeglProviderClass))
+#define GEGL_IS_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_PROVIDER))
+#define GEGL_IS_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_PROVIDER))
+#define GEGL_PROVIDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_PROVIDER, GeglProviderClass))
typedef gint GeglTileMessage;
Modified: trunk/gegl/buffer/gegl-tile-backend.c
==============================================================================
--- trunk/gegl/buffer/gegl-tile-backend.c (original)
+++ trunk/gegl/buffer/gegl-tile-backend.c Sun Jan 6 16:26:21 2008
@@ -23,7 +23,7 @@
#include "gegl-provider.h"
#include "gegl-tile-backend.h"
-G_DEFINE_TYPE (GeglTileBackend, gegl_tile_backend, GEGL_TYPE_TILE_STORE)
+G_DEFINE_TYPE (GeglTileBackend, gegl_tile_backend, GEGL_TYPE_PROVIDER)
static GObjectClass * parent_class = NULL;
enum
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
