gegl r2179 - in trunk: . gegl/buffer
- From: ok svn gnome org
- To: svn-commits-list gnome org
- Subject: gegl r2179 - in trunk: . gegl/buffer
- Date: Wed, 16 Apr 2008 22:44:32 +0100 (BST)
Author: ok
Date: Wed Apr 16 22:44:31 2008
New Revision: 2179
URL: http://svn.gnome.org/viewvc/gegl?rev=2179&view=rev
Log:
* gegl/buffer/*: Mass rename and typename refactoring.
Added:
trunk/gegl/buffer/gegl-tile-backend-gio-tiles.c
- copied, changed from r2177, /trunk/gegl/buffer/gegl-tile-gio.c
trunk/gegl/buffer/gegl-tile-backend-gio-tiles.h
- copied, changed from r2176, /trunk/gegl/buffer/gegl-tile-gio.h
trunk/gegl/buffer/gegl-tile-backend-ram.c
- copied, changed from r2176, /trunk/gegl/buffer/gegl-tile-mem.c
trunk/gegl/buffer/gegl-tile-backend-ram.h
- copied, changed from r2176, /trunk/gegl/buffer/gegl-tile-mem.h
trunk/gegl/buffer/gegl-tile-backend-swapfile.c
- copied, changed from r2176, /trunk/gegl/buffer/gegl-tile-disk.c
trunk/gegl/buffer/gegl-tile-backend-swapfile.h
- copied, changed from r2176, /trunk/gegl/buffer/gegl-tile-disk.h
trunk/gegl/buffer/gegl-tile-handler-cache.c
- copied, changed from r2178, /trunk/gegl/buffer/gegl-handler-cache.c
trunk/gegl/buffer/gegl-tile-handler-cache.h
- copied, changed from r2178, /trunk/gegl/buffer/gegl-handler-cache.h
trunk/gegl/buffer/gegl-tile-handler-chain.c
- copied, changed from r2176, /trunk/gegl/buffer/gegl-handlers.c
trunk/gegl/buffer/gegl-tile-handler-chain.h
- copied, changed from r2176, /trunk/gegl/buffer/gegl-handlers.h
trunk/gegl/buffer/gegl-tile-handler-empty.c
- copied, changed from r2178, /trunk/gegl/buffer/gegl-handler-empty.c
trunk/gegl/buffer/gegl-tile-handler-empty.h
- copied, changed from r2176, /trunk/gegl/buffer/gegl-handler-empty.h
trunk/gegl/buffer/gegl-tile-handler-log.c
- copied, changed from r2176, /trunk/gegl/buffer/gegl-handler-log.c
trunk/gegl/buffer/gegl-tile-handler-log.h
- copied, changed from r2176, /trunk/gegl/buffer/gegl-handler-log.h
trunk/gegl/buffer/gegl-tile-handler-zoom.c
- copied, changed from r2178, /trunk/gegl/buffer/gegl-handler-zoom.c
trunk/gegl/buffer/gegl-tile-handler-zoom.h
- copied, changed from r2176, /trunk/gegl/buffer/gegl-handler-zoom.h
trunk/gegl/buffer/gegl-tile-handler.c
- copied, changed from r2176, /trunk/gegl/buffer/gegl-handler.c
trunk/gegl/buffer/gegl-tile-handler.h
- copied, changed from r2176, /trunk/gegl/buffer/gegl-handler.h
trunk/gegl/buffer/gegl-tile-source.c
- copied, changed from r2176, /trunk/gegl/buffer/gegl-source.c
trunk/gegl/buffer/gegl-tile-source.h
- copied, changed from r2176, /trunk/gegl/buffer/gegl-source.h
trunk/gegl/buffer/gegl-tile-storage.c
- copied, changed from r2178, /trunk/gegl/buffer/gegl-storage.c
trunk/gegl/buffer/gegl-tile-storage.h
- copied, changed from r2176, /trunk/gegl/buffer/gegl-storage.h
Removed:
trunk/gegl/buffer/gegl-handler-cache.c
trunk/gegl/buffer/gegl-handler-cache.h
trunk/gegl/buffer/gegl-handler-empty.c
trunk/gegl/buffer/gegl-handler-empty.h
trunk/gegl/buffer/gegl-handler-log.c
trunk/gegl/buffer/gegl-handler-log.h
trunk/gegl/buffer/gegl-handler-zoom.c
trunk/gegl/buffer/gegl-handler-zoom.h
trunk/gegl/buffer/gegl-handler.c
trunk/gegl/buffer/gegl-handler.h
trunk/gegl/buffer/gegl-handlers.c
trunk/gegl/buffer/gegl-handlers.h
trunk/gegl/buffer/gegl-source.c
trunk/gegl/buffer/gegl-source.h
trunk/gegl/buffer/gegl-storage.c
trunk/gegl/buffer/gegl-storage.h
trunk/gegl/buffer/gegl-tile-disk.c
trunk/gegl/buffer/gegl-tile-disk.h
trunk/gegl/buffer/gegl-tile-gio.c
trunk/gegl/buffer/gegl-tile-gio.h
trunk/gegl/buffer/gegl-tile-mem.c
trunk/gegl/buffer/gegl-tile-mem.h
Modified:
trunk/ChangeLog
trunk/gegl/buffer/Makefile.am
trunk/gegl/buffer/gegl-buffer-load.c
trunk/gegl/buffer/gegl-buffer-private.h
trunk/gegl/buffer/gegl-buffer-save.c
trunk/gegl/buffer/gegl-buffer-types.h
trunk/gegl/buffer/gegl-buffer.c
trunk/gegl/buffer/gegl-buffer.h
trunk/gegl/buffer/gegl-tile-backend.c
trunk/gegl/buffer/gegl-tile-backend.h
trunk/gegl/buffer/gegl-tile.c
trunk/gegl/buffer/gegl-tile.h
Modified: trunk/gegl/buffer/Makefile.am
==============================================================================
--- trunk/gegl/buffer/Makefile.am (original)
+++ trunk/gegl/buffer/Makefile.am Wed Apr 16 22:44:31 2008
@@ -11,20 +11,20 @@
gegl-sampler-linear.c \
gegl-sampler-nearest.c \
gegl-region-generic.c \
- gegl-storage.c \
gegl-tile.c \
+ gegl-tile-source.c \
+ gegl-tile-storage.c \
gegl-tile-backend.c \
- gegl-tile-disk.c \
- gegl-tile-gio.c \
- gegl-tile-mem.c \
- gegl-handler.c \
- gegl-handlers.c \
- gegl-handler-cache.c \
- gegl-handler-empty.c \
- gegl-handler-log.c \
- gegl-handler-zoom.c \
- gegl-id-pool.c \
- gegl-source.c
+ gegl-tile-backend-swapfile.c \
+ gegl-tile-backend-gio-tiles.c \
+ gegl-tile-backend-ram.c \
+ gegl-tile-handler.c \
+ gegl-tile-handler-chain.c \
+ gegl-tile-handler-cache.c \
+ gegl-tile-handler-empty.c \
+ gegl-tile-handler-log.c \
+ gegl-tile-handler-zoom.c \
+ gegl-id-pool.c
BUFFER_headers = \
gegl-buffer.h \
@@ -39,20 +39,20 @@
gegl-sampler-nearest.h \
gegl-region.h \
gegl-region-generic.h \
- gegl-storage.h \
gegl-tile.h \
+ gegl-tile-source.h \
+ gegl-tile-storage.h \
gegl-tile-backend.h \
- gegl-tile-disk.h \
- gegl-tile-gio.h \
- gegl-tile-mem.h \
- gegl-handler.h \
- gegl-handlers.h \
- gegl-handler-cache.h \
- gegl-handler-empty.h \
- gegl-handler-log.h \
- gegl-handler-zoom.h \
- gegl-id-pool.h \
- gegl-source.h
+ gegl-tile-backend-swapfile.h \
+ gegl-tile-backend-gio-tiles.h \
+ gegl-tile-backend-ram.h \
+ gegl-tile-handler.h \
+ gegl-tile-handler-chain.h \
+ gegl-tile-handler-cache.h \
+ gegl-tile-handler-empty.h \
+ gegl-tile-handler-log.h \
+ gegl-tile-handler-zoom.h \
+ gegl-id-pool.h
libbuffer_la_SOURCES = $(BUFFER_sources) $(BUFFER_headers)
Modified: trunk/gegl/buffer/gegl-buffer-load.c
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-load.c (original)
+++ trunk/gegl/buffer/gegl-buffer-load.c Wed Apr 16 22:44:31 2008
@@ -38,13 +38,13 @@
#include "gegl-buffer-types.h"
#include "gegl-buffer.h"
#include "gegl-buffer-load.h"
-#include "gegl-storage.h"
+#include "gegl-tile-storage.h"
#include "gegl-tile-backend.h"
-#include "gegl-handler.h"
+#include "gegl-tile-handler.h"
#include "gegl-tile.h"
-#include "gegl-handler-cache.h"
-#include "gegl-handler-log.h"
-#include "gegl-handler-empty.h"
+#include "gegl-tile-handler-cache.h"
+#include "gegl-tile-handler-log.h"
+#include "gegl-tile-handler-empty.h"
#include "gegl-types.h"
#include "gegl-utils.h"
#include "gegl-buffer-save.h"
@@ -151,7 +151,7 @@
gint factor = 1 << entry->z;
- tile = gegl_source_get_tile (GEGL_SOURCE (buffer),
+ tile = gegl_tile_source_get_tile (GEGL_TILE_SOURCE (buffer),
entry->x + info->x_tile_shift / factor,
entry->y + info->y_tile_shift / factor,
entry->z);
Modified: trunk/gegl/buffer/gegl-buffer-private.h
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-private.h (original)
+++ trunk/gegl/buffer/gegl-buffer-private.h Wed Apr 16 22:44:31 2008
@@ -20,7 +20,7 @@
#define __GEGL_BUFFER_PRIVATE_H__
#include "gegl-buffer.h"
-#include "gegl-handler.h"
+#include "gegl-tile-handler.h"
#define GEGL_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_BUFFER, GeglBufferClass))
#define GEGL_IS_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_BUFFER))
@@ -29,7 +29,7 @@
struct _GeglBuffer
{
- GeglHandler parent_instance; /* which is a GeglHandler which has a
+ GeglTileHandler parent_instance; /* which is a GeglTileHandler which has a
source field which is used for chaining
sub buffers with their anchestors */
@@ -39,7 +39,7 @@
buffer */
gint shift_x; /* The relative offset of origins compared with */
- gint shift_y; /* anchestral storage buffer, during */
+ gint shift_y; /* anchestral tile_storage buffer, during */
/* construction relative to immediate source */
GeglRectangle abyss;
@@ -51,7 +51,7 @@
access interpolated fetches from the
buffer */
- GeglStorage *storage;
+ GeglTileStorage *tile_storage;
gint min_x; /* the extent of tile indices that has been */
gint min_y; /* produced by _get_tile for this buffer */
@@ -62,7 +62,7 @@
struct _GeglBufferClass
{
- GeglHandlerClass parent_class;
+ GeglTileHandlerClass parent_class;
};
Modified: trunk/gegl/buffer/gegl-buffer-save.c
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-save.c (original)
+++ trunk/gegl/buffer/gegl-buffer-save.c Wed Apr 16 22:44:31 2008
@@ -44,13 +44,13 @@
#include "gegl-buffer-types.h"
#include "gegl-buffer.h"
#include "gegl-buffer-private.h"
-#include "gegl-storage.h"
+#include "gegl-tile-storage.h"
#include "gegl-tile-backend.h"
-#include "gegl-handler.h"
+#include "gegl-tile-handler.h"
#include "gegl-tile.h"
-#include "gegl-handler-cache.h"
-#include "gegl-handler-log.h"
-#include "gegl-handler-empty.h"
+#include "gegl-tile-handler-cache.h"
+#include "gegl-tile-handler-log.h"
+#include "gegl-tile-handler-empty.h"
#include "gegl-types.h"
#include "gegl-utils.h"
#include "gegl-buffer-save.h"
@@ -179,14 +179,14 @@
info->header.height = buffer->extent.height;
info->header.x = buffer->extent.x;
info->header.y = buffer->extent.y;
- info->header.tile_width = buffer->storage->tile_width;
- info->header.tile_height = buffer->storage->tile_height;
+ info->header.tile_width = buffer->tile_storage->tile_width;
+ info->header.tile_height = buffer->tile_storage->tile_height;
g_object_get (buffer, "px-size", &(info->header.bpp), NULL);
/* = gegl_buffer_px_size (buffer);*/
info->tile_size = info->header.tile_width * info->header.tile_height * info->header.bpp;
- strcpy (info->header.format, ((Babl *) (buffer->storage->format))->instance.name);
+ strcpy (info->header.format, ((Babl *) (buffer->tile_storage->format))->instance.name);
/* collect list of tiles to be written */
{
@@ -231,7 +231,7 @@
gint tx = gegl_tile_indice (tiledx / factor, tile_width);
gint ty = gegl_tile_indice (tiledy / factor, tile_height);
- if (gegl_source_exist (GEGL_SOURCE (buffer), tx, ty, z))
+ if (gegl_tile_source_exist (GEGL_TILE_SOURCE (buffer), tx, ty, z))
{
tx += info->x_tile_shift / factor;
ty += info->y_tile_shift / factor;
@@ -293,7 +293,7 @@
GeglTile *tile;
gint factor = 1 << entry->z;
- tile = gegl_source_get_tile (GEGL_SOURCE (buffer),
+ tile = gegl_tile_source_get_tile (GEGL_TILE_SOURCE (buffer),
entry->x - info->x_tile_shift / factor,
entry->y - info->y_tile_shift / factor,
entry->z);
Modified: trunk/gegl/buffer/gegl-buffer-types.h
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-types.h (original)
+++ trunk/gegl/buffer/gegl-buffer-types.h Wed Apr 16 22:44:31 2008
@@ -19,36 +19,34 @@
#ifndef __GEGL_BUFFER_TYPES_H__
#define __GEGL_BUFFER_TYPES_H__
-typedef struct _GeglSampler GeglSampler;
+typedef struct _GeglSampler GeglSampler;
-typedef struct _GeglTile GeglTile;
-typedef struct _GeglTileClass GeglTileClass;
+typedef struct _GeglTile GeglTile;
+typedef struct _GeglTileClass GeglTileClass;
-typedef struct _GeglSource GeglSource;
-typedef struct _GeglSourceClass GeglSourceClass;
+typedef struct _GeglTileSource GeglTileSource;
+typedef struct _GeglTileSourceClass GeglTileSourceClass;
-typedef struct _GeglTileBackend GeglTileBackend;
-typedef struct _GeglTileBackendClass GeglTileBackendClass;
+typedef struct _GeglTileBackend GeglTileBackend;
+typedef struct _GeglTileBackendClass GeglTileBackendClass;
-typedef struct _GeglHandler GeglHandler;
-typedef struct _GeglHandlerClass GeglHandlerClass;
+typedef struct _GeglTileHandler GeglTileHandler;
+typedef struct _GeglTileHandlerClass GeglTileHandlerClass;
-typedef struct _GeglHandlers GeglHandlers;
-typedef struct _GeglHandlersClass GeglHandlersClass;
+typedef struct _GeglTileHandlerChain GeglTileHandlerChain;
+typedef struct _GeglTileHandlerChainClass GeglTileHandlerChainClass;
-typedef struct _GeglStorage GeglStorage;
-typedef struct _GeglStorageClass GeglStorageClass;
+typedef struct _GeglTileStorage GeglTileStorage;
+typedef struct _GeglTileStorageClass GeglTileStorageClass;
#ifndef __GEGL_BUFFER_H__
-typedef struct _GeglBuffer GeglBuffer;
+typedef struct _GeglBuffer GeglBuffer;
#endif
-typedef struct _GeglBufferClass GeglBufferClass;
+typedef struct _GeglBufferClass GeglBufferClass;
-typedef struct _GeglCache GeglCache;
-typedef struct _GeglCacheClass GeglCacheClass;
+typedef struct _GeglCache GeglCache;
+typedef struct _GeglCacheClass GeglCacheClass;
-typedef struct _GeglBufferAllocator GeglBufferAllocator;
-typedef struct _GeglBufferAllocatorClass GeglBufferAllocatorClass;
-typedef struct _GeglRegion GeglRegion;
+typedef struct _GeglRegion GeglRegion;
#endif
Modified: trunk/gegl/buffer/gegl-buffer.c
==============================================================================
--- trunk/gegl/buffer/gegl-buffer.c (original)
+++ trunk/gegl/buffer/gegl-buffer.c Wed Apr 16 22:44:31 2008
@@ -47,13 +47,13 @@
#include "gegl-buffer-types.h"
#include "gegl-buffer.h"
#include "gegl-buffer-private.h"
-#include "gegl-handler.h"
-#include "gegl-storage.h"
+#include "gegl-tile-handler.h"
+#include "gegl-tile-storage.h"
#include "gegl-tile-backend.h"
#include "gegl-tile.h"
-#include "gegl-handler-cache.h"
-#include "gegl-handler-log.h"
-#include "gegl-handler-empty.h"
+#include "gegl-tile-handler-cache.h"
+#include "gegl-tile-handler-log.h"
+#include "gegl-tile-handler-empty.h"
#include "gegl-sampler-nearest.h"
#include "gegl-sampler-linear.h"
#include "gegl-sampler-cubic.h"
@@ -62,7 +62,7 @@
#include "gegl-id-pool.h"
-G_DEFINE_TYPE (GeglBuffer, gegl_buffer, GEGL_TYPE_HANDLER)
+G_DEFINE_TYPE (GeglBuffer, gegl_buffer, GEGL_TYPE_TILE_HANDLER)
#if ENABLE_MP
GStaticRecMutex mutex = G_STATIC_REC_MUTEX_INIT;
@@ -130,7 +130,7 @@
break;
case PROP_PX_SIZE:
- g_value_set_int (value, buffer->storage->px_size);
+ g_value_set_int (value, buffer->tile_storage->px_size);
break;
case PROP_FORMAT:
@@ -252,12 +252,12 @@
gegl_buffer_dispose (GObject *object)
{
GeglBuffer *buffer = GEGL_BUFFER (object);
- GeglHandler *handler = GEGL_HANDLER (object);
+ GeglTileHandler *handler = GEGL_HANDLER (object);
gegl_buffer_sample_cleanup (buffer);
if (handler->source &&
- GEGL_IS_STORAGE (handler->source))
+ GEGL_IS_TILE_STORAGE (handler->source))
{
gegl_buffer_void (buffer);
#if 0
@@ -281,7 +281,7 @@
static GeglTileBackend *
gegl_buffer_backend (GeglBuffer *buffer)
{
- GeglSource *tmp = GEGL_SOURCE (buffer);
+ GeglTileSource *tmp = GEGL_TILE_SOURCE (buffer);
if (!tmp)
return NULL;
@@ -299,17 +299,17 @@
return (GeglTileBackend *) tmp;
}
-static GeglStorage *
-gegl_buffer_storage (GeglBuffer *buffer)
+static GeglTileStorage *
+gegl_buffer_tile_storage (GeglBuffer *buffer)
{
- GeglSource *tmp = GEGL_SOURCE (buffer);
+ GeglTileSource *tmp = GEGL_TILE_SOURCE (buffer);
do
{
- tmp = ((GeglHandler *) (tmp))->source;
- } while (!GEGL_IS_STORAGE (tmp));
+ tmp = ((GeglTileHandler *) (tmp))->source;
+ } while (!GEGL_IS_TILE_STORAGE (tmp));
- return (GeglStorage *) tmp;
+ return (GeglTileStorage *) tmp;
}
void babl_backtrack (void);
@@ -322,8 +322,8 @@
GObject *object;
GeglBuffer *buffer;
GeglTileBackend *backend;
- GeglHandler *handler;
- GeglSource *source;
+ GeglTileHandler *handler;
+ GeglTileSource *source;
gint tile_width;
gint tile_height;
@@ -336,8 +336,8 @@
if (source)
{
- if (GEGL_IS_STORAGE (source))
- buffer->format = GEGL_STORAGE (source)->format;
+ if (GEGL_IS_TILE_STORAGE (source))
+ buffer->format = GEGL_TILE_STORAGE (source)->format;
else if (GEGL_IS_BUFFER (source))
buffer->format = GEGL_BUFFER (source)->format;
}
@@ -351,7 +351,7 @@
*/
g_assert (buffer->format);
- source = GEGL_SOURCE (gegl_buffer_new_from_format (buffer->format,
+ source = GEGL_TILE_SOURCE (gegl_buffer_new_from_format (buffer->format,
buffer->extent.x,
buffer->extent.y,
buffer->extent.width,
@@ -375,7 +375,8 @@
tile_height = backend->tile_height;
if (buffer->extent.width == -1 &&
- buffer->extent.height == -1) /* no specified extents, inheriting from source */
+ buffer->extent.height == -1) /* no specified extents,
+ inheriting from source */
{
if (GEGL_IS_BUFFER (source))
{
@@ -384,12 +385,12 @@
buffer->extent.width = GEGL_BUFFER (source)->extent.width;
buffer->extent.height = GEGL_BUFFER (source)->extent.height;
}
- else if (GEGL_IS_STORAGE (source))
+ else if (GEGL_IS_TILE_STORAGE (source))
{
buffer->extent.x = 0;
buffer->extent.y = 0;
- buffer->extent.width = GEGL_STORAGE (source)->width;
- buffer->extent.height = GEGL_STORAGE (source)->height;
+ buffer->extent.width = GEGL_TILE_STORAGE (source)->width;
+ buffer->extent.height = GEGL_TILE_STORAGE (source)->height;
}
}
@@ -447,7 +448,8 @@
buffer->abyss.height = self.height;
}
- /* compute our own total shift <- this should probably happen approximatly first */
+ /* compute our own total shift <- this should probably happen
+ * approximatly first */
if (GEGL_IS_BUFFER (source))
{
GeglBuffer *source_buf;
@@ -461,23 +463,23 @@
{
}
- buffer->storage = gegl_buffer_storage (buffer);
+ buffer->tile_storage = gegl_buffer_tile_storage (buffer);
return object;
}
static GeglTile *
-get_tile (GeglSource *source,
+get_tile (GeglTileSource *source,
gint x,
gint y,
gint z)
{
- GeglHandler *handler = GEGL_HANDLER (source);
+ GeglTileHandler *handler = GEGL_HANDLER (source);
GeglTile *tile = NULL;
source = handler->source;
if (source)
- tile = gegl_source_get_tile (source, x, y, z);
+ tile = gegl_tile_source_get_tile (source, x, y, z);
else
g_assert (0);
@@ -500,10 +502,11 @@
buffer->max_z = z;
/* storing information in tile, to enable the dispose function of the
- * tile instance to "hook" back to the storage with correct coordinates.
+ * tile instance to "hook" back to the storage with correct
+ * coordinates.
*/
{
- tile->storage = buffer->storage;
+ tile->tile_storage = buffer->tile_storage;
tile->storage_x = x;
tile->storage_y = y;
tile->storage_z = z;
@@ -515,20 +518,20 @@
static gpointer
-command (GeglSource *source,
+command (GeglTileSource *source,
GeglTileCommand command,
gint x,
gint y,
gint z,
gpointer data)
{
- GeglHandler *handler = GEGL_HANDLER (source);
+ GeglTileHandler *handler = GEGL_HANDLER (source);
switch (command)
{
case GEGL_TILE_GET:
return get_tile (source, x, y, z);
default:
- return gegl_handler_chain_up (handler, command, x, y, z, data);
+ return gegl_tile_handler_chain_up (handler, command, x, y, z, data);
}
}
@@ -536,7 +539,7 @@
gegl_buffer_class_init (GeglBufferClass *class)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- GeglSourceClass *tile_source_class = GEGL_SOURCE_CLASS (class);
+ GeglTileSourceClass *tile_source_class = GEGL_TILE_SOURCE_CLASS (class);
parent_class = g_type_class_peek_parent (class);
gobject_class->dispose = gegl_buffer_dispose;
@@ -651,8 +654,8 @@
{
gint width = buffer->extent.width;
gint height = buffer->extent.height;
- gint tile_width = buffer->storage->tile_width;
- gint tile_height = buffer->storage->tile_height;
+ gint tile_width = buffer->tile_storage->tile_width;
+ gint tile_height = buffer->tile_storage->tile_height;
gint bufy = 0;
{
@@ -679,7 +682,7 @@
if (z != 0 ||
tx >= buffer->min_x)
- gegl_source_command (GEGL_SOURCE (buffer),
+ gegl_tile_source_command (GEGL_TILE_SOURCE (buffer),
GEGL_TILE_VOID, tx, ty, z, NULL);
if (z != 0 ||
@@ -719,8 +722,8 @@
const Babl *format,
guchar *buf)
{
- gint tile_width = buffer->storage->tile_width;
- gint tile_height = buffer->storage->tile_width;
+ gint tile_width = buffer->tile_storage->tile_width;
+ gint tile_height = buffer->tile_storage->tile_width;
gint px_size = gegl_buffer_px_size (buffer);
gint bpx_size = FMTPXS (format);
Babl *fish = NULL;
@@ -750,7 +753,7 @@
gint tiledy = buffer_y + buffer->shift_y + y;
gint tiledx = buffer_x + buffer->shift_x + x;
- GeglTile *tile = gegl_source_get_tile ((GeglSource *) (buffer),
+ GeglTile *tile = gegl_tile_source_get_tile ((GeglTileSource *) (buffer),
gegl_tile_indice (tiledx, tile_width),
gegl_tile_indice (tiledy, tile_height),
0);
@@ -786,8 +789,8 @@
gpointer data)
{
guchar *buf = data;
- gint tile_width = buffer->storage->tile_width;
- gint tile_height = buffer->storage->tile_height;
+ gint tile_width = buffer->tile_storage->tile_width;
+ gint tile_height = buffer->tile_storage->tile_height;
gint bpx_size = FMTPXS (format);
Babl *fish = NULL;
@@ -835,7 +838,7 @@
g_object_unref (buffer->hot_tile);
buffer->hot_tile = NULL;
}
- tile = gegl_source_get_tile ((GeglSource *) (buffer),
+ tile = gegl_tile_source_get_tile ((GeglTileSource *) (buffer),
indice_x, indice_y,
0);
}
@@ -870,8 +873,8 @@
gpointer data)
{
guchar *buf = data;
- gint tile_width = buffer->storage->tile_width;
- gint tile_height = buffer->storage->tile_height;
+ gint tile_width = buffer->tile_storage->tile_width;
+ gint tile_height = buffer->tile_storage->tile_height;
gint bpx_size = FMTPXS (format);
Babl *fish = NULL;
@@ -920,7 +923,7 @@
g_object_unref (buffer->hot_tile);
buffer->hot_tile = NULL;
}
- tile = gegl_source_get_tile ((GeglSource *) (buffer),
+ tile = gegl_tile_source_get_tile ((GeglTileSource *) (buffer),
indice_x, indice_y,
0);
}
@@ -969,8 +972,8 @@
{
gint width = buffer->extent.width;
gint height = buffer->extent.height;
- gint tile_width = buffer->storage->tile_width;
- gint tile_height = buffer->storage->tile_height;
+ gint tile_width = buffer->tile_storage->tile_width;
+ gint tile_height = buffer->tile_storage->tile_height;
gint px_size = FMTPXS (buffer->format);
gint bpx_size = FMTPXS (format);
gint tile_stride = px_size * tile_width;
@@ -1088,7 +1091,7 @@
else
{
guchar *tile_base, *tp;
- GeglTile *tile = gegl_source_get_tile ((GeglSource *) (buffer),
+ GeglTile *tile = gegl_tile_source_get_tile ((GeglTileSource *) (buffer),
gegl_tile_indice (tiledx, tile_width),
gegl_tile_indice (tiledy, tile_height),
level);
@@ -1233,7 +1236,7 @@
format = buffer->format;
/* FIXME: go through chain of sources up to but not including
- * storage and disassociated Sampler */
+ * tile_storage and disassociated Sampler */
if (rect && rect->width == 1 && rect->height == 1) /* fast path */
{
@@ -1675,8 +1678,8 @@
&& !(level == 0 && scale > 1.99))
{ /* do box-filter resampling if we're 8bit (which projections are) */
- /* XXX: use box-filter also for > 1.99 when testing and probably later,
- * there are some bugs when doing so
+ /* XXX: use box-filter also for > 1.99 when testing and probably
+ * later, there are some bugs when doing so
*/
resample_boxfilter_u8 (dest_buf,
sample_buf,
@@ -1866,7 +1869,7 @@
dst_rect = src_rect;
}
- pxsize = src->storage->px_size;
+ pxsize = src->tile_storage->px_size;
format = src->format;
src_line = *src_rect;
@@ -2015,7 +2018,7 @@
gint width,
gint height)
{
- GeglStorage *storage;
+ GeglTileStorage *tile_storage;
GeglBuffer *buffer;
gchar *filename;
gchar *path;
@@ -2033,26 +2036,26 @@
if (gegl_swap_dir ())
{
- storage = g_object_new (GEGL_TYPE_STORAGE,
+ tile_storage = g_object_new (GEGL_TYPE_TILE_STORAGE,
"format", babl_format,
"path", path,
NULL);
}
else
{
- storage = g_object_new (GEGL_TYPE_STORAGE,
+ tile_storage = g_object_new (GEGL_TYPE_TILE_STORAGE,
"format", babl_format,
NULL);
}
buffer = g_object_new (GEGL_TYPE_BUFFER,
- "source", storage,
+ "source", tile_storage,
"x", x,
"y", y,
"width", width,
"height", height,
NULL);
- g_object_unref (storage);
+ g_object_unref (tile_storage);
return buffer;
}
Modified: trunk/gegl/buffer/gegl-buffer.h
==============================================================================
--- trunk/gegl/buffer/gegl-buffer.h (original)
+++ trunk/gegl/buffer/gegl-buffer.h Wed Apr 16 22:44:31 2008
@@ -43,13 +43,14 @@
/**
* gegl_buffer_new:
- * @extent: the geometry of the buffer (origin, width and height) a GeglRectangle.
+ * @extent: the geometry of the buffer (origin, width and height) a
+ * GeglRectangle.
* @format: the Babl pixel format to be used, create one with babl_format("RGBA
* u8") and similar.
*
- * Create a new GeglBuffer of a given format with a given extent. It is possible
- * to pass in NULL for both extent and format, a NULL extent creates an exmpty
- * buffer and a NULL format makes the buffer default to "RGBA float".
+ * Create a new GeglBuffer of a given format with a given extent. It is
+ * possible to pass in NULL for both extent and format, a NULL extent creates
+ * an exmpty buffer and a NULL format makes the buffer default to "RGBA float".
*/
GeglBuffer* gegl_buffer_new (const GeglRectangle *extent,
const Babl *format);
@@ -127,7 +128,7 @@
*
* Evaluates to the X coordinate of the upper left corner of the buffers extent.
*/
-#define gegl_buffer_get_x(buffer) (gegl_buffer_get_extent(buffer)->x)
+#define gegl_buffer_get_x(buffer) (gegl_buffer_get_extent(buffer)->x)
/**
* gegl_buffer_get_y:
@@ -135,7 +136,7 @@
*
* Evaluates to the Y coordinate of the upper left corner of the buffers extent.
*/
-#define gegl_buffer_get_y(buffer) (gegl_buffer_get_extent(buffer)->y)
+#define gegl_buffer_get_y(buffer) (gegl_buffer_get_extent(buffer)->y)
/**
* gegl_buffer_get_width:
@@ -143,7 +144,7 @@
*
* Evaluates to the width of the buffers extent.
*/
-#define gegl_buffer_get_width(buffer) (gegl_buffer_get_extent(buffer)->width)
+#define gegl_buffer_get_width(buffer) (gegl_buffer_get_extent(buffer)->width)
/**
* gegl_buffer_get_height:
@@ -151,7 +152,7 @@
*
* Evaluates to the height of the buffers extent.
*/
-#define gegl_buffer_get_height(buffer) (gegl_buffer_get_extent(buffer)->height)
+#define gegl_buffer_get_height(buffer) (gegl_buffer_get_extent(buffer)->height)
/**
* gegl_buffer_get_pixel_count:
@@ -178,10 +179,10 @@
* @rowstride: rowstride in bytes, or GEGL_AUTO_ROWSTRIDE to compute the
* rowstride based on the width and bytes per pixel for the specified format.
*
- * Fetch a rectangular linear buffer of pixel data from the GeglBuffer, the data is
- * converted to the desired BablFormat, if the BablFormat stored and fetched is the
- * same this amounts to a series of memcpy's aligned to demux the tile structure into
- * a linear buffer.
+ * Fetch a rectangular linear buffer of pixel data from the GeglBuffer, the
+ * data is converted to the desired BablFormat, if the BablFormat stored and
+ * fetched is the same this amounts to a series of memcpy's aligned to demux
+ * the tile structure into a linear buffer.
*/
void gegl_buffer_get (GeglBuffer *buffer,
gdouble scale,
Copied: trunk/gegl/buffer/gegl-tile-backend-gio-tiles.c (from r2177, /trunk/gegl/buffer/gegl-tile-gio.c)
==============================================================================
--- /trunk/gegl/buffer/gegl-tile-gio.c (original)
+++ trunk/gegl/buffer/gegl-tile-backend-gio-tiles.c Wed Apr 16 22:44:31 2008
@@ -59,7 +59,7 @@
#endif
#include "gegl-tile-backend.h"
-#include "gegl-tile-gio.h"
+#include "gegl-tile-backend-gio-tiles.h"
/* These entries are kept in RAM for now, they should be written as an
* index to the swap file, at a position specified by a header block,
@@ -78,16 +78,16 @@
};
static gboolean
-exist_tile (GeglSource *store,
- GeglTile *tile,
- gint x,
- gint y,
- gint z);
-
-static GFile *make_tile_file (GeglTileGio *gio,
- gint x,
- gint y,
- gint z)
+exist_tile (GeglTileSource *store,
+ GeglTile *tile,
+ gint x,
+ gint y,
+ gint z);
+
+static GFile *make_tile_file (GeglTileBackendGioTiles *gio,
+ gint x,
+ gint y,
+ gint z)
{
gchar buf[64];
g_sprintf (buf, "%i-%i-%i", x, y, z);
@@ -95,9 +95,9 @@
}
static void inline
-gio_entry_read (GeglTileGio *gio,
- GioEntry *entry,
- guchar *dest)
+gio_entry_read (GeglTileBackendGioTiles *gio,
+ GioEntry *entry,
+ guchar *dest)
{
GFile *file;
gint tile_size = GEGL_TILE_BACKEND (gio)->tile_size;
@@ -117,9 +117,9 @@
}
static void inline
-gio_entry_write (GeglTileGio *gio,
- GioEntry *entry,
- guchar *source)
+gio_entry_write (GeglTileBackendGioTiles *gio,
+ GioEntry *entry,
+ guchar *source)
{
gint tile_size = GEGL_TILE_BACKEND (gio)->tile_size;
GFile *file;
@@ -140,17 +140,16 @@
}
-G_DEFINE_TYPE (GeglTileGio, gegl_tile_gio, GEGL_TYPE_TILE_BACKEND)
+G_DEFINE_TYPE (GeglTileBackendGioTiles, gegl_tile_backend_gio_tiles, GEGL_TYPE_TILE_BACKEND)
static GObjectClass * parent_class = NULL;
-
static gint allocs = 0;
static gint gio_size = 0;
static gint peak_allocs = 0;
static gint peak_gio_size = 0;
void
-gegl_tile_gio_stats (void)
+gegl_tile_backend_gio_tiles_stats (void)
{
g_warning ("leaked: %i chunks (%f mb) peak: %i (%i bytes %fmb))",
allocs, gio_size / 1024 / 1024.0,
@@ -163,12 +162,12 @@
* too often.
*/
static GeglTile *
-get_tile (GeglSource *tile_store,
- gint x,
- gint y,
- gint z)
+get_tile (GeglTileSource *tile_store,
+ gint x,
+ gint y,
+ gint z)
{
- GeglTileGio *tile_gio = GEGL_TILE_GIO (tile_store);
+ GeglTileBackendGioTiles *tile_backend_gio_tiles = GEGL_TILE_BACKEND_GIO_TILES (tile_store);
GeglTileBackend *backend = GEGL_TILE_BACKEND (tile_store);
GeglTile *tile = NULL;
@@ -180,42 +179,42 @@
tile->stored_rev = 1;
tile->rev = 1;
- gio_entry_read (tile_gio, &entry, tile->data);
+ gio_entry_read (tile_backend_gio_tiles, &entry, tile->data);
return tile;
}
return NULL;
}
static gpointer
-set_tile (GeglSource *store,
- GeglTile *tile,
- gint x,
- gint y,
- gint z)
+set_tile (GeglTileSource *store,
+ GeglTile *tile,
+ gint x,
+ gint y,
+ gint z)
{
- GeglTileBackend *backend = GEGL_TILE_BACKEND (store);
- GeglTileGio *tile_gio = GEGL_TILE_GIO (backend);
+ GeglTileBackend *backend = GEGL_TILE_BACKEND (store);
+ GeglTileBackendGioTiles *tile_backend_gio_tiles = GEGL_TILE_BACKEND_GIO_TILES (backend);
GioEntry entry = {x,y,z};
g_assert (tile->flags == 0); /* when this one is triggered, dirty pyramid data
- has been tried written to persistent storage.
+ has been tried written to persistent tile_storage.
*/
- gio_entry_write (tile_gio, &entry, tile->data);
+ gio_entry_write (tile_backend_gio_tiles, &entry, tile->data);
tile->stored_rev = tile->rev;
return NULL;
}
static gpointer
-void_tile (GeglSource *store,
- GeglTile *tile,
- gint x,
- gint y,
- gint z)
-{
- GeglTileBackend *backend = GEGL_TILE_BACKEND (store);
- GeglTileGio *gio = GEGL_TILE_GIO (backend);
- GFile *file;
+void_tile (GeglTileSource *store,
+ GeglTile *tile,
+ gint x,
+ gint y,
+ gint z)
+{
+ GeglTileBackend *backend = GEGL_TILE_BACKEND (store);
+ GeglTileBackendGioTiles *gio = GEGL_TILE_BACKEND_GIO_TILES (backend);
+ GFile *file;
file = make_tile_file (gio, x, y, z);
g_file_delete (file, NULL, NULL);
@@ -224,16 +223,16 @@
}
static gboolean
-exist_tile (GeglSource *store,
- GeglTile *tile,
- gint x,
- gint y,
- gint z)
-{
- GeglTileBackend *backend = GEGL_TILE_BACKEND (store);
- GeglTileGio *gio = GEGL_TILE_GIO (backend);
- GFileInfo *file_info;
- GFile *file;
+exist_tile (GeglTileSource *store,
+ GeglTile *tile,
+ gint x,
+ gint y,
+ gint z)
+{
+ GeglTileBackend *backend = GEGL_TILE_BACKEND (store);
+ GeglTileBackendGioTiles *gio = GEGL_TILE_BACKEND_GIO_TILES (backend);
+ GFileInfo *file_info;
+ GFile *file;
gboolean found = FALSE;
file = make_tile_file (gio, x, y, z);
@@ -257,12 +256,12 @@
};
static gpointer
-command (GeglSource *tile_store,
- GeglTileCommand command,
- gint x,
- gint y,
- gint z,
- gpointer data)
+command (GeglTileSource *tile_store,
+ GeglTileCommand command,
+ gint x,
+ gint y,
+ gint z,
+ gpointer data)
{
switch (command)
{
@@ -295,7 +294,7 @@
const GValue *value,
GParamSpec *pspec)
{
- GeglTileGio *self = GEGL_TILE_GIO (object);
+ GeglTileBackendGioTiles *self = GEGL_TILE_BACKEND_GIO_TILES (object);
switch (property_id)
{
@@ -317,7 +316,7 @@
GValue *value,
GParamSpec *pspec)
{
- GeglTileGio *self = GEGL_TILE_GIO (object);
+ GeglTileBackendGioTiles *self = GEGL_TILE_BACKEND_GIO_TILES (object);
switch (property_id)
{
@@ -334,7 +333,7 @@
static void
finalize (GObject *object)
{
- GeglTileGio *self = (GeglTileGio *) object;
+ GeglTileBackendGioTiles *self = (GeglTileBackendGioTiles *) object;
GFileEnumerator *enumerator;
GFileInfo *info;
@@ -367,15 +366,15 @@
}
static GObject *
-gegl_tile_gio_constructor (GType type,
- guint n_params,
- GObjectConstructParam *params)
+gegl_tile_backend_gio_tiles_constructor (GType type,
+ guint n_params,
+ GObjectConstructParam *params)
{
GObject *object;
- GeglTileGio *gio;
+ GeglTileBackendGioTiles *gio;
object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
- gio = GEGL_TILE_GIO (object);
+ gio = GEGL_TILE_BACKEND_GIO_TILES (object);
gio->buffer_dir = g_file_new_for_commandline_arg (gio->path);
g_file_make_directory (gio->buffer_dir, NULL, NULL);
@@ -383,19 +382,19 @@
}
static void
-gegl_tile_gio_class_init (GeglTileGioClass *klass)
+gegl_tile_backend_gio_tiles_class_init (GeglTileBackendGioTilesClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- GeglSourceClass *gegl_source_class = GEGL_SOURCE_CLASS (klass);
+ GeglTileSourceClass *gegl_tile_source_class = GEGL_TILE_SOURCE_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
gobject_class->get_property = get_property;
gobject_class->set_property = set_property;
- gobject_class->constructor = gegl_tile_gio_constructor;
+ gobject_class->constructor = gegl_tile_backend_gio_tiles_constructor;
gobject_class->finalize = finalize;
- gegl_source_class->command = command;
+ gegl_tile_source_class->command = command;
g_object_class_install_property (gobject_class, PROP_PATH,
@@ -408,7 +407,7 @@
}
static void
-gegl_tile_gio_init (GeglTileGio *self)
+gegl_tile_backend_gio_tiles_init (GeglTileBackendGioTiles *self)
{
self->path = NULL;
}
Copied: trunk/gegl/buffer/gegl-tile-backend-gio-tiles.h (from r2176, /trunk/gegl/buffer/gegl-tile-gio.h)
==============================================================================
--- /trunk/gegl/buffer/gegl-tile-gio.h (original)
+++ trunk/gegl/buffer/gegl-tile-backend-gio-tiles.h Wed Apr 16 22:44:31 2008
@@ -16,25 +16,25 @@
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef __GEGL_TILE_GIO_H__
-#define __GEGL_TILE_GIO_H__
+#ifndef __GEGL_TILE_BACKEND_GIO_TILES_H__
+#define __GEGL_TILE_BACKEND_GIO_TILES_H__
#include "gegl-tile-backend.h"
#include <gio/gio.h>
G_BEGIN_DECLS
-#define GEGL_TYPE_TILE_GIO (gegl_tile_gio_get_type ())
-#define GEGL_TILE_GIO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE_GIO, GeglTileGio))
-#define GEGL_TILE_GIO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_TILE_GIO, GeglTileGioClass))
-#define GEGL_IS_TILE_GIO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE_GIO))
-#define GEGL_IS_TILE_GIO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_TILE_GIO))
-#define GEGL_TILE_GIO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_TILE_GIO, GeglTileGioClass))
+#define GEGL_TYPE_TILE_BACKEND_GIO_TILES (gegl_tile_backend_gio_tiles_get_type ())
+#define GEGL_TILE_BACKEND_GIO_TILES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE_BACKEND_GIO_TILES, GeglTileBackendGioTiles))
+#define GEGL_TILE_BACKEND_GIO_TILES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_TILE_BACKEND_GIO_TILES, GeglTileBackendGioTilesClass))
+#define GEGL_IS_TILE_BACKEND_GIO_TILES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE_BACKEND_GIO_TILES))
+#define GEGL_IS_TILE_BACKEND_GIO_TILES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_TILE_BACKEND_GIO_TILES))
+#define GEGL_TILE_BACKEND_GIO_TILES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_TILE_BACKEND_GIO_TILES, GeglTileBackendGioTilesClass))
-typedef struct _GeglTileGio GeglTileGio;
-typedef struct _GeglTileGioClass GeglTileGioClass;
+typedef struct _GeglTileBackendGioTiles GeglTileBackendGioTiles;
+typedef struct _GeglTileBackendGioTilesClass GeglTileBackendGioTilesClass;
-struct _GeglTileGio
+struct _GeglTileBackendGioTiles
{
GeglTileBackend parent_instance;
@@ -42,14 +42,14 @@
GFile *buffer_dir;
};
-struct _GeglTileGioClass
+struct _GeglTileBackendGioTilesClass
{
GeglTileBackendClass parent_class;
};
-GType gegl_tile_gio_get_type (void) G_GNUC_CONST;
+GType gegl_tile_backend_gio_tiles_get_type (void) G_GNUC_CONST;
-void gegl_tile_gio_stats (void);
+void gegl_tile_backend_gio_tiles_stats (void);
G_END_DECLS
Copied: trunk/gegl/buffer/gegl-tile-backend-ram.c (from r2176, /trunk/gegl/buffer/gegl-tile-mem.c)
==============================================================================
--- /trunk/gegl/buffer/gegl-tile-mem.c (original)
+++ trunk/gegl/buffer/gegl-tile-backend-ram.c Wed Apr 16 22:44:31 2008
@@ -23,7 +23,7 @@
#include <glib-object.h>
#include "gegl-tile-backend.h"
-#include "gegl-tile-mem.h"
+#include "gegl-tile-backend-ram.h"
static void dbg_alloc (int size);
@@ -35,9 +35,9 @@
*
* Serializing the bablformat is probably also a good idea.
*/
-typedef struct _MemEntry MemEntry;
+typedef struct _RamEntry RamEntry;
-struct _MemEntry
+struct _RamEntry
{
gint x;
gint y;
@@ -46,85 +46,85 @@
};
static void inline
-mem_entry_read (GeglTileMem *mem,
- MemEntry *entry,
- guchar *dest)
+ram_entry_read (GeglTileBackendRam *ram,
+ RamEntry *entry,
+ guchar *dest)
{
- gint tile_size = GEGL_TILE_BACKEND (mem)->tile_size;
+ gint tile_size = GEGL_TILE_BACKEND (ram)->tile_size;
- memcpy (dest, entry->offset, tile_size);
+ ramcpy (dest, entry->offset, tile_size);
}
static void inline
-mem_entry_write (GeglTileMem *mem,
- MemEntry *entry,
- guchar *source)
+ram_entry_write (GeglTileBackendRam *ram,
+ RamEntry *entry,
+ guchar *source)
{
- gint tile_size = GEGL_TILE_BACKEND (mem)->tile_size;
+ gint tile_size = GEGL_TILE_BACKEND (ram)->tile_size;
- memcpy (entry->offset, source, tile_size);
+ ramcpy (entry->offset, source, tile_size);
}
-static inline MemEntry *
-mem_entry_new (GeglTileMem *mem)
+static inline RamEntry *
+ram_entry_new (GeglTileBackendRam *ram)
{
- MemEntry *self = g_slice_new (MemEntry);
+ RamEntry *self = g_slice_new (RamEntry);
- self->offset = g_malloc (GEGL_TILE_BACKEND (mem)->tile_size);
- dbg_alloc (GEGL_TILE_BACKEND (mem)->tile_size);
+ self->offset = g_malloc (GEGL_TILE_BACKEND (ram)->tile_size);
+ dbg_alloc (GEGL_TILE_BACKEND (ram)->tile_size);
return self;
}
static inline void
-mem_entry_destroy (MemEntry *entry,
- GeglTileMem *mem)
+ram_entry_destroy (RamEntry *entry,
+ GeglTileBackendRam *ram)
{
g_free (entry->offset);
- g_hash_table_remove (mem->entries, entry);
+ g_hash_table_remove (ram->entries, entry);
- dbg_dealloc (GEGL_TILE_BACKEND (mem)->tile_size);
- g_slice_free (MemEntry, entry);
+ dbg_dealloc (GEGL_TILE_BACKEND (ram)->tile_size);
+ g_slice_free (RamEntry, entry);
}
-G_DEFINE_TYPE (GeglTileMem, gegl_tile_mem, GEGL_TYPE_TILE_BACKEND)
+G_DEFINE_TYPE (GeglTileBackendRam, gegl_tile_backend_ram, GEGL_TYPE_TILE_BACKEND)
static GObjectClass * parent_class = NULL;
static gint allocs = 0;
-static gint mem_size = 0;
+static gint ram_size = 0;
static gint peak_allocs = 0;
-static gint peak_mem_size = 0;
+static gint peak_ram_size = 0;
-void gegl_tile_mem_stats (void)
+void gegl_tile_backend_ram_stats (void)
{
g_warning ("leaked: %i chunks (%f mb) peak: %i (%i bytes %fmb))",
- allocs, mem_size / 1024 / 1024.0, peak_allocs, peak_mem_size, peak_mem_size / 1024 / 1024.0);
+ allocs, ram_size / 1024 / 1024.0, peak_allocs, peak_ram_size, peak_ram_size / 1024 / 1024.0);
}
static void dbg_alloc (gint size)
{
allocs++;
- mem_size += size;
+ ram_size += size;
if (allocs > peak_allocs)
peak_allocs = allocs;
- if (mem_size > peak_mem_size)
- peak_mem_size = mem_size;
+ if (ram_size > peak_ram_size)
+ peak_ram_size = ram_size;
}
static void dbg_dealloc (gint size)
{
allocs--;
- mem_size -= size;
+ ram_size -= size;
}
-static inline MemEntry *
-lookup_entry (GeglTileMem *self,
+static inline RamEntry *
+lookup_entry (GeglTileBackendRam *self,
gint x,
gint y,
gint z)
{
- MemEntry key = { x, y, z, 0 };
+ RamEntry key = { x, y, z, 0 };
return g_hash_table_lookup (self->entries, &key);
}
@@ -135,17 +135,17 @@
* too often.
*/
static GeglTile *
-get_tile (GeglSource *tile_store,
+get_tile (GeglTileSource *tile_store,
gint x,
gint y,
gint z)
{
- GeglTileMem *tile_mem = GEGL_TILE_MEM (tile_store);
+ GeglTileBackendRam *tile_backend_ram = GEGL_TILE_BACKEND_RAM (tile_store);
GeglTileBackend *backend = GEGL_TILE_BACKEND (tile_store);
GeglTile *tile = NULL;
{
- MemEntry *entry = lookup_entry (tile_mem, x, y, z);
+ RamEntry *entry = lookup_entry (tile_backend_ram, x, y, z);
if (!entry)
return NULL;
@@ -154,68 +154,68 @@
tile->stored_rev = 1;
tile->rev = 1;
- mem_entry_read (tile_mem, entry, tile->data);
+ ram_entry_read (tile_backend_ram, entry, tile->data);
}
return tile;
}
static
-gboolean set_tile (GeglSource *store,
+gboolean set_tile (GeglTileSource *store,
GeglTile *tile,
gint x,
gint y,
gint z)
{
GeglTileBackend *backend = GEGL_TILE_BACKEND (store);
- GeglTileMem *tile_mem = GEGL_TILE_MEM (backend);
+ GeglTileBackendRam *tile_backend_ram = GEGL_TILE_BACKEND_RAM (backend);
- MemEntry *entry = lookup_entry (tile_mem, x, y, z);
+ RamEntry *entry = lookup_entry (tile_backend_ram, x, y, z);
if (entry == NULL)
{
- entry = mem_entry_new (tile_mem);
+ entry = ram_entry_new (tile_backend_ram);
entry->x = x;
entry->y = y;
entry->z = z;
- g_hash_table_insert (tile_mem->entries, entry, entry);
+ g_hash_table_insert (tile_backend_ram->entries, entry, entry);
}
g_assert (tile->flags == 0); /* when this one is triggered, dirty pyramid data
- has been tried written to persistent storage.
+ has been tried written to persistent tile_storage.
*/
- mem_entry_write (tile_mem, entry, tile->data);
+ ram_entry_write (tile_backend_ram, entry, tile->data);
tile->stored_rev = tile->rev;
return TRUE;
}
static
-gboolean void_tile (GeglSource *store,
+gboolean void_tile (GeglTileSource *store,
GeglTile *tile,
gint x,
gint y,
gint z)
{
GeglTileBackend *backend = GEGL_TILE_BACKEND (store);
- GeglTileMem *tile_mem = GEGL_TILE_MEM (backend);
- MemEntry *entry = lookup_entry (tile_mem, x, y, z);
+ GeglTileBackendRam *tile_backend_ram = GEGL_TILE_BACKEND_RAM (backend);
+ RamEntry *entry = lookup_entry (tile_backend_ram, x, y, z);
if (entry != NULL)
{
- mem_entry_destroy (entry, tile_mem);
+ ram_entry_destroy (entry, tile_backend_ram);
}
return TRUE;
}
static
-gboolean exist_tile (GeglSource *store,
+gboolean exist_tile (GeglTileSource *store,
GeglTile *tile,
gint x,
gint y,
gint z)
{
GeglTileBackend *backend = GEGL_TILE_BACKEND (store);
- GeglTileMem *tile_mem = GEGL_TILE_MEM (backend);
- MemEntry *entry = lookup_entry (tile_mem, x, y, z);
+ GeglTileBackendRam *tile_backend_ram = GEGL_TILE_BACKEND_RAM (backend);
+ RamEntry *entry = lookup_entry (tile_backend_ram, x, y, z);
return entry != NULL;
}
@@ -227,7 +227,7 @@
};
static gpointer
-command (GeglSource *tile_store,
+command (GeglTileSource *tile_store,
GeglTileCommand command,
gint x,
gint y,
@@ -289,7 +289,7 @@
static void
finalize (GObject *object)
{
- GeglTileMem *self = (GeglTileMem *) object;
+ GeglTileBackendRam *self = (GeglTileBackendRam *) object;
g_hash_table_unref (self->entries);
@@ -298,7 +298,7 @@
static guint hashfunc (gconstpointer key)
{
- const MemEntry *e = key;
+ const RamEntry *e = key;
guint hash;
gint i;
gint srcA = e->x;
@@ -326,8 +326,8 @@
static gboolean equalfunc (gconstpointer a,
gconstpointer b)
{
- const MemEntry *ea = a;
- const MemEntry *eb = b;
+ const RamEntry *ea = a;
+ const RamEntry *eb = b;
if (ea->x == eb->x &&
ea->y == eb->y &&
@@ -337,39 +337,39 @@
}
static GObject *
-gegl_tile_mem_constructor (GType type,
- guint n_params,
- GObjectConstructParam *params)
+gegl_tile_backend_ram_constructor (GType type,
+ guint n_params,
+ GObjectConstructParam *params)
{
GObject *object;
- GeglTileMem *mem;
+ GeglTileBackendRam *ram;
object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
- mem = GEGL_TILE_MEM (object);
+ ram = GEGL_TILE_BACKEND_RAM (object);
- mem->entries = g_hash_table_new (hashfunc, equalfunc);
+ ram->entries = g_hash_table_new (hashfunc, equalfunc);
return object;
}
static void
-gegl_tile_mem_class_init (GeglTileMemClass *klass)
+gegl_tile_backend_ram_class_init (GeglTileBackendRamClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- GeglSourceClass *gegl_source_class = GEGL_SOURCE_CLASS (klass);
+ GeglTileSourceClass *gegl_tile_source_class = GEGL_TILE_SOURCE_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
gobject_class->get_property = get_property;
gobject_class->set_property = set_property;
- gobject_class->constructor = gegl_tile_mem_constructor;
+ gobject_class->constructor = gegl_tile_backend_ram_constructor;
gobject_class->finalize = finalize;
- gegl_source_class->command = command;
+ gegl_tile_source_class->command = command;
}
static void
-gegl_tile_mem_init (GeglTileMem *self)
+gegl_tile_backend_ram_init (GeglTileBackendRam *self)
{
self->entries = NULL;
}
Copied: trunk/gegl/buffer/gegl-tile-backend-ram.h (from r2176, /trunk/gegl/buffer/gegl-tile-mem.h)
==============================================================================
--- /trunk/gegl/buffer/gegl-tile-mem.h (original)
+++ trunk/gegl/buffer/gegl-tile-backend-ram.h Wed Apr 16 22:44:31 2008
@@ -16,38 +16,38 @@
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef __GEGL_TILE_MEM_H__
-#define __GEGL_TILE_MEM_H__
+#ifndef __GEGL_TILE_BACKEND_RAM_H__
+#define __GEGL_TILE_BACKEND_RAM_H__
#include "gegl-tile-backend.h"
G_BEGIN_DECLS
-#define GEGL_TYPE_TILE_MEM (gegl_tile_mem_get_type ())
-#define GEGL_TILE_MEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE_MEM, GeglTileMem))
-#define GEGL_TILE_MEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_TILE_MEM, GeglTileMemClass))
-#define GEGL_IS_TILE_MEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE_MEM))
-#define GEGL_IS_TILE_MEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_TILE_MEM))
-#define GEGL_TILE_MEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_TILE_MEM, GeglTileMemClass))
+#define GEGL_TYPE_TILE_BACKEND_RAM (gegl_tile_backend_ram_get_type ())
+#define GEGL_TILE_BACKEND_RAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE_BACKEND_RAM, GeglTileBackendRam))
+#define GEGL_TILE_BACKEND_RAM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_TILE_BACKEND_RAM, GeglTileBackendRamClass))
+#define GEGL_IS_TILE_BACKEND_RAM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE_BACKEND_RAM))
+#define GEGL_IS_TILE_BACKEND_RAM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_TILE_BACKEND_RAM))
+#define GEGL_TILE_BACKEND_RAM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_TILE_BACKEND_RAM, GeglTileBackendRamClass))
-typedef struct _GeglTileMem GeglTileMem;
-typedef struct _GeglTileMemClass GeglTileMemClass;
+typedef struct _GeglTileBackendRam GeglTileBackendRam;
+typedef struct _GeglTileBackendRamClass GeglTileBackendRamClass;
-struct _GeglTileMem
+struct _GeglTileBackendRam
{
GeglTileBackend parent_instance;
GHashTable *entries;
};
-struct _GeglTileMemClass
+struct _GeglTileBackendRamClass
{
GeglTileBackendClass parent_class;
};
-GType gegl_tile_mem_get_type (void) G_GNUC_CONST;
+GType gegl_tile_backend_ram_get_type (void) G_GNUC_CONST;
-void gegl_tile_mem_stats (void);
+void gegl_tile_backend_ram_stats (void);
G_END_DECLS
Copied: trunk/gegl/buffer/gegl-tile-backend-swapfile.c (from r2176, /trunk/gegl/buffer/gegl-tile-disk.c)
==============================================================================
--- /trunk/gegl/buffer/gegl-tile-disk.c (original)
+++ trunk/gegl/buffer/gegl-tile-backend-swapfile.c Wed Apr 16 22:44:31 2008
@@ -58,7 +58,7 @@
#endif
#include "gegl-tile-backend.h"
-#include "gegl-tile-disk.h"
+#include "gegl-tile-backend-swapfile.h"
static void dbg_alloc (int size);
static void dbg_dealloc (int size);
@@ -81,9 +81,9 @@
};
static void inline
-disk_entry_read (GeglTileDisk *disk,
- DiskEntry *entry,
- guchar *dest)
+disk_entry_read (GeglTileBackendSwapfile *disk,
+ DiskEntry *entry,
+ guchar *dest)
{
gint nleft;
off_t offset;
@@ -119,9 +119,9 @@
}
static void inline
-disk_entry_write (GeglTileDisk *disk,
- DiskEntry *entry,
- guchar *source)
+disk_entry_write (GeglTileBackendSwapfile *disk,
+ DiskEntry *entry,
+ guchar *source)
{
gint nleft;
off_t offset;
@@ -153,7 +153,7 @@
}
static inline DiskEntry *
-disk_entry_new (GeglTileDisk *disk)
+disk_entry_new (GeglTileBackendSwapfile *disk)
{
DiskEntry *self = g_slice_new (DiskEntry);
@@ -179,8 +179,8 @@
}
static inline void
-disk_entry_destroy (DiskEntry *entry,
- GeglTileDisk *disk)
+disk_entry_destroy (DiskEntry *entry,
+ GeglTileBackendSwapfile *disk)
{
disk->free_list = g_slist_prepend (disk->free_list,
GINT_TO_POINTER (entry->offset));
@@ -191,7 +191,7 @@
}
-G_DEFINE_TYPE (GeglTileDisk, gegl_tile_disk, GEGL_TYPE_TILE_BACKEND)
+G_DEFINE_TYPE (GeglTileBackendSwapfile, gegl_tile_backend_swapfile, GEGL_TYPE_TILE_BACKEND)
static GObjectClass * parent_class = NULL;
@@ -201,7 +201,7 @@
static gint peak_disk_size = 0;
void
-gegl_tile_disk_stats (void)
+gegl_tile_backend_swapfile_stats (void)
{
g_warning ("leaked: %i chunks (%f mb) peak: %i (%i bytes %fmb))",
allocs, disk_size / 1024 / 1024.0,
@@ -227,7 +227,7 @@
}
static inline DiskEntry *
-lookup_entry (GeglTileDisk *self,
+lookup_entry (GeglTileBackendSwapfile *self,
gint x,
gint y,
gint z)
@@ -243,17 +243,17 @@
* too often.
*/
static GeglTile *
-get_tile (GeglSource *tile_store,
+get_tile (GeglTileSource *tile_store,
gint x,
gint y,
gint z)
{
- GeglTileDisk *tile_disk = GEGL_TILE_DISK (tile_store);
+ GeglTileBackendSwapfile *tile_backend_swapfile = GEGL_TILE_BACKEND_SWAPFILE (tile_store);
GeglTileBackend *backend = GEGL_TILE_BACKEND (tile_store);
GeglTile *tile = NULL;
{
- DiskEntry *entry = lookup_entry (tile_disk, x, y, z);
+ DiskEntry *entry = lookup_entry (tile_backend_swapfile, x, y, z);
if (!entry)
return NULL;
@@ -262,69 +262,69 @@
tile->stored_rev = 1;
tile->rev = 1;
- disk_entry_read (tile_disk, entry, tile->data);
+ disk_entry_read (tile_backend_swapfile, entry, tile->data);
}
return tile;
}
static gpointer
-set_tile (GeglSource *store,
- GeglTile *tile,
- gint x,
- gint y,
- gint z)
+set_tile (GeglTileSource *store,
+ GeglTile *tile,
+ gint x,
+ gint y,
+ gint z)
{
- GeglTileBackend *backend = GEGL_TILE_BACKEND (store);
- GeglTileDisk *tile_disk = GEGL_TILE_DISK (backend);
+ GeglTileBackend *backend = GEGL_TILE_BACKEND (store);
+ GeglTileBackendSwapfile *tile_backend_swapfile = GEGL_TILE_BACKEND_SWAPFILE (backend);
- DiskEntry *entry = lookup_entry (tile_disk, x, y, z);
+ DiskEntry *entry = lookup_entry (tile_backend_swapfile, x, y, z);
if (entry == NULL)
{
- entry = disk_entry_new (tile_disk);
+ entry = disk_entry_new (tile_backend_swapfile);
entry->x = x;
entry->y = y;
entry->z = z;
- g_hash_table_insert (tile_disk->entries, entry, entry);
+ g_hash_table_insert (tile_backend_swapfile->entries, entry, entry);
}
g_assert (tile->flags == 0); /* when this one is triggered, dirty pyramid data
- has been tried written to persistent storage.
+ has been tried written to persistent tile_storage.
*/
- disk_entry_write (tile_disk, entry, tile->data);
+ disk_entry_write (tile_backend_swapfile, entry, tile->data);
tile->stored_rev = tile->rev;
return NULL;
}
static gpointer
-void_tile (GeglSource *store,
- GeglTile *tile,
- gint x,
- gint y,
- gint z)
-{
- GeglTileBackend *backend = GEGL_TILE_BACKEND (store);
- GeglTileDisk *tile_disk = GEGL_TILE_DISK (backend);
- DiskEntry *entry = lookup_entry (tile_disk, x, y, z);
+void_tile (GeglTileSource *store,
+ GeglTile *tile,
+ gint x,
+ gint y,
+ gint z)
+{
+ GeglTileBackend *backend = GEGL_TILE_BACKEND (store);
+ GeglTileBackendSwapfile *tile_backend_swapfile = GEGL_TILE_BACKEND_SWAPFILE (backend);
+ DiskEntry *entry = lookup_entry (tile_backend_swapfile, x, y, z);
if (entry != NULL)
{
- disk_entry_destroy (entry, tile_disk);
+ disk_entry_destroy (entry, tile_backend_swapfile);
}
return NULL;
}
static gpointer
-exist_tile (GeglSource *store,
- GeglTile *tile,
- gint x,
- gint y,
- gint z)
+exist_tile (GeglTileSource *store,
+ GeglTile *tile,
+ gint x,
+ gint y,
+ gint z)
{
GeglTileBackend *backend = GEGL_TILE_BACKEND (store);
- GeglTileDisk *tile_disk = GEGL_TILE_DISK (backend);
- DiskEntry *entry = lookup_entry (tile_disk, x, y, z);
+ GeglTileBackendSwapfile *tile_backend_swapfile = GEGL_TILE_BACKEND_SWAPFILE (backend);
+ DiskEntry *entry = lookup_entry (tile_backend_swapfile, x, y, z);
return entry!=NULL?((gpointer)0x1):NULL;
}
@@ -336,12 +336,12 @@
};
static gpointer
-command (GeglSource *tile_store,
- GeglTileCommand command,
- gint x,
- gint y,
- gint z,
- gpointer data)
+command (GeglTileSource *tile_store,
+ GeglTileCommand command,
+ gint x,
+ gint y,
+ gint z,
+ gpointer data)
{
switch (command)
{
@@ -372,7 +372,7 @@
const GValue *value,
GParamSpec *pspec)
{
- GeglTileDisk *self = GEGL_TILE_DISK (object);
+ GeglTileBackendSwapfile *self = GEGL_TILE_BACKEND_SWAPFILE (object);
switch (property_id)
{
@@ -394,7 +394,7 @@
GValue *value,
GParamSpec *pspec)
{
- GeglTileDisk *self = GEGL_TILE_DISK (object);
+ GeglTileBackendSwapfile *self = GEGL_TILE_BACKEND_SWAPFILE (object);
switch (property_id)
{
@@ -411,7 +411,7 @@
static void
finalize (GObject *object)
{
- GeglTileDisk *self = (GeglTileDisk *) object;
+ GeglTileBackendSwapfile *self = (GeglTileBackendSwapfile *) object;
g_hash_table_unref (self->entries);
@@ -465,15 +465,15 @@
}
static GObject *
-gegl_tile_disk_constructor (GType type,
- guint n_params,
- GObjectConstructParam *params)
+gegl_tile_backend_swapfile_constructor (GType type,
+ guint n_params,
+ GObjectConstructParam *params)
{
GObject *object;
- GeglTileDisk *disk;
+ GeglTileBackendSwapfile *disk;
object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
- disk = GEGL_TILE_DISK (object);
+ disk = GEGL_TILE_BACKEND_SWAPFILE (object);
disk->fd = g_open (disk->path,
O_CREAT | O_RDWR | O_BINARY, S_IRUSR | S_IWUSR | O_DIRECT);
@@ -495,19 +495,19 @@
}
static void
-gegl_tile_disk_class_init (GeglTileDiskClass *klass)
+gegl_tile_backend_swapfile_class_init (GeglTileBackendSwapfileClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- GeglSourceClass *gegl_source_class = GEGL_SOURCE_CLASS (klass);
+ GeglTileSourceClass *gegl_tile_source_class = GEGL_TILE_SOURCE_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
gobject_class->get_property = get_property;
gobject_class->set_property = set_property;
- gobject_class->constructor = gegl_tile_disk_constructor;
+ gobject_class->constructor = gegl_tile_backend_swapfile_constructor;
gobject_class->finalize = finalize;
- gegl_source_class->command = command;
+ gegl_tile_source_class->command = command;
g_object_class_install_property (gobject_class, PROP_PATH,
@@ -520,7 +520,7 @@
}
static void
-gegl_tile_disk_init (GeglTileDisk *self)
+gegl_tile_backend_swapfile_init (GeglTileBackendSwapfile *self)
{
self->path = NULL;
self->fd = 0;
Copied: trunk/gegl/buffer/gegl-tile-backend-swapfile.h (from r2176, /trunk/gegl/buffer/gegl-tile-disk.h)
==============================================================================
--- /trunk/gegl/buffer/gegl-tile-disk.h (original)
+++ trunk/gegl/buffer/gegl-tile-backend-swapfile.h Wed Apr 16 22:44:31 2008
@@ -16,25 +16,25 @@
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef __GEGL_TILE_DISK_H__
-#define __GEGL_TILE_DISK_H__
+#ifndef __GEGL_TILE_BACKEND_SWAPFILE_H__
+#define __GEGL_TILE_BACKEND_SWAPFILE_H__
#include "gegl-tile-backend.h"
G_BEGIN_DECLS
-#define GEGL_TYPE_TILE_DISK (gegl_tile_disk_get_type ())
-#define GEGL_TILE_DISK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE_DISK, GeglTileDisk))
-#define GEGL_TILE_DISK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_TILE_DISK, GeglTileDiskClass))
-#define GEGL_IS_TILE_DISK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE_DISK))
-#define GEGL_IS_TILE_DISK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_TILE_DISK))
-#define GEGL_TILE_DISK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_TILE_DISK, GeglTileDiskClass))
+#define GEGL_TYPE_TILE_BACKEND_SWAPFILE (gegl_tile_backend_swapfile_get_type ())
+#define GEGL_TILE_BACKEND_SWAPFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE_BACKEND_SWAPFILE, GeglTileBackendSwapfile))
+#define GEGL_TILE_BACKEND_SWAPFILE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_TILE_BACKEND_SWAPFILE, GeglTileBackendSwapfileClass))
+#define GEGL_IS_TILE_BACKEND_SWAPFILE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE_BACKEND_SWAPFILE))
+#define GEGL_IS_TILE_BACKEND_SWAPFILE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_TILE_BACKEND_SWAPFILE))
+#define GEGL_TILE_BACKEND_SWAPFILE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_TILE_BACKEND_SWAPFILE, GeglTileBackendSwapfileClass))
-typedef struct _GeglTileDisk GeglTileDisk;
-typedef struct _GeglTileDiskClass GeglTileDiskClass;
+typedef struct _GeglTileBackendSwapfile GeglTileBackendSwapfile;
+typedef struct _GeglTileBackendSwapfileClass GeglTileBackendSwapfileClass;
-struct _GeglTileDisk
+struct _GeglTileBackendSwapfile
{
GeglTileBackend parent_instance;
@@ -46,14 +46,14 @@
guint total;
};
-struct _GeglTileDiskClass
+struct _GeglTileBackendSwapfileClass
{
GeglTileBackendClass parent_class;
};
-GType gegl_tile_disk_get_type (void) G_GNUC_CONST;
+GType gegl_tile_backend_swapfile_get_type (void) G_GNUC_CONST;
-void gegl_tile_disk_stats (void);
+void gegl_tile_backend_swapfile_stats (void);
G_END_DECLS
Modified: trunk/gegl/buffer/gegl-tile-backend.c
==============================================================================
--- trunk/gegl/buffer/gegl-tile-backend.c (original)
+++ trunk/gegl/buffer/gegl-tile-backend.c Wed Apr 16 22:44:31 2008
@@ -20,10 +20,10 @@
#include <string.h>
#include <babl/babl.h>
-#include "gegl-source.h"
+#include "gegl-tile-source.h"
#include "gegl-tile-backend.h"
-G_DEFINE_TYPE (GeglTileBackend, gegl_tile_backend, GEGL_TYPE_SOURCE)
+G_DEFINE_TYPE (GeglTileBackend, gegl_tile_backend, GEGL_TYPE_TILE_SOURCE)
static GObjectClass * parent_class = NULL;
enum
Modified: trunk/gegl/buffer/gegl-tile-backend.h
==============================================================================
--- trunk/gegl/buffer/gegl-tile-backend.h (original)
+++ trunk/gegl/buffer/gegl-tile-backend.h Wed Apr 16 22:44:31 2008
@@ -19,7 +19,7 @@
#ifndef __GEGL_TILE_BACKEND_H__
#define __GEGL_TILE_BACKEND_H__
-#include "gegl-source.h"
+#include "gegl-tile-source.h"
G_BEGIN_DECLS
@@ -32,18 +32,18 @@
struct _GeglTileBackend
{
- GeglSource parent_instance;
+ GeglTileSource parent_instance;
- gint tile_width;
- gint tile_height;
- Babl *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;
+ Babl *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
{
- GeglSourceClass parent_class;
+ GeglTileSourceClass parent_class;
};
GType gegl_tile_backend_get_type (void) G_GNUC_CONST;
Copied: trunk/gegl/buffer/gegl-tile-handler-cache.c (from r2178, /trunk/gegl/buffer/gegl-handler-cache.c)
==============================================================================
--- /trunk/gegl/buffer/gegl-handler-cache.c (original)
+++ trunk/gegl/buffer/gegl-tile-handler-cache.c Wed Apr 16 22:44:31 2008
@@ -25,7 +25,7 @@
#include "gegl-buffer.h"
#include "gegl-buffer-private.h"
#include "gegl-tile.h"
-#include "gegl-handler-cache.h"
+#include "gegl-tile-handler-cache.h"
/* FIXME: this global cache should have configurable size and wash percentage */
@@ -48,56 +48,54 @@
cache_queue = NULL;
}
-static gboolean gegl_handler_cache_wash (GeglHandlerCache *cache);
+static gboolean gegl_tile_handler_cache_wash (GeglTileHandlerCache *cache);
-static 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);
- void gegl_handler_cache_insert (GeglHandlerCache *cache,
- GeglTile *tile,
- gint x,
- gint y,
- gint z);
-static void gegl_handler_cache_void (GeglHandlerCache *cache,
- gint x,
- gint y,
- gint z);
+static GeglTile * gegl_tile_handler_cache_get_tile (GeglTileHandlerCache *cache,
+ gint x,
+ gint y,
+ gint z);
+
+static gboolean gegl_tile_handler_cache_has_tile (GeglTileHandlerCache *cache,
+ gint x,
+ gint y,
+ gint z);
+void gegl_tile_handler_cache_insert (GeglTileHandlerCache *cache,
+ GeglTile *tile,
+ gint x,
+ gint y,
+ gint z);
+static void gegl_tile_handler_cache_void (GeglTileHandlerCache *cache,
+ gint x,
+ gint y,
+ gint z);
-G_DEFINE_TYPE (GeglHandlerCache, gegl_handler_cache, GEGL_TYPE_HANDLER)
+G_DEFINE_TYPE (GeglTileHandlerCache, gegl_tile_handler_cache, GEGL_TYPE_TILE_HANDLER)
typedef struct CacheItem
-{
- GeglHandlerCache *handler; /* identify the handler as well, thus allowing
- * all buffers to share a common cache
- */
- GeglTile *tile;
- gint x;
+{
+ GeglTileHandlerCache *handler; /* The specific handler that cached this item*/
+ GeglTile *tile; /* The tile */
+
+ gint x; /* The coordinates this tile was cached for */
gint y;
gint z;
} CacheItem;
-
static void
finalize (GObject *object)
{
- GeglHandlerCache *cache;
- cache = (GeglHandlerCache *) object;
+ GeglTileHandlerCache *cache;
+ cache = (GeglTileHandlerCache *) object;
- G_OBJECT_CLASS (gegl_handler_cache_parent_class)->finalize (object);
+ G_OBJECT_CLASS (gegl_tile_handler_cache_parent_class)->finalize (object);
}
static void
dispose (GObject *object)
{
- GeglHandlerCache *cache;
+ GeglTileHandlerCache *cache;
CacheItem *item;
- cache = (GeglHandlerCache *) object;
+ cache = (GeglTileHandlerCache *) object;
if (0)
g_printerr ("Disposing tile-cache of size %i, hits: %i misses: %i hit percentage:%f)\n",
@@ -112,22 +110,22 @@
}
/* FIXME: if queue is empty destroy global queue */
- G_OBJECT_CLASS (gegl_handler_cache_parent_class)->dispose (object);
+ G_OBJECT_CLASS (gegl_tile_handler_cache_parent_class)->dispose (object);
}
static GeglTile *
-get_tile (GeglSource *tile_store,
+get_tile (GeglTileSource *tile_store,
gint x,
gint y,
gint z)
{
- GeglHandlerCache *cache = GEGL_HANDLER_CACHE (tile_store);
- GeglSource *source = GEGL_HANDLER (tile_store)->source;
+ GeglTileHandlerCache *cache = GEGL_TILE_HANDLER_CACHE (tile_store);
+ GeglTileSource *source = GEGL_HANDLER (tile_store)->source;
GeglTile *tile = NULL;
if(0)g_print ("%f%% hit:%i miss:%i \r", cache_hits*100.0/(cache_hits+cache_misses), cache_hits, cache_misses);
- tile = gegl_handler_cache_get_tile (cache, x, y, z);
+ tile = gegl_tile_handler_cache_get_tile (cache, x, y, z);
if (tile)
{
cache_hits++;
@@ -136,25 +134,25 @@
cache_misses++;
if (source)
- tile = gegl_source_get_tile (source, x, y, z);
+ tile = gegl_tile_source_get_tile (source, x, y, z);
if (tile)
- gegl_handler_cache_insert (cache, tile, x, y, z);
+ gegl_tile_handler_cache_insert (cache, tile, x, y, z);
return tile;
}
static gpointer
-command (GeglSource *tile_store,
+command (GeglTileSource *tile_store,
GeglTileCommand command,
gint x,
gint y,
gint z,
gpointer data)
{
- GeglHandler *handler = GEGL_HANDLER (tile_store);
- GeglHandlerCache *cache = GEGL_HANDLER_CACHE (handler);
+ GeglTileHandler *handler = GEGL_HANDLER (tile_store);
+ GeglTileHandlerCache *cache = GEGL_TILE_HANDLER_CACHE (handler);
/* FIXME: replace with switch */
switch (command)
@@ -162,35 +160,35 @@
case GEGL_TILE_GET:
return get_tile (tile_store, x, y, z);
case GEGL_TILE_IS_CACHED:
- return (gpointer)gegl_handler_cache_has_tile (cache, x, y, z);
+ return (gpointer)gegl_tile_handler_cache_has_tile (cache, x, y, z);
case GEGL_TILE_EXIST:
{
- gboolean exist = gegl_handler_cache_has_tile (cache, x, y, z);
+ gboolean exist = gegl_tile_handler_cache_has_tile (cache, x, y, z);
if (exist)
return (gpointer)TRUE;
}
break; /* chain up */
case GEGL_TILE_IDLE:
{
- gboolean action = gegl_handler_cache_wash (cache);
+ gboolean action = gegl_tile_handler_cache_wash (cache);
if (action)
return (gpointer)action;
break;
}
case GEGL_TILE_VOID:
- gegl_handler_cache_void (cache, x, y, z);
+ gegl_tile_handler_cache_void (cache, x, y, z);
/* fallthrough */
default:
break;
}
- return gegl_handler_chain_up (handler, command, x, y, z, data);
+ return gegl_tile_handler_chain_up (handler, command, x, y, z, data);
}
static void
-gegl_handler_cache_class_init (GeglHandlerCacheClass *class)
+gegl_tile_handler_cache_class_init (GeglTileHandlerCacheClass *class)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- GeglSourceClass *source_class = GEGL_SOURCE_CLASS (class);
+ GeglTileSourceClass *source_class = GEGL_TILE_SOURCE_CLASS (class);
gobject_class->finalize = finalize;
gobject_class->dispose = dispose;
@@ -199,7 +197,7 @@
}
static void
-gegl_handler_cache_init (GeglHandlerCache *cache)
+gegl_tile_handler_cache_init (GeglTileHandlerCache *cache)
{
gegl_tile_cache_init ();
}
@@ -210,7 +208,7 @@
* tile flushing overhead over time.
*/
gboolean
-gegl_handler_cache_wash (GeglHandlerCache *cache)
+gegl_tile_handler_cache_wash (GeglTileHandlerCache *cache)
{
GeglTile *last_dirty = NULL;
guint count = 0;
@@ -243,10 +241,10 @@
/* 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)
+gegl_tile_handler_cache_get_tile (GeglTileHandlerCache *cache,
+ gint x,
+ gint y,
+ gint z)
{
GList *link;
@@ -277,12 +275,12 @@
gboolean
-gegl_handler_cache_has_tile (GeglHandlerCache *cache,
- gint x,
- gint y,
- gint z)
+gegl_tile_handler_cache_has_tile (GeglTileHandlerCache *cache,
+ gint x,
+ gint y,
+ gint z)
{
- GeglTile *tile = gegl_handler_cache_get_tile (cache, x, y, z);
+ GeglTile *tile = gegl_tile_handler_cache_get_tile (cache, x, y, z);
if (tile)
{
@@ -294,7 +292,7 @@
}
static gboolean
-gegl_handler_cache_trim (GeglHandlerCache *cache)
+gegl_tile_handler_cache_trim (GeglTileHandlerCache *cache)
{
CacheItem *last_writable = g_queue_pop_tail (cache_queue);
@@ -310,10 +308,10 @@
static void
-gegl_handler_cache_void (GeglHandlerCache *cache,
- gint x,
- gint y,
- gint z)
+gegl_tile_handler_cache_void (GeglTileHandlerCache *cache,
+ gint x,
+ gint y,
+ gint z)
{
GList *link;
@@ -338,11 +336,11 @@
}
void
-gegl_handler_cache_insert (GeglHandlerCache *cache,
- GeglTile *tile,
- gint x,
- gint y,
- gint z)
+gegl_tile_handler_cache_insert (GeglTileHandlerCache *cache,
+ GeglTile *tile,
+ gint x,
+ gint y,
+ gint z)
{
CacheItem *item = g_slice_new (CacheItem);
guint count;
@@ -361,6 +359,6 @@
{
gint to_remove = count - cache_size;
- while (--to_remove && gegl_handler_cache_trim (cache)) ;
+ while (--to_remove && gegl_tile_handler_cache_trim (cache)) ;
}
}
Copied: trunk/gegl/buffer/gegl-tile-handler-cache.h (from r2178, /trunk/gegl/buffer/gegl-handler-cache.h)
==============================================================================
--- /trunk/gegl/buffer/gegl-handler-cache.h (original)
+++ trunk/gegl/buffer/gegl-tile-handler-cache.h Wed Apr 16 22:44:31 2008
@@ -16,25 +16,25 @@
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef __GEGL_HANDLER_CACHE_H__
-#define __GEGL_HANDLER_CACHE_H__
+#ifndef __GEGL_TILE_HANDLER_CACHE_H__
+#define __GEGL_TILE_HANDLER_CACHE_H__
-#include "gegl-handler.h"
+#include "gegl-tile-handler.h"
-#define GEGL_TYPE_HANDLER_CACHE (gegl_handler_cache_get_type ())
-#define GEGL_HANDLER_CACHE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_HANDLER_CACHE, GeglHandlerCache))
-#define GEGL_HANDLER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_HANDLER_CACHE, GeglHandlerCacheClass))
-#define GEGL_IS_HANDLER_CACHE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_HANDLER_CACHE))
-#define GEGL_IS_HANDLER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_HANDLER_CACHE))
-#define GEGL_HANDLER_CACHE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_HANDLER_CACHE, GeglHandlerCacheClass))
+#define GEGL_TYPE_TILE_HANDLER_CACHE (gegl_tile_handler_cache_get_type ())
+#define GEGL_TILE_HANDLER_CACHE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE_HANDLER_CACHE, GeglTileHandlerCache))
+#define GEGL_TILE_HANDLER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_TILE_HANDLER_CACHE, GeglTileHandlerCacheClass))
+#define GEGL_IS_TILE_HANDLER_CACHE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE_HANDLER_CACHE))
+#define GEGL_IS_TILE_HANDLER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_TILE_HANDLER_CACHE))
+#define GEGL_TILE_HANDLER_CACHE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_TILE_HANDLER_CACHE, GeglTileHandlerCacheClass))
-typedef struct _GeglHandlerCache GeglHandlerCache;
-typedef struct _GeglHandlerCacheClass GeglHandlerCacheClass;
+typedef struct _GeglTileHandlerCache GeglTileHandlerCache;
+typedef struct _GeglTileHandlerCacheClass GeglTileHandlerCacheClass;
-struct _GeglHandlerCache
+struct _GeglTileHandlerCache
{
- GeglHandler parent_instance;
+ GeglTileHandler parent_instance;
/* GQueue *queue;
gint size;
@@ -43,11 +43,11 @@
gint misses;*/
};
-struct _GeglHandlerCacheClass
+struct _GeglTileHandlerCacheClass
{
- GeglHandlerClass parent_class;
+ GeglTileHandlerClass parent_class;
};
-GType gegl_handler_cache_get_type (void) G_GNUC_CONST;
+GType gegl_tile_handler_cache_get_type (void) G_GNUC_CONST;
#endif
Copied: trunk/gegl/buffer/gegl-tile-handler-chain.c (from r2176, /trunk/gegl/buffer/gegl-handlers.c)
==============================================================================
--- /trunk/gegl/buffer/gegl-handlers.c (original)
+++ trunk/gegl/buffer/gegl-tile-handler-chain.c Wed Apr 16 22:44:31 2008
@@ -20,29 +20,29 @@
#include <glib.h>
-#include "gegl-handlers.h"
-#include "gegl-handler-cache.h"
+#include "gegl-tile-handler-chain.h"
+#include "gegl-tile-handler-cache.h"
-G_DEFINE_TYPE (GeglHandlers, gegl_handlers, GEGL_TYPE_HANDLER)
+G_DEFINE_TYPE (GeglTileHandlerChain, gegl_tile_handler_chain, GEGL_TYPE_TILE_HANDLER)
-static void gegl_handlers_rebind (GeglHandlers *handlers);
+static void gegl_tile_handler_chain_rebind (GeglTileHandlerChain *tile_handler_chain);
static void
-gegl_handlers_nuke_cache (GeglHandlers *handlers)
+gegl_tile_handler_chain_nuke_cache (GeglTileHandlerChain *tile_handler_chain)
{
GSList *iter;
- while (gegl_handlers_get_first (handlers, GEGL_TYPE_HANDLER_CACHE))
+ while (gegl_tile_handler_chain_get_first (tile_handler_chain, GEGL_TYPE_TILE_HANDLER_CACHE))
{
- iter = handlers->chain;
+ iter = tile_handler_chain->chain;
while (iter)
{
- if (GEGL_IS_HANDLER_CACHE (iter->data))
+ if (GEGL_IS_TILE_HANDLER_CACHE (iter->data))
{
g_object_unref (iter->data);
- handlers->chain = g_slist_remove (handlers->chain, iter->data);
- gegl_handlers_rebind (handlers);
+ tile_handler_chain->chain = g_slist_remove (tile_handler_chain->chain, iter->data);
+ gegl_tile_handler_chain_rebind (tile_handler_chain);
break;
}
iter = iter->next;
@@ -53,16 +53,16 @@
static void
dispose (GObject *object)
{
- GeglHandlers *handlers = GEGL_HANDLERS (object);
+ GeglTileHandlerChain *tile_handler_chain = GEGL_TILE_HANDLER_CHAIN (object);
GSList *iter;
/* Get rid of the cache before any further parts of the deconstruction of the
* TileStore chain, unwritten tiles need a living TileStore for their
* deconstruction.
*/
- gegl_handlers_nuke_cache (handlers);
+ gegl_tile_handler_chain_nuke_cache (tile_handler_chain);
- iter = handlers->chain;
+ iter = tile_handler_chain->chain;
while (iter)
{
if (iter->data)
@@ -70,36 +70,36 @@
iter = iter->next;
}
- if (handlers->chain)
- g_slist_free (handlers->chain);
- handlers->chain = NULL;
+ if (tile_handler_chain->chain)
+ g_slist_free (tile_handler_chain->chain);
+ tile_handler_chain->chain = NULL;
- G_OBJECT_CLASS (gegl_handlers_parent_class)->dispose (object);
+ G_OBJECT_CLASS (gegl_tile_handler_chain_parent_class)->dispose (object);
}
static void
finalize (GObject *object)
{
- G_OBJECT_CLASS (gegl_handlers_parent_class)->finalize (object);
+ G_OBJECT_CLASS (gegl_tile_handler_chain_parent_class)->finalize (object);
}
static gpointer
-command (GeglSource *tile_store,
+command (GeglTileSource *tile_store,
GeglTileCommand command,
gint x,
gint y,
gint z,
gpointer data)
{
- GeglHandlers *handlers = (GeglHandlers *) tile_store;
- GeglSource *source = ((GeglHandler *) tile_store)->source;
+ GeglTileHandlerChain *tile_handler_chain = (GeglTileHandlerChain *) tile_store;
+ GeglTileSource *source = ((GeglTileHandler *) tile_store)->source;
- if (handlers->chain != NULL)
- return gegl_source_command ((GeglSource *)(handlers->chain->data),
+ if (tile_handler_chain->chain != NULL)
+ return gegl_tile_source_command ((GeglTileSource *)(tile_handler_chain->chain->data),
command, x, y, z, data);
else if (source)
- return gegl_source_command (source, command, x, y, z, data);
+ return gegl_tile_source_command (source, command, x, y, z, data);
else
g_assert (0);
@@ -107,13 +107,13 @@
}
static void
-gegl_handlers_class_init (GeglHandlersClass *class)
+gegl_tile_handler_chain_class_init (GeglTileHandlerChainClass *class)
{
GObjectClass *gobject_class;
- GeglSourceClass *tile_store_class;
+ GeglTileSourceClass *tile_store_class;
gobject_class = (GObjectClass *) class;
- tile_store_class = (GeglSourceClass *) class;
+ tile_store_class = (GeglTileSourceClass *) class;
tile_store_class->command = command;
@@ -122,23 +122,23 @@
}
static void
-gegl_handlers_init (GeglHandlers *self)
+gegl_tile_handler_chain_init (GeglTileHandlerChain *self)
{
self->chain = NULL;
}
static void
-gegl_handlers_rebind (GeglHandlers *handlers)
+gegl_tile_handler_chain_rebind (GeglTileHandlerChain *tile_handler_chain)
{
GSList *iter;
- iter = handlers->chain;
+ iter = tile_handler_chain->chain;
while (iter)
{
- GeglHandler *handler;
- GeglSource *source = NULL;
+ GeglTileHandler *handler;
+ GeglTileSource *source = NULL;
handler = iter->data;
if (iter->next)
@@ -147,7 +147,7 @@
}
else
{
- g_object_get (handlers, "source", &source, NULL);
+ g_object_get (tile_handler_chain, "source", &source, NULL);
}
g_object_set (G_OBJECT (handler), "source", source, NULL);
g_object_unref (source);
@@ -155,25 +155,25 @@
}
}
-GeglHandler *
-gegl_handlers_add (GeglHandlers *handlers,
- GeglHandler *handler)
+GeglTileHandler *
+gegl_tile_handler_chain_add (GeglTileHandlerChain *tile_handler_chain,
+ GeglTileHandler *handler)
{
- handlers->chain = g_slist_prepend (handlers->chain, handler);
- gegl_handlers_rebind (handlers);
+ tile_handler_chain->chain = g_slist_prepend (tile_handler_chain->chain, handler);
+ gegl_tile_handler_chain_rebind (tile_handler_chain);
return handler;
}
/*
* return the first handler of a given type
*/
-GeglHandler *
-gegl_handlers_get_first (GeglHandlers *handlers,
- GType type)
+GeglTileHandler *
+gegl_tile_handler_chain_get_first (GeglTileHandlerChain *tile_handler_chain,
+ GType type)
{
GSList *iter;
- iter = handlers->chain;
+ iter = tile_handler_chain->chain;
while (iter)
{
if ((G_TYPE_CHECK_INSTANCE_TYPE ((iter->data), type)))
Copied: trunk/gegl/buffer/gegl-tile-handler-chain.h (from r2176, /trunk/gegl/buffer/gegl-handlers.h)
==============================================================================
--- /trunk/gegl/buffer/gegl-handlers.h (original)
+++ trunk/gegl/buffer/gegl-tile-handler-chain.h Wed Apr 16 22:44:31 2008
@@ -16,49 +16,51 @@
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef __GEGL_HANDLERS_H__
-#define __GEGL_HANDLERS_H__
+#ifndef __GEGL_TILE_HANDLER_CHAIN_H__
+#define __GEGL_TILE_HANDLER_CHAIN_H__
-#include "gegl-handler.h"
+#include "gegl-tile-handler.h"
-#define GEGL_TYPE_HANDLERS (gegl_handlers_get_type ())
-#define GEGL_HANDLERS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_HANDLERS, GeglHandlers))
-#define GEGL_HANDLERS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_HANDLERS, GeglHandlersClass))
-#define GEGL_IS_HANDLERS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_HANDLERS))
-#define GEGL_IS_HANDLERS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_HANDLERS))
-#define GEGL_HANDLERS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_HANDLERS, GeglHandlersClass))
+#define GEGL_TYPE_TILE_HANDLER_CHAIN (gegl_tile_handler_chain_get_type ())
+#define GEGL_TILE_HANDLER_CHAIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE_HANDLER_CHAIN, GeglTileHandlerChain))
+#define GEGL_TILE_HANDLER_CHAIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_TILE_HANDLER_CHAIN, GeglTileHandlerChainClass))
+#define GEGL_IS_TILE_HANDLER_CHAIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE_HANDLER_CHAIN))
+#define GEGL_IS_TILE_HANDLER_CHAIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_TILE_HANDLER_CHAIN))
+#define GEGL_TILE_HANDLER_CHAIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_TILE_HANDLER_CHAIN, GeglTileHandlerChainClass))
-struct _GeglHandlers
+struct _GeglTileHandlerChain
{
- GeglHandler parent_instance;
+ GeglTileHandler parent_instance;
GSList *chain;
};
-struct _GeglHandlersClass
+struct _GeglTileHandlerChainClass
{
- GeglHandlerClass parent_class;
+ GeglTileHandlerClass parent_class;
};
-GType gegl_handlers_get_type (void) G_GNUC_CONST;
+GType gegl_tile_handler_chain_get_type (void) G_GNUC_CONST;
/**
- * gegl_handlers_add:
- * @handlers: a #GeglHandlers
- * @handler: a #GeglHandler.
+ * gegl_tile_handler_chain_add:
+ * @tile_handler_chain: a #GeglTileHandlerChain
+ * @handler: a #GeglTileHandler.
*
- * Adds @handler to the list of handlers to be processed, the order handlers
+ * Adds @handler to the list of tile_handler_chain to be processed, the order tile_handler_chain
* are added in is from original source to last processing element, commands
* are passed from the last added to the first one in the chain, tiles
* and other results are passed back up
*
* Returns: the added handler.
*/
-GeglHandler * gegl_handlers_add (GeglHandlers *handlers,
- GeglHandler *handler);
+GeglTileHandler * gegl_tile_handler_chain_add
+ (GeglTileHandlerChain *tile_handler_chain,
+ GeglTileHandler *handler);
/* returns the first matching handler of a specified type (or NULL) */
-GeglHandler * gegl_handlers_get_first (GeglHandlers *handlers,
- GType type);
+GeglTileHandler * gegl_tile_handler_chain_get_first
+ (GeglTileHandlerChain *tile_handler_chain,
+ GType type);
#endif
Copied: trunk/gegl/buffer/gegl-tile-handler-empty.c (from r2178, /trunk/gegl/buffer/gegl-handler-empty.c)
==============================================================================
--- /trunk/gegl/buffer/gegl-handler-empty.c (original)
+++ trunk/gegl/buffer/gegl-tile-handler-empty.c Wed Apr 16 22:44:31 2008
@@ -19,11 +19,11 @@
#include <glib-object.h>
#include <string.h>
-#include "gegl-handler.h"
-#include "gegl-handler-empty.h"
-#include "gegl-handler-cache.h"
+#include "gegl-tile-handler.h"
+#include "gegl-tile-handler-empty.h"
+#include "gegl-tile-handler-cache.h"
-G_DEFINE_TYPE (GeglHandlerEmpty, gegl_handler_empty, GEGL_TYPE_HANDLER)
+G_DEFINE_TYPE (GeglTileHandlerEmpty, gegl_tile_handler_empty, GEGL_TYPE_TILE_HANDLER)
enum
{
@@ -34,32 +34,32 @@
static void
finalize (GObject *object)
{
- GeglHandlerEmpty *empty = GEGL_HANDLER_EMPTY (object);
+ GeglTileHandlerEmpty *empty = GEGL_TILE_HANDLER_EMPTY (object);
if (empty->tile)
g_object_unref (empty->tile);
- G_OBJECT_CLASS (gegl_handler_empty_parent_class)->finalize (object);
+ G_OBJECT_CLASS (gegl_tile_handler_empty_parent_class)->finalize (object);
}
-void gegl_handler_cache_insert (GeglHandlerCache *cache,
- GeglTile *tile,
- gint x,
- gint y,
- gint z);
+void gegl_tile_handler_cache_insert (GeglTileHandlerCache *cache,
+ GeglTile *tile,
+ gint x,
+ gint y,
+ gint z);
static GeglTile *
-get_tile (GeglSource *gegl_source,
- gint x,
- gint y,
- gint z)
-{
- GeglSource *source = GEGL_HANDLER (gegl_source)->source;
- GeglHandlerEmpty *empty = GEGL_HANDLER_EMPTY (gegl_source);
- GeglTile *tile = NULL;
+get_tile (GeglTileSource *gegl_tile_source,
+ gint x,
+ gint y,
+ gint z)
+{
+ GeglTileSource *source = GEGL_HANDLER (gegl_tile_source)->source;
+ GeglTileHandlerEmpty *empty = GEGL_TILE_HANDLER_EMPTY (gegl_tile_source);
+ GeglTile *tile = NULL;
if (source)
- tile = gegl_source_get_tile (source, x, y, z);
+ tile = gegl_tile_source_get_tile (source, x, y, z);
if (tile != NULL)
return tile;
@@ -68,9 +68,9 @@
tile->y = y;
tile->z = z;
{
- GeglHandlerCache *cache = g_object_get_data (G_OBJECT (gegl_source), "cache");
+ GeglTileHandlerCache *cache = g_object_get_data (G_OBJECT (gegl_tile_source), "cache");
if (cache)
- gegl_handler_cache_insert (cache, tile, x, y, z);
+ gegl_tile_handler_cache_insert (cache, tile, x, y, z);
}
return tile;
@@ -83,7 +83,7 @@
GValue *value,
GParamSpec *pspec)
{
- GeglHandlerEmpty *empty = GEGL_HANDLER_EMPTY (gobject);
+ GeglTileHandlerEmpty *empty = GEGL_TILE_HANDLER_EMPTY (gobject);
switch (property_id)
{
@@ -103,7 +103,7 @@
const GValue *value,
GParamSpec *pspec)
{
- GeglHandlerEmpty *empty = GEGL_HANDLER_EMPTY (gobject);
+ GeglTileHandlerEmpty *empty = GEGL_TILE_HANDLER_EMPTY (gobject);
switch (property_id)
{
@@ -123,14 +123,14 @@
GObjectConstructParam *params)
{
GObject *object;
- GeglHandlerEmpty *empty;
+ GeglTileHandlerEmpty *empty;
gint tile_width;
gint tile_height;
gint tile_size;
- object = G_OBJECT_CLASS (gegl_handler_empty_parent_class)->constructor (type, n_params, params);
+ object = G_OBJECT_CLASS (gegl_tile_handler_empty_parent_class)->constructor (type, n_params, params);
- empty = GEGL_HANDLER_EMPTY (object);
+ empty = GEGL_TILE_HANDLER_EMPTY (object);
g_assert (empty->backend);
g_object_get (empty->backend, "tile-width", &tile_width,
@@ -146,24 +146,24 @@
static gpointer
-command (GeglSource *buffer,
- GeglTileCommand command,
- gint x,
- gint y,
- gint z,
- gpointer data)
+command (GeglTileSource *buffer,
+ GeglTileCommand command,
+ gint x,
+ gint y,
+ gint z,
+ gpointer data)
{
if (command == GEGL_TILE_GET)
return get_tile (buffer, x, y, z);
- return gegl_handler_chain_up (GEGL_HANDLER(buffer), command, x, y, z, data);
+ return gegl_tile_handler_chain_up (GEGL_HANDLER(buffer), command, x, y, z, data);
}
static void
-gegl_handler_empty_class_init (GeglHandlerEmptyClass *klass)
+gegl_tile_handler_empty_class_init (GeglTileHandlerEmptyClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- GeglSourceClass *source_class = GEGL_SOURCE_CLASS (klass);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ GeglTileSourceClass *source_class = GEGL_TILE_SOURCE_CLASS (klass);
gobject_class->constructor = constructor;
gobject_class->finalize = finalize;
@@ -181,6 +181,6 @@
}
static void
-gegl_handler_empty_init (GeglHandlerEmpty *self)
+gegl_tile_handler_empty_init (GeglTileHandlerEmpty *self)
{
}
Copied: trunk/gegl/buffer/gegl-tile-handler-empty.h (from r2176, /trunk/gegl/buffer/gegl-handler-empty.h)
==============================================================================
--- /trunk/gegl/buffer/gegl-handler-empty.h (original)
+++ trunk/gegl/buffer/gegl-tile-handler-empty.h Wed Apr 16 22:44:31 2008
@@ -16,38 +16,38 @@
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef __GEGL_HANDLER_EMPTY_H__
-#define __GEGL_HANDLER_EMPTY_H__
+#ifndef __GEGL_TILE_HANDLER_EMPTY_H__
+#define __GEGL_TILE_HANDLER_EMPTY_H__
-#include "gegl-handler.h"
+#include "gegl-tile-handler.h"
G_BEGIN_DECLS
-#define GEGL_TYPE_HANDLER_EMPTY (gegl_handler_empty_get_type ())
-#define GEGL_HANDLER_EMPTY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_HANDLER_EMPTY, GeglHandlerEmpty))
-#define GEGL_HANDLER_EMPTY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_HANDLER_EMPTY, GeglHandlerEmptyClass))
-#define GEGL_IS_HANDLER_EMPTY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_HANDLER_EMPTY))
-#define GEGL_IS_HANDLER_EMPTY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_HANDLER_EMPTY))
-#define GEGL_HANDLER_EMPTY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_HANDLER_EMPTY, GeglHandlerEmptyClass))
+#define GEGL_TYPE_TILE_HANDLER_EMPTY (gegl_tile_handler_empty_get_type ())
+#define GEGL_TILE_HANDLER_EMPTY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE_HANDLER_EMPTY, GeglTileHandlerEmpty))
+#define GEGL_TILE_HANDLER_EMPTY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_TILE_HANDLER_EMPTY, GeglTileHandlerEmptyClass))
+#define GEGL_IS_TILE_HANDLER_EMPTY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE_HANDLER_EMPTY))
+#define GEGL_IS_TILE_HANDLER_EMPTY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_TILE_HANDLER_EMPTY))
+#define GEGL_TILE_HANDLER_EMPTY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_TILE_HANDLER_EMPTY, GeglTileHandlerEmptyClass))
-typedef struct _GeglHandlerEmpty GeglHandlerEmpty;
-typedef struct _GeglHandlerEmptyClass GeglHandlerEmptyClass;
+typedef struct _GeglTileHandlerEmpty GeglTileHandlerEmpty;
+typedef struct _GeglTileHandlerEmptyClass GeglTileHandlerEmptyClass;
-struct _GeglHandlerEmpty
+struct _GeglTileHandlerEmpty
{
- GeglHandler parent_instance;
+ GeglTileHandler parent_instance;
GeglTile *tile;
GeglTileBackend *backend;
};
-struct _GeglHandlerEmptyClass
+struct _GeglTileHandlerEmptyClass
{
- GeglHandlerClass parent_class;
+ GeglTileHandlerClass parent_class;
};
-GType gegl_handler_empty_get_type (void) G_GNUC_CONST;
+GType gegl_tile_handler_empty_get_type (void) G_GNUC_CONST;
G_END_DECLS
Copied: trunk/gegl/buffer/gegl-tile-handler-log.c (from r2176, /trunk/gegl/buffer/gegl-handler-log.c)
==============================================================================
--- /trunk/gegl/buffer/gegl-handler-log.c (original)
+++ trunk/gegl/buffer/gegl-tile-handler-log.c Wed Apr 16 22:44:31 2008
@@ -19,10 +19,10 @@
#include <glib-object.h>
#include <string.h>
-#include "gegl-handler.h"
-#include "gegl-handler-log.h"
+#include "gegl-tile-handler.h"
+#include "gegl-tile-handler-log.h"
-G_DEFINE_TYPE (GeglHandlerLog, gegl_handler_log, GEGL_TYPE_HANDLER)
+G_DEFINE_TYPE (GeglTileHandlerLog, gegl_tile_handler_log, GEGL_TYPE_TILE_HANDLER)
static char *commands[] =
@@ -44,17 +44,17 @@
};
static gpointer
-command (GeglSource *gegl_source,
- GeglTileCommand command,
- gint x,
- gint y,
- gint z,
- gpointer data)
+command (GeglTileSource *gegl_tile_source,
+ GeglTileCommand command,
+ gint x,
+ gint y,
+ gint z,
+ gpointer data)
{
- GeglHandler *handler = GEGL_HANDLER (gegl_source);
- gpointer result = NULL;
+ GeglTileHandler *handler = GEGL_HANDLER (gegl_tile_source);
+ gpointer result = NULL;
- result = gegl_handler_chain_up (handler, command, x, y, z, data);
+ result = gegl_tile_handler_chain_up (handler, command, x, y, z, data);
switch (command)
{
@@ -62,21 +62,21 @@
break;
default:
g_print ("(%s %p %p %i,%i,%i => %s)",
- commands[command], (void *) gegl_source, data, x, y, z,
+ commands[command], (void *) gegl_tile_source, data, x, y, z,
result?"1":"0");
}
return result;
}
static void
-gegl_handler_log_class_init (GeglHandlerLogClass *klass)
+gegl_tile_handler_log_class_init (GeglTileHandlerLogClass *klass)
{
- GeglSourceClass *source_class = GEGL_SOURCE_CLASS (klass);
+ GeglTileSourceClass *source_class = GEGL_TILE_SOURCE_CLASS (klass);
source_class->command = command;
}
static void
-gegl_handler_log_init (GeglHandlerLog *self)
+gegl_tile_handler_log_init (GeglTileHandlerLog *self)
{
}
Copied: trunk/gegl/buffer/gegl-tile-handler-log.h (from r2176, /trunk/gegl/buffer/gegl-handler-log.h)
==============================================================================
--- /trunk/gegl/buffer/gegl-handler-log.h (original)
+++ trunk/gegl/buffer/gegl-tile-handler-log.h Wed Apr 16 22:44:31 2008
@@ -16,35 +16,35 @@
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef __GEGL_HANDLER_LOG_H__
-#define __GEGL_HANDLER_LOG_H__
+#ifndef __GEGL_TILE_HANDLER_LOG_H__
+#define __GEGL_TILE_HANDLER_LOG_H__
-#include "gegl-handler.h"
+#include "gegl-tile-handler.h"
G_BEGIN_DECLS
-#define GEGL_TYPE_HANDLER_LOG (gegl_handler_log_get_type ())
-#define GEGL_HANDLER_LOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_HANDLER_LOG, GeglHandlerLog))
-#define GEGL_HANDLER_LOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_HANDLER_LOG, GeglHandlerLogClass))
-#define GEGL_IS_HANDLER_LOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_HANDLER_LOG))
-#define GEGL_IS_HANDLER_LOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_HANDLER_LOG))
-#define GEGL_HANDLER_LOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_HANDLER_LOG, GeglHandlerLogClass))
+#define GEGL_TYPE_TILE_HANDLER_LOG (gegl_tile_handler_log_get_type ())
+#define GEGL_TILE_HANDLER_LOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE_HANDLER_LOG, GeglTileHandlerLog))
+#define GEGL_TILE_HANDLER_LOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_TILE_HANDLER_LOG, GeglTileHandlerLogClass))
+#define GEGL_IS_TILE_HANDLER_LOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE_HANDLER_LOG))
+#define GEGL_IS_TILE_HANDLER_LOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_TILE_HANDLER_LOG))
+#define GEGL_TILE_HANDLER_LOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_TILE_HANDLER_LOG, GeglTileHandlerLogClass))
-typedef struct _GeglHandlerLog GeglHandlerLog;
-typedef struct _GeglHandlerLogClass GeglHandlerLogClass;
+typedef struct _GeglTileHandlerLog GeglTileHandlerLog;
+typedef struct _GeglTileHandlerLogClass GeglTileHandlerLogClass;
-struct _GeglHandlerLog
+struct _GeglTileHandlerLog
{
- GeglHandler parent_instance;
+ GeglTileHandler parent_instance;
};
-struct _GeglHandlerLogClass
+struct _GeglTileHandlerLogClass
{
- GeglHandlerClass parent_class;
+ GeglTileHandlerClass parent_class;
};
-GType gegl_handler_log_get_type (void) G_GNUC_CONST;
+GType gegl_tile_handler_log_get_type (void) G_GNUC_CONST;
G_END_DECLS
Copied: trunk/gegl/buffer/gegl-tile-handler-zoom.c (from r2178, /trunk/gegl/buffer/gegl-handler-zoom.c)
==============================================================================
--- /trunk/gegl/buffer/gegl-handler-zoom.c (original)
+++ trunk/gegl/buffer/gegl-tile-handler-zoom.c Wed Apr 16 22:44:31 2008
@@ -19,28 +19,28 @@
#include <glib-object.h>
#include <string.h>
-#include "gegl-handler.h"
-#include "gegl-handler-zoom.h"
-#include "gegl-handler-cache.h"
+#include "gegl-tile-handler.h"
+#include "gegl-tile-handler-zoom.h"
+#include "gegl-tile-handler-cache.h"
-G_DEFINE_TYPE (GeglHandlerZoom, gegl_handler_zoom, GEGL_TYPE_HANDLER)
+G_DEFINE_TYPE (GeglTileHandlerZoom, gegl_tile_handler_zoom, GEGL_TYPE_TILE_HANDLER)
enum
{
PROP_0,
- PROP_STORAGE,
+ PROP_TILE_STORAGE,
PROP_BACKEND,
};
#include <babl/babl.h>
#include "gegl-tile-backend.h"
-void gegl_handler_cache_insert (GeglHandlerCache *cache,
- GeglTile *tile,
- gint x,
- gint y,
- gint z);
+void gegl_tile_handler_cache_insert (GeglTileHandlerCache *cache,
+ GeglTile *tile,
+ gint x,
+ gint y,
+ gint z);
static inline void set_blank (GeglTile *dst_tile,
gint width,
gint height,
@@ -168,9 +168,9 @@
static void inline set_half (GeglTile * dst_tile,
GeglTile * src_tile,
- gint width,
- gint height,
- Babl * format,
+ gint width,
+ gint height,
+ Babl * format,
gint i,
gint j)
{
@@ -197,22 +197,22 @@
}
static GeglTile *
-get_tile (GeglSource *gegl_source,
- gint x,
- gint y,
- gint z)
-{
- GeglSource *source = GEGL_HANDLER (gegl_source)->source;
- GeglHandlerZoom *zoom = GEGL_HANDLER_ZOOM (gegl_source);
- GeglTile *tile = NULL;
- Babl *format = (Babl *) (zoom->backend->format);
- gint tile_width;
- gint tile_height;
- gint tile_size;
+get_tile (GeglTileSource *gegl_tile_source,
+ gint x,
+ gint y,
+ gint z)
+{
+ GeglTileSource *source = GEGL_HANDLER (gegl_tile_source)->source;
+ GeglTileHandlerZoom *zoom = GEGL_TILE_HANDLER_ZOOM (gegl_tile_source);
+ GeglTile *tile = NULL;
+ Babl *format = (Babl *) (zoom->backend->format);
+ gint tile_width;
+ gint tile_height;
+ gint tile_size;
if (source)
{
- tile = gegl_source_get_tile (source, x, y, z);
+ tile = gegl_tile_source_get_tile (source, x, y, z);
}
if (tile != NULL)
@@ -272,7 +272,7 @@
/* we get the tile from ourselves, to make successive rescales work
* correctly */
if (fetch[i][j])
- source_tile[i][j] = gegl_source_get_tile (gegl_source,
+ source_tile[i][j] = gegl_tile_source_get_tile (gegl_tile_source,
x * 2 + i, y * 2 + j, z - 1);
}
@@ -285,7 +285,7 @@
{
g_object_unref (tile);
}
- return NULL; /* no data from level below, return NULL and let GeglHandlerEmpty
+ return NULL; /* no data from level below, return NULL and let GeglTileHandlerEmpty
fill in the shared empty tile */
}
@@ -294,7 +294,7 @@
tile = gegl_tile_new (tile_size);
/* it is a bit hacky, but adding enough information (probably too much)
- * enabling the storage system to attempt swapping out of zoom tiles
+ * enabling the tile_storage system to attempt swapping out of zoom tiles
*/
tile->storage_x = x;
tile->storage_y = y;
@@ -302,15 +302,15 @@
tile->x = x;
tile->y = y;
tile->z = z;
- tile->storage = zoom->storage;
+ tile->tile_storage = zoom->tile_storage;
tile->stored_rev = 1;
tile->rev = 1;
{
- GeglHandlerCache *cache = g_object_get_data (G_OBJECT (gegl_source), "cache");
+ GeglTileHandlerCache *cache = g_object_get_data (G_OBJECT (gegl_tile_source), "cache");
if (cache)
{
- gegl_handler_cache_insert (cache, tile, x, y, z);
+ gegl_tile_handler_cache_insert (cache, tile, x, y, z);
}
}
}
@@ -343,15 +343,15 @@
}
static gpointer
-command (GeglSource *tile_store,
- GeglTileCommand command,
- gint x,
- gint y,
- gint z,
- gpointer data)
+command (GeglTileSource *tile_store,
+ GeglTileCommand command,
+ gint x,
+ gint y,
+ gint z,
+ gpointer data)
{
- GeglHandler *handler = GEGL_HANDLER (tile_store);
- /*GeglSource *source = handler->source;*/
+ GeglTileHandler *handler = GEGL_HANDLER (tile_store);
+ /*GeglTileSource *source = handler->source;*/
if (command == GEGL_TILE_GET)
return get_tile (tile_store, x, y, z);
@@ -360,7 +360,7 @@
command == GEGL_TILE_VOID_BL ||
command == GEGL_TILE_VOID_BR)
{
- GeglTile *tile = gegl_source_get_tile (tile_store, x, y, z);
+ GeglTile *tile = gegl_tile_source_get_tile (tile_store, x, y, z);
if (!tile)
return FALSE;
@@ -389,7 +389,7 @@
return FALSE;
}
/* pass the command on */
- return gegl_handler_chain_up (handler, command, x, y, z, data);
+ return gegl_tile_handler_chain_up (handler, command, x, y, z, data);
}
@@ -399,12 +399,12 @@
GValue *value,
GParamSpec *pspec)
{
- GeglHandlerZoom *zoom = GEGL_HANDLER_ZOOM (gobject);
+ GeglTileHandlerZoom *zoom = GEGL_TILE_HANDLER_ZOOM (gobject);
switch (property_id)
{
- case PROP_STORAGE:
- g_value_set_object (value, zoom->storage);
+ case PROP_TILE_STORAGE:
+ g_value_set_object (value, zoom->tile_storage);
break;
case PROP_BACKEND:
@@ -423,12 +423,12 @@
const GValue *value,
GParamSpec *pspec)
{
- GeglHandlerZoom *zoom = GEGL_HANDLER_ZOOM (gobject);
+ GeglTileHandlerZoom *zoom = GEGL_TILE_HANDLER_ZOOM (gobject);
switch (property_id)
{
- case PROP_STORAGE:
- zoom->storage = g_value_get_object (value);
+ case PROP_TILE_STORAGE:
+ zoom->tile_storage = g_value_get_object (value);
break;
case PROP_BACKEND:
@@ -447,21 +447,21 @@
GObjectConstructParam *params)
{
GObject *object;
- GeglHandlerZoom *zoom;
+ GeglTileHandlerZoom *zoom;
- object = G_OBJECT_CLASS (gegl_handler_zoom_parent_class)->constructor (type, n_params, params);
+ object = G_OBJECT_CLASS (gegl_tile_handler_zoom_parent_class)->constructor (type, n_params, params);
- zoom = GEGL_HANDLER_ZOOM (object);
+ zoom = GEGL_TILE_HANDLER_ZOOM (object);
return object;
}
static void
-gegl_handler_zoom_class_init (GeglHandlerZoomClass *klass)
+gegl_tile_handler_zoom_class_init (GeglTileHandlerZoomClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- GeglSourceClass *source_class = GEGL_SOURCE_CLASS (klass);
+ GeglTileSourceClass *source_class = GEGL_TILE_SOURCE_CLASS (klass);
gobject_class->constructor = constructor;
gobject_class->set_property = set_property;
@@ -469,10 +469,10 @@
source_class->command = command;
- 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_object_class_install_property (gobject_class, PROP_TILE_STORAGE,
+ g_param_spec_object ("tile_storage",
+ "tile_storage",
+ "tile_storage for this tilestore (needed for tile size data)",
G_TYPE_OBJECT,
G_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY));
@@ -488,8 +488,8 @@
}
static void
-gegl_handler_zoom_init (GeglHandlerZoom *self)
+gegl_tile_handler_zoom_init (GeglTileHandlerZoom *self)
{
self->backend = NULL;
- self->storage = NULL;
+ self->tile_storage = NULL;
}
Copied: trunk/gegl/buffer/gegl-tile-handler-zoom.h (from r2176, /trunk/gegl/buffer/gegl-handler-zoom.h)
==============================================================================
--- /trunk/gegl/buffer/gegl-handler-zoom.h (original)
+++ trunk/gegl/buffer/gegl-tile-handler-zoom.h Wed Apr 16 22:44:31 2008
@@ -16,38 +16,38 @@
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef __GEGL_HANDLER_ZOOM_H__
-#define __GEGL_HANDLER_ZOOM_H__
+#ifndef __GEGL_TILE_HANDLER_ZOOM_H__
+#define __GEGL_TILE_HANDLER_ZOOM_H__
-#include "gegl-handler.h"
+#include "gegl-tile-handler.h"
G_BEGIN_DECLS
-#define GEGL_TYPE_HANDLER_ZOOM (gegl_handler_zoom_get_type ())
-#define GEGL_HANDLER_ZOOM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_HANDLER_ZOOM, GeglHandlerZoom))
-#define GEGL_HANDLER_ZOOM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_HANDLER_ZOOM, GeglHandlerZoomClass))
-#define GEGL_IS_HANDLER_ZOOM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_HANDLER_ZOOM))
-#define GEGL_IS_HANDLER_ZOOM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_HANDLER_ZOOM))
-#define GEGL_HANDLER_ZOOM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_HANDLER_ZOOM, GeglHandlerZoomClass))
+#define GEGL_TYPE_TILE_HANDLER_ZOOM (gegl_tile_handler_zoom_get_type ())
+#define GEGL_TILE_HANDLER_ZOOM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE_HANDLER_ZOOM, GeglTileHandlerZoom))
+#define GEGL_TILE_HANDLER_ZOOM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_TILE_HANDLER_ZOOM, GeglTileHandlerZoomClass))
+#define GEGL_IS_TILE_HANDLER_ZOOM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE_HANDLER_ZOOM))
+#define GEGL_IS_TILE_HANDLER_ZOOM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_TILE_HANDLER_ZOOM))
+#define GEGL_TILE_HANDLER_ZOOM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_TILE_HANDLER_ZOOM, GeglTileHandlerZoomClass))
-typedef struct _GeglHandlerZoom GeglHandlerZoom;
-typedef struct _GeglHandlerZoomClass GeglHandlerZoomClass;
+typedef struct _GeglTileHandlerZoom GeglTileHandlerZoom;
+typedef struct _GeglTileHandlerZoomClass GeglTileHandlerZoomClass;
-struct _GeglHandlerZoom
+struct _GeglTileHandlerZoom
{
- GeglHandler parent_instance;
+ GeglTileHandler parent_instance;
GeglTileBackend *backend;
- GeglStorage *storage;
+ GeglTileStorage *tile_storage;
};
-struct _GeglHandlerZoomClass
+struct _GeglTileHandlerZoomClass
{
- GeglHandlerClass parent_class;
+ GeglTileHandlerClass parent_class;
};
-GType gegl_handler_zoom_get_type (void) G_GNUC_CONST;
+GType gegl_tile_handler_zoom_get_type (void) G_GNUC_CONST;
G_END_DECLS
Copied: trunk/gegl/buffer/gegl-tile-handler.c (from r2176, /trunk/gegl/buffer/gegl-handler.c)
==============================================================================
--- /trunk/gegl/buffer/gegl-handler.c (original)
+++ trunk/gegl/buffer/gegl-tile-handler.c Wed Apr 16 22:44:31 2008
@@ -22,12 +22,12 @@
#include <glib-object.h>
-#include "gegl-source.h"
-#include "gegl-handler.h"
-#include "gegl-handlers.h"
+#include "gegl-tile-source.h"
+#include "gegl-tile-handler.h"
+#include "gegl-tile-handler-chain.h"
-G_DEFINE_TYPE (GeglHandler, gegl_handler, GEGL_TYPE_SOURCE)
+G_DEFINE_TYPE (GeglTileHandler, gegl_tile_handler, GEGL_TYPE_TILE_SOURCE)
enum
{
@@ -38,7 +38,7 @@
static void
dispose (GObject *object)
{
- GeglHandler *handler = GEGL_HANDLER (object);
+ GeglTileHandler *handler = GEGL_HANDLER (object);
if (handler->source != NULL)
{
@@ -46,20 +46,20 @@
handler->source = NULL;
}
- G_OBJECT_CLASS (gegl_handler_parent_class)->dispose (object);
+ G_OBJECT_CLASS (gegl_tile_handler_parent_class)->dispose (object);
}
static gpointer
-command (GeglSource *gegl_source,
+command (GeglTileSource *gegl_tile_source,
GeglTileCommand command,
gint x,
gint y,
gint z,
gpointer data)
{
- GeglHandler *handler = (GeglHandler*)gegl_source;
+ GeglTileHandler *handler = (GeglTileHandler*)gegl_tile_source;
- return gegl_handler_chain_up (handler, command, x, y, z, data);
+ return gegl_tile_handler_chain_up (handler, command, x, y, z, data);
}
static void
@@ -68,7 +68,7 @@
GValue *value,
GParamSpec *pspec)
{
- GeglHandler *handler = GEGL_HANDLER (gobject);
+ GeglTileHandler *handler = GEGL_HANDLER (gobject);
switch (property_id)
{
@@ -88,22 +88,22 @@
const GValue *value,
GParamSpec *pspec)
{
- GeglHandler *handler = GEGL_HANDLER (gobject);
+ GeglTileHandler *handler = GEGL_HANDLER (gobject);
switch (property_id)
{
case PROP_SOURCE:
if (handler->source != NULL)
g_object_unref (handler->source);
- handler->source = GEGL_SOURCE (g_value_dup_object (value));
+ handler->source = GEGL_TILE_SOURCE (g_value_dup_object (value));
/* special case if we are the Traits subclass of Trait
* also set the source at the end of the chain.
*/
- if (GEGL_IS_HANDLERS (handler))
+ if (GEGL_IS_TILE_HANDLER_CHAIN (handler))
{
- GeglHandlers *handlers = GEGL_HANDLERS (handler);
- GSList *iter = (void *) handlers->chain;
+ GeglTileHandlerChain *tile_handler_chain = GEGL_TILE_HANDLER_CHAIN (handler);
+ GSList *iter = (void *) tile_handler_chain->chain;
while (iter && iter->next)
iter = iter->next;
if (iter)
@@ -119,24 +119,24 @@
}
}
-gpointer gegl_handler_chain_up (GeglHandler *handler,
- GeglTileCommand command,
- gint x,
- gint y,
- gint z,
- gpointer data)
+gpointer gegl_tile_handler_chain_up (GeglTileHandler *handler,
+ GeglTileCommand command,
+ gint x,
+ gint y,
+ gint z,
+ gpointer data)
{
- GeglSource *source = gegl_handler_get_source (handler);
+ GeglTileSource *source = gegl_tile_handler_get_source (handler);
if (source)
- return gegl_source_command (source, command, x, y, z, data);
+ return gegl_tile_source_command (source, command, x, y, z, data);
return NULL;
}
static void
-gegl_handler_class_init (GeglHandlerClass *klass)
+gegl_tile_handler_class_init (GeglTileHandlerClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- GeglSourceClass *source_class = GEGL_SOURCE_CLASS (klass);
+ GeglTileSourceClass *source_class = GEGL_TILE_SOURCE_CLASS (klass);
gobject_class->set_property = set_property;
gobject_class->get_property = get_property;
@@ -153,7 +153,7 @@
}
static void
-gegl_handler_init (GeglHandler *self)
+gegl_tile_handler_init (GeglTileHandler *self)
{
self->source = NULL;
}
Copied: trunk/gegl/buffer/gegl-tile-handler.h (from r2176, /trunk/gegl/buffer/gegl-handler.h)
==============================================================================
--- /trunk/gegl/buffer/gegl-handler.h (original)
+++ trunk/gegl/buffer/gegl-tile-handler.h Wed Apr 16 22:44:31 2008
@@ -19,44 +19,43 @@
#ifndef __GEGL_HANDLER_H__
#define __GEGL_HANDLER_H__
-#include "gegl-source.h"
+#include "gegl-tile-source.h"
G_BEGIN_DECLS
-#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))
+#define GEGL_TYPE_TILE_HANDLER (gegl_tile_handler_get_type ())
+#define GEGL_HANDLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE_HANDLER, GeglTileHandler))
+#define GEGL_HANDLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_TILE_HANDLER, GeglTileHandlerClass))
+#define GEGL_IS_HANDLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE_HANDLER))
+#define GEGL_IS_HANDLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_TILE_HANDLER))
+#define GEGL_HANDLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_TILE_HANDLER, GeglTileHandlerClass))
-struct _GeglHandler
+struct _GeglTileHandler
{
- GeglSource parent_instance;
+ GeglTileSource parent_instance;
- GeglSource *source; /* The source of the data, which we can rely on if
- our command handler doesn't handle a command, this
- is typically done with gegl_handler_chain_up passing
- ourself as the first parameter. */
+ GeglTileSource *source; /* The source of the data, which we can rely on if
+ our command handler doesn't handle a command, this
+ is typically done with gegl_tile_handler_chain_up
+ passing ourself as the first parameter. */
};
-struct _GeglHandlerClass
+struct _GeglTileHandlerClass
{
- GeglSourceClass parent_class;
+ GeglTileSourceClass parent_class;
};
-GType gegl_handler_get_type (void) G_GNUC_CONST;
+GType gegl_tile_handler_get_type (void) G_GNUC_CONST;
-#define gegl_handler_get_source(handler) (((GeglHandler*)handler)->source)
+#define gegl_tile_handler_get_source(handler) (((GeglTileHandler*)handler)->source)
-
-gpointer gegl_handler_chain_up (GeglHandler *handler,
- GeglTileCommand command,
- gint x,
- gint y,
- gint z,
- gpointer data);
+gpointer gegl_tile_handler_chain_up (GeglTileHandler *handler,
+ GeglTileCommand command,
+ gint x,
+ gint y,
+ gint z,
+ gpointer data);
G_END_DECLS
Copied: trunk/gegl/buffer/gegl-tile-source.c (from r2176, /trunk/gegl/buffer/gegl-source.c)
==============================================================================
--- /trunk/gegl/buffer/gegl-source.c (original)
+++ trunk/gegl/buffer/gegl-tile-source.c Wed Apr 16 22:44:31 2008
@@ -17,45 +17,44 @@
*/
#include <glib.h>
#include <glib-object.h>
-#include "gegl-source.h"
+#include "gegl-tile-source.h"
-G_DEFINE_TYPE (GeglSource, gegl_source, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GeglTileSource, gegl_tile_source, G_TYPE_OBJECT)
static gpointer
-command (GeglSource *gegl_source,
- GeglTileCommand command,
- gint x,
- gint y,
- gint z,
- gpointer data)
+command (GeglTileSource *gegl_tile_source,
+ GeglTileCommand command,
+ gint x,
+ gint y,
+ gint z,
+ gpointer data)
{
g_warning ("Unimplemented %s %i, %i, %i, %p", G_STRFUNC, command, x, y, data);
return NULL;
}
static void
-gegl_source_class_init (GeglSourceClass *klass)
+gegl_tile_source_class_init (GeglTileSourceClass *klass)
{
klass->command = command;
}
static void
-gegl_source_init (GeglSource *self)
+gegl_tile_source_init (GeglTileSource *self)
{
}
gpointer
-gegl_source_command (GeglSource *gegl_source,
- GeglTileCommand command,
- gint x,
- gint y,
- gint z,
- gpointer data)
+gegl_tile_source_command (GeglTileSource *gegl_tile_source,
+ GeglTileCommand command,
+ gint x,
+ gint y,
+ gint z,
+ gpointer data)
{
- GeglSourceClass *klass;
+ GeglTileSourceClass *klass;
- klass = GEGL_SOURCE_GET_CLASS (gegl_source);
+ klass = GEGL_TILE_SOURCE_GET_CLASS (gegl_tile_source);
- return klass->command (gegl_source, command, x, y, z, data);
+ return klass->command (gegl_tile_source, command, x, y, z, data);
}
-
Copied: trunk/gegl/buffer/gegl-tile-source.h (from r2176, /trunk/gegl/buffer/gegl-source.h)
==============================================================================
--- /trunk/gegl/buffer/gegl-source.h (original)
+++ trunk/gegl/buffer/gegl-tile-source.h Wed Apr 16 22:44:31 2008
@@ -16,8 +16,8 @@
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef __GEGL_SOURCE_H__
-#define __GEGL_SOURCE_H__
+#ifndef __GEGL_TILE_SOURCE_H__
+#define __GEGL_TILE_SOURCE_H__
#include <glib-object.h>
#include <babl/babl.h>
@@ -26,12 +26,12 @@
G_BEGIN_DECLS
-#define GEGL_TYPE_SOURCE (gegl_source_get_type ())
-#define GEGL_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_SOURCE, GeglSource))
-#define GEGL_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_SOURCE, GeglSourceClass))
-#define GEGL_IS_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_SOURCE))
-#define GEGL_IS_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_SOURCE))
-#define GEGL_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_SOURCE, GeglSourceClass))
+#define GEGL_TYPE_TILE_SOURCE (gegl_tile_source_get_type ())
+#define GEGL_TILE_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE_SOURCE, GeglTileSource))
+#define GEGL_TILE_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_TILE_SOURCE, GeglTileSourceClass))
+#define GEGL_IS_TILE_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE_SOURCE))
+#define GEGL_IS_TILE_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_TILE_SOURCE))
+#define GEGL_TILE_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_TILE_SOURCE, GeglTileSourceClass))
typedef gint GeglTileCommand;
@@ -51,16 +51,16 @@
GEGL_TILE_LAST_COMMAND
};
-struct _GeglSource
+struct _GeglTileSource
{
GObject parent_instance;
};
-struct _GeglSourceClass
+struct _GeglTileSourceClass
{
GObjectClass parent_class;
- gpointer (*command) (GeglSource *gegl_source,
+ gpointer (*command) (GeglTileSource *gegl_tile_source,
GeglTileCommand command,
gint x,
gint y,
@@ -68,39 +68,49 @@
gpointer data);
};
-GType gegl_source_get_type (void) G_GNUC_CONST;
+GType gegl_tile_source_get_type (void) G_GNUC_CONST;
-gpointer gegl_source_command (GeglSource *gegl_source,
+gpointer gegl_tile_source_command (GeglTileSource *gegl_tile_source,
GeglTileCommand command,
gint x,
gint y,
gint z,
gpointer data);
-#define gegl_source_idle(source) \
- gegl_source_command(source,GEGL_TILE_IDLE,0,0,0,NULL)
-#define gegl_source_set_tile(source,x,y,z,tile) \
- (gboolean)gegl_source_command(source,GEGL_TILE_SET,x,y,z,tile)
-#define gegl_source_get_tile(source,x,y,z) \
- (GeglTile*)gegl_source_command(source,GEGL_TILE_GET,x,y,z,NULL)
-#define gegl_source_is_cached(source,x,y,z) \
- (gboolean)gegl_source_command(source,GEGL_TILE_IS_CACHED,x,y,z,NULL)
-#define gegl_source_exist(source,x,y,z) \
- (gboolean)gegl_source_command(source,GEGL_TILE_EXIST,x,y,z,NULL)
-#define gegl_source_void(source,x,y,z) \
- gegl_source_command(source,GEGL_TILE_VOID,x,y,z,NULL)
-#define gegl_source_void_tl(source,x,y,z) \
- gegl_source_command(source,GEGL_TILE_VOID_TL,x,y,z,NULL)
-#define gegl_source_void_tr(source,x,y,z) \
- gegl_source_command(source,GEGL_TILE_VOID_TR,x,y,z,NULL)
-#define gegl_source_void_bl(source,x,y,z) \
- gegl_source_command(source,GEGL_TILE_VOID_BL,x,y,z,NULL)
-#define gegl_source_void_br(source,x,y,z) \
- gegl_source_command(source,GEGL_TILE_VOID_BR,x,y,z,NULL)
-#define gegl_source_undo_start_group(source,x,y,z) \
- gegl_source_command(source,GEGL_TILE_UNDO_START_GROUP,x,y,z,NULL)
+#define gegl_tile_source_idle(source) \
+ gegl_tile_source_command(source,GEGL_TILE_IDLE,0,0,0,NULL)
+
+#define gegl_tile_source_set_tile(source,x,y,z,tile) \
+ (gboolean)gegl_tile_source_command(source,GEGL_TILE_SET,x,y,z,tile)
+
+#define gegl_tile_source_get_tile(source,x,y,z) \
+ (GeglTile*)gegl_tile_source_command(source,GEGL_TILE_GET,x,y,z,NULL)
+
+#define gegl_tile_source_is_cached(source,x,y,z) \
+ (gboolean)gegl_tile_source_command(source,GEGL_TILE_IS_CACHED,x,y,z,NULL)
+
+#define gegl_tile_source_exist(source,x,y,z) \
+ (gboolean)gegl_tile_source_command(source,GEGL_TILE_EXIST,x,y,z,NULL)
+
+#define gegl_tile_source_void(source,x,y,z) \
+ gegl_tile_source_command(source,GEGL_TILE_VOID,x,y,z,NULL)
+
+#define gegl_tile_source_void_tl(source,x,y,z) \
+ gegl_tile_source_command(source,GEGL_TILE_VOID_TL,x,y,z,NULL)
+
+#define gegl_tile_source_void_tr(source,x,y,z) \
+ gegl_tile_source_command(source,GEGL_TILE_VOID_TR,x,y,z,NULL)
+
+#define gegl_tile_source_void_bl(source,x,y,z) \
+ gegl_tile_source_command(source,GEGL_TILE_VOID_BL,x,y,z,NULL)
+
+#define gegl_tile_source_void_br(source,x,y,z) \
+ gegl_tile_source_command(source,GEGL_TILE_VOID_BR,x,y,z,NULL)
+
+#define gegl_tile_source_undo_start_group(source,x,y,z) \
+ gegl_tile_source_command(source,GEGL_TILE_UNDO_START_GROUP,x,y,z,NULL)
G_END_DECLS
Copied: trunk/gegl/buffer/gegl-tile-storage.c (from r2178, /trunk/gegl/buffer/gegl-storage.c)
==============================================================================
--- /trunk/gegl/buffer/gegl-storage.c (original)
+++ trunk/gegl/buffer/gegl-tile-storage.c Wed Apr 16 22:44:31 2008
@@ -20,18 +20,18 @@
#include <glib-object.h>
-#include "gegl-storage.h"
+#include "gegl-tile-storage.h"
#include "gegl-tile.h"
-#include "gegl-tile-disk.h"
-#include "gegl-tile-mem.h"
-#include "gegl-tile-gio.h"
-#include "gegl-handler-empty.h"
-#include "gegl-handler-zoom.h"
-#include "gegl-handler-cache.h"
-#include "gegl-handler-log.h"
+#include "gegl-tile-backend-swapfile.h"
+#include "gegl-tile-backend-ram.h"
+#include "gegl-tile-backend-gio-tiles.h"
+#include "gegl-tile-handler-empty.h"
+#include "gegl-tile-handler-zoom.h"
+#include "gegl-tile-handler-cache.h"
+#include "gegl-tile-handler-log.h"
-G_DEFINE_TYPE (GeglStorage, gegl_storage, GEGL_TYPE_HANDLERS)
+G_DEFINE_TYPE (GeglTileStorage, gegl_tile_storage, GEGL_TYPE_TILE_HANDLER_CHAIN)
#define TILE_WIDTH 128
#define TILE_HEIGHT 64
@@ -57,40 +57,40 @@
GValue *value,
GParamSpec *pspec)
{
- GeglStorage *storage = GEGL_STORAGE (gobject);
+ GeglTileStorage *tile_storage = GEGL_TILE_STORAGE (gobject);
switch (property_id)
{
case PROP_WIDTH:
- g_value_set_int (value, storage->width);
+ g_value_set_int (value, tile_storage->width);
break;
case PROP_HEIGHT:
- g_value_set_int (value, storage->height);
+ g_value_set_int (value, tile_storage->height);
break;
case PROP_TILE_WIDTH:
- g_value_set_int (value, storage->tile_width);
+ g_value_set_int (value, tile_storage->tile_width);
break;
case PROP_TILE_HEIGHT:
- g_value_set_int (value, storage->tile_height);
+ g_value_set_int (value, tile_storage->tile_height);
break;
case PROP_TILE_SIZE:
- g_value_set_int (value, storage->tile_size);
+ g_value_set_int (value, tile_storage->tile_size);
break;
case PROP_PX_SIZE:
- g_value_set_int (value, storage->px_size);
+ g_value_set_int (value, tile_storage->px_size);
break;
case PROP_PATH:
- g_value_set_string (value, storage->path);
+ g_value_set_string (value, tile_storage->path);
break;
case PROP_FORMAT:
- g_value_set_pointer (value, storage->format);
+ g_value_set_pointer (value, tile_storage->format);
break;
default:
@@ -105,42 +105,42 @@
const GValue *value,
GParamSpec *pspec)
{
- GeglStorage *storage = GEGL_STORAGE (gobject);
+ GeglTileStorage *tile_storage = GEGL_TILE_STORAGE (gobject);
switch (property_id)
{
case PROP_WIDTH:
- storage->width = g_value_get_int (value);
+ tile_storage->width = g_value_get_int (value);
return;
case PROP_HEIGHT:
- storage->height = g_value_get_int (value);
+ tile_storage->height = g_value_get_int (value);
return;
case PROP_TILE_WIDTH:
- storage->tile_width = g_value_get_int (value);
+ tile_storage->tile_width = g_value_get_int (value);
break;
case PROP_TILE_HEIGHT:
- storage->tile_height = g_value_get_int (value);
+ tile_storage->tile_height = g_value_get_int (value);
break;
case PROP_TILE_SIZE:
- storage->tile_size = g_value_get_int (value);
+ tile_storage->tile_size = g_value_get_int (value);
break;
case PROP_PX_SIZE:
- storage->px_size = g_value_get_int (value);
+ tile_storage->px_size = g_value_get_int (value);
break;
case PROP_PATH:
- if (storage->path)
- g_free (storage->path);
- storage->path = g_strdup (g_value_get_string (value));
+ if (tile_storage->path)
+ g_free (tile_storage->path);
+ tile_storage->path = g_strdup (g_value_get_string (value));
break;
case PROP_FORMAT:
- storage->format = g_value_get_pointer (value);
+ tile_storage->format = g_value_get_pointer (value);
break;
default:
@@ -150,115 +150,115 @@
}
static gboolean
-storage_idle (gpointer data)
+tile_storage_idle (gpointer data)
{
- GeglStorage *storage = GEGL_STORAGE (data);
+ GeglTileStorage *tile_storage = GEGL_TILE_STORAGE (data);
if (0 /* nothing to do*/)
{
- storage->idle_swapper = 0;
+ tile_storage->idle_swapper = 0;
return FALSE;
}
- gegl_source_idle (GEGL_SOURCE (storage));
+ gegl_tile_source_idle (GEGL_TILE_SOURCE (tile_storage));
return TRUE;
}
static GObject *
-gegl_storage_constructor (GType type,
- guint n_params,
- GObjectConstructParam *params)
+gegl_tile_storage_constructor (GType type,
+ guint n_params,
+ GObjectConstructParam *params)
{
GObject *object;
- GeglStorage *storage;
- GeglHandlers *handlers;
- GeglHandler *handler;
- GeglHandler *empty = NULL;
- GeglHandler *zoom = NULL;
- GeglHandler *cache = NULL;
+ GeglTileStorage *tile_storage;
+ GeglTileHandlerChain *tile_handler_chain;
+ GeglTileHandler *handler;
+ GeglTileHandler *empty = NULL;
+ GeglTileHandler *zoom = NULL;
+ GeglTileHandler *cache = NULL;
object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
- storage = GEGL_STORAGE (object);
- handlers = GEGL_HANDLERS (storage);
- handler = GEGL_HANDLER (storage);
+ tile_storage = GEGL_TILE_STORAGE (object);
+ tile_handler_chain = GEGL_TILE_HANDLER_CHAIN (tile_storage);
+ handler = GEGL_HANDLER (tile_storage);
- if (storage->path != NULL)
+ if (tile_storage->path != NULL)
{
#if 1
- g_object_set (storage,
- "source", g_object_new (GEGL_TYPE_TILE_DISK,
- "tile-width", storage->tile_width,
- "tile-height", storage->tile_height,
- "format", storage->format,
- "path", storage->path,
+ g_object_set (tile_storage,
+ "source", g_object_new (GEGL_TYPE_TILE_BACKEND_SWAPFILE,
+ "tile-width", tile_storage->tile_width,
+ "tile-height", tile_storage->tile_height,
+ "format", tile_storage->format,
+ "path", tile_storage->path,
NULL),
NULL);
#else
- g_object_set (storage,
- "source", g_object_new (GEGL_TYPE_TILE_GIO,
- "tile-width", storage->tile_width,
- "tile-height", storage->tile_height,
- "format", storage->format,
- "path", storage->path,
+ g_object_set (tile_storage,
+ "source", g_object_new (GEGL_TYPE_TILE_BACKEND_GIO_TILES,
+ "tile-width", tile_storage->tile_width,
+ "tile-height", tile_storage->tile_height,
+ "format", tile_storage->format,
+ "path", tile_storage->path,
NULL),
NULL);
#endif
}
else
{
- g_object_set (storage,
- "source", g_object_new (GEGL_TYPE_TILE_MEM,
- "tile-width", storage->tile_width,
- "tile-height", storage->tile_height,
- "format", storage->format,
+ g_object_set (tile_storage,
+ "source", g_object_new (GEGL_TYPE_TILE_BACKEND_RAM,
+ "tile-width", tile_storage->tile_width,
+ "tile-height", tile_storage->tile_height,
+ "format", tile_storage->format,
NULL),
NULL);
}
g_object_get (handler->source,
- "tile-size", &storage->tile_size,
- "px-size", &storage->px_size,
+ "tile-size", &tile_storage->tile_size,
+ "px-size", &tile_storage->px_size,
NULL);
g_object_unref (handler->source); /* eeek */
if (g_getenv("GEGL_LOG_TILE_BACKEND"))
- gegl_handlers_add (handlers, g_object_new (GEGL_TYPE_HANDLER_LOG, NULL));
+ gegl_tile_handler_chain_add (tile_handler_chain, g_object_new (GEGL_TYPE_TILE_HANDLER_LOG, NULL));
- cache = gegl_handlers_add (handlers, g_object_new (GEGL_TYPE_HANDLER_CACHE,
+ cache = gegl_tile_handler_chain_add (tile_handler_chain, g_object_new (GEGL_TYPE_TILE_HANDLER_CACHE,
NULL));
- zoom = gegl_handlers_add (handlers, g_object_new (GEGL_TYPE_HANDLER_ZOOM,
+ zoom = gegl_tile_handler_chain_add (tile_handler_chain, g_object_new (GEGL_TYPE_TILE_HANDLER_ZOOM,
"backend", handler->source,
- "storage", storage,
+ "tile_storage", tile_storage,
NULL));
- empty = gegl_handlers_add (handlers, g_object_new (GEGL_TYPE_HANDLER_EMPTY,
+ empty = gegl_tile_handler_chain_add (tile_handler_chain, g_object_new (GEGL_TYPE_TILE_HANDLER_EMPTY,
"backend", handler->source,
NULL));
if (g_getenv("GEGL_LOG_TILE_CACHE"))
- gegl_handlers_add (handlers, g_object_new (GEGL_TYPE_HANDLER_LOG, NULL));
+ gegl_tile_handler_chain_add (tile_handler_chain, g_object_new (GEGL_TYPE_TILE_HANDLER_LOG, NULL));
g_object_set_data (G_OBJECT (empty), "cache", cache);
g_object_set_data (G_OBJECT (zoom), "cache", cache);
- storage->idle_swapper = g_timeout_add_full (G_PRIORITY_LOW,
+ tile_storage->idle_swapper = g_timeout_add_full (G_PRIORITY_LOW,
250,
- storage_idle,
- storage,
+ tile_storage_idle,
+ tile_storage,
NULL);
return object;
}
static void
-gegl_storage_finalize (GObject *object)
+gegl_tile_storage_finalize (GObject *object)
{
- GeglStorage *self = GEGL_STORAGE (object);
+ GeglTileStorage *self = GEGL_TILE_STORAGE (object);
if (self->idle_swapper)
g_source_remove (self->idle_swapper);
@@ -267,13 +267,13 @@
}
static void
-gegl_storage_class_init (GeglStorageClass *class)
+gegl_tile_storage_class_init (GeglTileStorageClass *class)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
parent_class = g_type_class_peek_parent (class);
- gobject_class->constructor = gegl_storage_constructor;
- gobject_class->finalize = gegl_storage_finalize;
+ gobject_class->constructor = gegl_tile_storage_constructor;
+ gobject_class->finalize = gegl_tile_storage_finalize;
gobject_class->set_property = set_property;
gobject_class->get_property = get_property;
@@ -309,7 +309,7 @@
g_object_class_install_property (gobject_class, PROP_PATH,
g_param_spec_string ("path",
"path",
- "The filesystem directory with swap for this sparse tile store, NULL to make this be a heap storage.",
+ "The filesystem directory with swap for this sparse tile store, NULL to make this be a heap tile_storage.",
NULL,
G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
@@ -321,6 +321,6 @@
}
static void
-gegl_storage_init (GeglStorage *buffer)
+gegl_tile_storage_init (GeglTileStorage *buffer)
{
}
Copied: trunk/gegl/buffer/gegl-tile-storage.h (from r2176, /trunk/gegl/buffer/gegl-storage.h)
==============================================================================
--- /trunk/gegl/buffer/gegl-storage.h (original)
+++ trunk/gegl/buffer/gegl-tile-storage.h Wed Apr 16 22:44:31 2008
@@ -16,21 +16,21 @@
* Copyright 2006 Ãyvind KolÃs <pippin gimp org>
*/
-#ifndef __GEGL_STORAGE_H__
-#define __GEGL_STORAGE_H__
+#ifndef __GEGL_TILE_STORAGE_H__
+#define __GEGL_TILE_STORAGE_H__
-#include "gegl-handlers.h"
+#include "gegl-tile-handler-chain.h"
-#define GEGL_TYPE_STORAGE (gegl_storage_get_type ())
-#define GEGL_STORAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_STORAGE, GeglStorage))
-#define GEGL_STORAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_STORAGE, GeglStorageClass))
-#define GEGL_IS_STORAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_STORAGE))
-#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))
+#define GEGL_TYPE_TILE_STORAGE (gegl_tile_storage_get_type ())
+#define GEGL_TILE_STORAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE_STORAGE, GeglTileStorage))
+#define GEGL_TILE_STORAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_TILE_STORAGE, GeglTileStorageClass))
+#define GEGL_IS_TILE_STORAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE_STORAGE))
+#define GEGL_IS_TILE_STORAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_TILE_STORAGE))
+#define GEGL_TILE_STORAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_TILE_STORAGE, GeglTileStorageClass))
-struct _GeglStorage
+struct _GeglTileStorage
{
- GeglHandlers parent_instance;
+ GeglTileHandlerChain parent_instance;
Babl *format;
gint tile_width;
@@ -44,11 +44,11 @@
guint idle_swapper;
};
-struct _GeglStorageClass
+struct _GeglTileStorageClass
{
- GeglHandlersClass parent_class;
+ GeglTileHandlerChainClass parent_class;
};
-GType gegl_storage_get_type (void) G_GNUC_CONST;
+GType gegl_tile_storage_get_type (void) G_GNUC_CONST;
#endif
Modified: trunk/gegl/buffer/gegl-tile.c
==============================================================================
--- trunk/gegl/buffer/gegl-tile.c (original)
+++ trunk/gegl/buffer/gegl-tile.c Wed Apr 16 22:44:31 2008
@@ -31,7 +31,7 @@
#include "gegl-buffer.h"
#include "gegl-buffer-private.h"
#include "gegl-tile.h"
-#include "gegl-source.h"
+#include "gegl-tile-source.h"
G_DEFINE_TYPE (GeglTile, gegl_tile, G_TYPE_OBJECT)
@@ -173,7 +173,7 @@
static void
gegl_tile_init (GeglTile *tile)
{
- tile->storage = NULL;
+ tile->tile_storage = NULL;
tile->stored_rev = 0;
tile->rev = 0;
tile->lock = 0;
@@ -195,7 +195,7 @@
tile->rev = 1;
tile->stored_rev = 1;
- tile->storage = src->storage;
+ tile->tile_storage = src->tile_storage;
tile->data = src->data;
tile->size = src->size;
@@ -262,7 +262,7 @@
static void
gegl_tile_void_pyramid (GeglTile *tile)
{
- /* should, to tile->storage, request it's toplevel tile, and mark
+ /* should, to tile->tile_storage, request it's toplevel tile, and mark
* it as dirty, to force a recomputation of it's toplevel at the
* next subdivision request. NB: a full voiding might not be neccesary,
* forcing a rerender of just the dirtied part might be better, more
@@ -284,29 +284,29 @@
x /= 2;
y /= 2;
- gegl_source_void (GEGL_SOURCE (tile->storage), x, y, z);
+ gegl_tile_source_void (GEGL_TILE_SOURCE (tile->tile_storage), x, y, z);
#if 0
/* FIXME: reenable this code */
if (!ver)
{
if (!hor)
{
- gegl_source_void_tl (GEGL_SOURCE (tile->storage), x,y,z);
+ gegl_tile_source_void_tl (GEGL_TILE_SOURCE (tile->tile_storage), x,y,z);
}
else
{
- gegl_source_void_tr (GEGL_SOURCE (tile->storage), x,y,z);
+ gegl_tile_source_void_tr (GEGL_TILE_SOURCE (tile->tile_storage), x,y,z);
}
}
else
{
if (!hor)
{
- gegl_source_void_bl (GEGL_SOURCE (tile->storage), x,y,z);
+ gegl_tile_source_void_bl (GEGL_TILE_SOURCE (tile->tile_storage), x,y,z);
}
else
{
- gegl_source_void_br (GEGL_SOURCE (tile->storage), x,y,z);
+ gegl_tile_source_void_br (GEGL_TILE_SOURCE (tile->tile_storage), x,y,z);
}
}
#endif
@@ -344,8 +344,8 @@
gegl_tile_void (GeglTile *tile)
{
tile->stored_rev = tile->rev;
- tile->storage = NULL;
- /* FIXME: make sure the tile is evicted from any storage/buffer caches
+ tile->tile_storage = NULL;
+ /* FIXME: make sure the tile is evicted from any tile_storage/buffer caches
* as well
*/
}
@@ -396,9 +396,9 @@
gboolean gegl_tile_store (GeglTile *tile)
{
- if (tile->storage == NULL)
+ if (tile->tile_storage == NULL)
return FALSE;
- return gegl_source_set_tile (GEGL_SOURCE (tile->storage),
+ return gegl_tile_source_set_tile (GEGL_TILE_SOURCE (tile->tile_storage),
tile->storage_x,
tile->storage_y,
tile->storage_z, tile);
Modified: trunk/gegl/buffer/gegl-tile.h
==============================================================================
--- trunk/gegl/buffer/gegl-tile.h (original)
+++ trunk/gegl/buffer/gegl-tile.h Wed Apr 16 22:44:31 2008
@@ -40,7 +40,7 @@
guchar *data; /* A small linear buffer for pixel data */
gint size; /* The size of the data element in bytes */
- GeglStorage *storage; /* the buffer from which this tile was retrieved
+ GeglTileStorage *tile_storage; /* the buffer from which this tile was retrieved
* needed for the tile to be able to store itself
* back when it is unreffed for the last time
*/
@@ -49,7 +49,7 @@
guint rev; /* this tile revision */
- guint stored_rev; /* what revision was we when we from storage?
+ guint stored_rev; /* what revision was we when we from tile_storage?
(currently set to 1 when loaded from disk */
guint flags; /* used to store zoom dirt info */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
