gegl r2198 - in trunk: . gegl gegl/buffer

[ok svn gnome org]

Author: ok
Date: Sat Apr 19 00:20:47 2008
New Revision: 2198
URL: http://svn.gnome.org/viewvc/gegl?rev=2198&view=rev

Log:
* gegl/buffer/gegl-tile-backend-tiledir.c:
* gegl/buffer/gegl-tile-backend-tiledir.h:
* gegl/gegl-init.c: (gegl_exit): forgot in rename session.


Modified:
   trunk/ChangeLog
   trunk/gegl/buffer/gegl-tile-backend-tiledir.c
   trunk/gegl/buffer/gegl-tile-backend-tiledir.h
   trunk/gegl/gegl-init.c

Modified: trunk/gegl/buffer/gegl-tile-backend-tiledir.c
==============================================================================
--- trunk/gegl/buffer/gegl-tile-backend-tiledir.c	(original)
+++ trunk/gegl/buffer/gegl-tile-backend-tiledir.c	Sat Apr 19 00:20:47 2008
@@ -18,6 +18,7 @@
 
 #include "config.h"
 #include <gio/gio.h>
+#include <glib/gprintf.h>
 
 #include <string.h>
 #include <errno.h>
@@ -112,7 +113,7 @@
 }
 
 
-G_DEFINE_TYPE (GeglTileBackendTileDir, gegl_tile_backend_tile_dir, GEGL_TYPE_TILE_BACKEND)
+G_DEFINE_TYPE (GeglTileBackendTileDir, gegl_tile_backend_tiledir, GEGL_TYPE_TILE_BACKEND)
 static GObjectClass * parent_class = NULL;
 
 static gint allocs         = 0;
@@ -121,7 +122,7 @@
 static gint peak_gio_size = 0;
 
 void
-gegl_tile_backend_tile_dir_stats (void)
+gegl_tile_backend_tiledir_stats (void)
 {
   g_warning ("leaked: %i chunks (%f mb)  peak: %i (%i bytes %fmb))",
              allocs, gio_size / 1024 / 1024.0,
@@ -139,7 +140,7 @@
           gint            y,
           gint            z)
 {
-  GeglTileBackendTileDir     *tile_backend_tile_dir = GEGL_TILE_BACKEND_TILE_DIR (tile_store);
+  GeglTileBackendTileDir     *tile_backend_tiledir = GEGL_TILE_BACKEND_TILE_DIR (tile_store);
   GeglTileBackend *backend  = GEGL_TILE_BACKEND (tile_store);
   GeglTile        *tile     = NULL;
 
@@ -151,7 +152,7 @@
     tile->stored_rev = 1;
     tile->rev        = 1;
 
-    gio_entry_read (tile_backend_tile_dir, &entry, tile->data);
+    gio_entry_read (tile_backend_tiledir, &entry, tile->data);
     return tile;
   }
  return NULL;
@@ -165,14 +166,14 @@
           gint            z)
 {
   GeglTileBackend         *backend   = GEGL_TILE_BACKEND (store);
-  GeglTileBackendTileDir *tile_backend_tile_dir = GEGL_TILE_BACKEND_TILE_DIR (backend);
+  GeglTileBackendTileDir *tile_backend_tiledir = GEGL_TILE_BACKEND_TILE_DIR (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 tile_storage.
                                 */
-  gio_entry_write (tile_backend_tile_dir, &entry, tile->data);
+  gio_entry_write (tile_backend_tiledir, &entry, tile->data);
   tile->stored_rev = tile->rev;
   return NULL;
 }
@@ -338,7 +339,7 @@
 }
 
 static GObject *
-gegl_tile_backend_tile_dir_constructor (GType                  type,
+gegl_tile_backend_tiledir_constructor (GType                  type,
                                          guint                  n_params,
                                          GObjectConstructParam *params)
 {
@@ -354,7 +355,7 @@
 }
 
 static void
-gegl_tile_backend_tile_dir_class_init (GeglTileBackendTileDirClass *klass)
+gegl_tile_backend_tiledir_class_init (GeglTileBackendTileDirClass *klass)
 {
   GObjectClass    *gobject_class     = G_OBJECT_CLASS (klass);
   GeglTileSourceClass *gegl_tile_source_class = GEGL_TILE_SOURCE_CLASS (klass);
@@ -363,7 +364,7 @@
 
   gobject_class->get_property = get_property;
   gobject_class->set_property = set_property;
-  gobject_class->constructor  = gegl_tile_backend_tile_dir_constructor;
+  gobject_class->constructor  = gegl_tile_backend_tiledir_constructor;
   gobject_class->finalize     = finalize;
 
   gegl_tile_source_class->command  = command;
@@ -379,7 +380,7 @@
 }
 
 static void
-gegl_tile_backend_tile_dir_init (GeglTileBackendTileDir *self)
+gegl_tile_backend_tiledir_init (GeglTileBackendTileDir *self)
 {
   self->path        = NULL;
 }

Modified: trunk/gegl/buffer/gegl-tile-backend-tiledir.h
==============================================================================
--- trunk/gegl/buffer/gegl-tile-backend-tiledir.h	(original)
+++ trunk/gegl/buffer/gegl-tile-backend-tiledir.h	Sat Apr 19 00:20:47 2008
@@ -24,7 +24,7 @@
 
 G_BEGIN_DECLS
 
-#define GEGL_TYPE_TILE_BACKEND_TILE_DIR            (gegl_tile_backend_tile_dir_get_type ())
+#define GEGL_TYPE_TILE_BACKEND_TILE_DIR            (gegl_tile_backend_tiledir_get_type ())
 #define GEGL_TILE_BACKEND_TILE_DIR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE_BACKEND_TILE_DIR, GeglTileBackendTileDir))
 #define GEGL_TILE_BACKEND_TILE_DIR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GEGL_TYPE_TILE_BACKEND_TILE_DIR, GeglTileBackendTileDirClass))
 #define GEGL_IS_TILE_BACKEND_TILE_DIR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE_BACKEND_TILE_DIR))
@@ -40,9 +40,9 @@
   GeglTileBackendClass parent_class;
 };
 
-GType gegl_tile_backend_tile_dir_get_type (void) G_GNUC_CONST;
+GType gegl_tile_backend_tiledir_get_type (void) G_GNUC_CONST;
 
-void  gegl_tile_backend_tile_dir_stats    (void);
+void  gegl_tile_backend_tiledir_stats    (void);
 
 G_END_DECLS
 

Modified: trunk/gegl/gegl-init.c
==============================================================================
--- trunk/gegl/gegl-init.c	(original)
+++ trunk/gegl/gegl-init.c	Sat Apr 19 00:20:47 2008
@@ -134,8 +134,8 @@
 }
 
 void gegl_tile_backend_ram_stats (void);
-void gegl_tile_backend_gio_tiles_stats (void);
-void gegl_tile_backend_swapfile_stats (void);
+void gegl_tile_backend_tiledir_stats (void);
+void gegl_tile_backend_file_stats (void);
 
 void
 gegl_exit (void)
@@ -162,8 +162,8 @@
     {
       gegl_buffer_stats ();
       gegl_tile_backend_ram_stats ();
-      gegl_tile_backend_swapfile_stats ();
-      gegl_tile_backend_gio_tiles_stats ();
+      gegl_tile_backend_file_stats ();
+      gegl_tile_backend_tiledir_stats ();
     }
   global_time = gegl_ticks () - global_time;
   gegl_instrument ("gegl", "gegl", global_time);