Merge branch 'master' into chaz

[chaz/openbox] / obrender / imagecache.c

diff --git a/obrender/imagecache.c b/obrender/imagecache.c
index 036ac121091a5b8fcf8a03031fd560f274193df3..909d87465539108a699751dd279ed65527b3dad5 100644 (file)
--- a/obrender/imagecache.c
+++ b/obrender/imagecache.c
@@ -29,7 +29,7 @@ RrImageCache* RrImageCacheNew(gint max_resized_saved)
 
     g_assert(max_resized_saved >= 0);
 
-    self = g_new(RrImageCache, 1);
+    self = g_slice_new(RrImageCache);
     self->ref = 1;
     self->max_resized_saved = max_resized_saved;
     self->pic_table = g_hash_table_new((GHashFunc)RrImagePicHash,
@@ -54,25 +54,10 @@ void RrImageCacheUnref(RrImageCache *self)
         g_hash_table_destroy(self->name_table);
         self->name_table = NULL;
 
-        g_free(self);
+        g_slice_free(RrImageCache, self);
     }
 }
 
-RrImage* RrImageCacheFindName(RrImageCache *self, const gchar *name)
-{
-    return g_hash_table_lookup(self->name_table, name);
-}
-
-/*! Finds an image in the cache, if it is already in there */
-RrImage* RrImageCacheFind(RrImageCache *self,
-                          RrPixel32 *data, gint w, gint h)
-{
-    RrImagePic pic;
-
-    RrImagePicInit(&pic, NULL, w, h, data);
-    return g_hash_table_lookup(self->pic_table, &pic);
-}
-
 #define hashsize(n) ((RrPixel32)1<<(n))
 #define hashmask(n) (hashsize(n)-1)
 #define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))