gegl r2239 - in trunk: . gegl/buffer

[ok svn gnome org]

Author: ok
Date: Sat Apr 26 22:40:22 2008
New Revision: 2239
URL: http://svn.gnome.org/viewvc/gegl?rev=2239&view=rev

Log:
* gegl/buffer/gegl-tile.h: removed storage_x, storage_y and storage_z
bits since tiles themselves should only exist in one coordinate
system, the one of the storage buffer.
* gegl/buffer/gegl-buffer-access.c: (pset), (pget):
* gegl/buffer/gegl-buffer.c: (get_tile):
* gegl/buffer/gegl-tile-handler-zoom.c: (get_tile):
* gegl/buffer/gegl-tile.c: (gegl_tile_void_pyramid),
(gegl_tile_store):


Modified:
   trunk/ChangeLog
   trunk/gegl/buffer/gegl-buffer-access.c
   trunk/gegl/buffer/gegl-buffer.c
   trunk/gegl/buffer/gegl-tile-handler-zoom.c
   trunk/gegl/buffer/gegl-tile.c
   trunk/gegl/buffer/gegl-tile.h

Modified: trunk/gegl/buffer/gegl-buffer-access.c
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-access.c	(original)
+++ trunk/gegl/buffer/gegl-buffer-access.c	Sat Apr 26 22:40:22 2008
@@ -164,8 +164,8 @@
         GeglTile *tile     = NULL;
 
         if (buffer->hot_tile &&
-            buffer->hot_tile->storage_x == indice_x &&
-            buffer->hot_tile->storage_y == indice_y)
+            buffer->hot_tile->x == indice_x &&
+            buffer->hot_tile->y == indice_y)
           {
             tile = buffer->hot_tile;
           }
@@ -249,8 +249,8 @@
         GeglTile *tile     = NULL;
 
         if (buffer->hot_tile &&
-            buffer->hot_tile->storage_x == indice_x &&
-            buffer->hot_tile->storage_y == indice_y)
+            buffer->hot_tile->x == indice_x &&
+            buffer->hot_tile->y == indice_y)
           {
             tile = buffer->hot_tile;
           }

Modified: trunk/gegl/buffer/gegl-buffer.c
==============================================================================
--- trunk/gegl/buffer/gegl-buffer.c	(original)
+++ trunk/gegl/buffer/gegl-buffer.c	Sat Apr 26 22:40:22 2008
@@ -577,9 +577,9 @@
        */
       {
         tile->tile_storage   = buffer->tile_storage;
-        tile->storage_x = x;
-        tile->storage_y = y;
-        tile->storage_z = z;
+        tile->x = x;
+        tile->y = y;
+        tile->z = z;
       }
     }
 

Modified: trunk/gegl/buffer/gegl-tile-handler-zoom.c
==============================================================================
--- trunk/gegl/buffer/gegl-tile-handler-zoom.c	(original)
+++ trunk/gegl/buffer/gegl-tile-handler-zoom.c	Sat Apr 26 22:40:22 2008
@@ -296,13 +296,10 @@
         /* it is a bit hacky, but adding enough information (probably too much)
          * enabling the tile_storage system to attempt swapping out of zoom tiles
          */
-        tile->storage_x  = x;
-        tile->storage_y  = y;
-        tile->storage_z  = z;
         tile->x          = x;
         tile->y          = y;
         tile->z          = z;
-        tile->tile_storage    = zoom->tile_storage;
+        tile->tile_storage = zoom->tile_storage;
         tile->stored_rev = 1;
         tile->rev        = 1;
 

Modified: trunk/gegl/buffer/gegl-tile.c
==============================================================================
--- trunk/gegl/buffer/gegl-tile.c	(original)
+++ trunk/gegl/buffer/gegl-tile.c	Sat Apr 26 22:40:22 2008
@@ -271,9 +271,9 @@
    */
   gint x, y, z;
 
-  x = tile->storage_x;
-  y = tile->storage_y;
-  z = 0;/*tile->storage_z;*/
+  x = tile->x;
+  y = tile->y;
+  z = 0;/*tile->z;*/
 
   for (z = 1; z < 10; z++)
     {
@@ -401,9 +401,9 @@
   if (tile->tile_storage == NULL)
     return FALSE;
   return gegl_tile_source_set_tile (GEGL_TILE_SOURCE (tile->tile_storage),
-                                    tile->storage_x,
-                                    tile->storage_y,
-                                    tile->storage_z, tile);
+                                    tile->x,
+                                    tile->y,
+                                    tile->z, tile);
 }
 
 /* compute the tile indice of a coordinate

Modified: trunk/gegl/buffer/gegl-tile.h
==============================================================================
--- trunk/gegl/buffer/gegl-tile.h	(original)
+++ trunk/gegl/buffer/gegl-tile.h	Sat Apr 26 22:40:22 2008
@@ -40,11 +40,10 @@
   guchar        *data;        /* A small linear buffer for pixel data */
   gint           size;        /* The size of the data element in bytes */
 
-  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
-                               */
-  gint           storage_x, storage_y, storage_z;
+  GeglTileStorage *tile_storage; /* the buffer from which this tile was retrieved
+                                  * needed for the tile to be able to store itself
+                                  * back (for instance when it is unreffed for the last time)
+                                  */
   gint           x, y, z;