gegl r2043 - in trunk: . gegl/buffer

[martinn svn gnome org]

Author: martinn
Date: Mon Feb 18 17:27:04 2008
New Revision: 2043
URL: http://svn.gnome.org/viewvc/gegl?rev=2043&view=rev

Log:
2008-02-18  Martin Nordholts  <martinn svn gnome org>

	* gegl/buffer/gegl-buffer.c
	* gegl/buffer/gegl-buffer-allocator.c:
	Cast appropriately when passing around Babl formats. Fixes some
	harmless compiler warnings.


Modified:
   trunk/ChangeLog
   trunk/gegl/buffer/gegl-buffer-allocator.c
   trunk/gegl/buffer/gegl-buffer.c

Modified: trunk/gegl/buffer/gegl-buffer-allocator.c
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-allocator.c	(original)
+++ trunk/gegl/buffer/gegl-buffer-allocator.c	Mon Feb 18 17:27:04 2008
@@ -180,7 +180,7 @@
           GeglStorage *storage;
           gchar *path;
           path = g_strdup_printf ("%s/GEGL-%i-%s.swap", gegl_swap_dir (),
-                                  getpid (), babl_name (babl_format));
+                                  getpid (), babl_name ((Babl*) babl_format));
           storage = g_object_new (GEGL_TYPE_STORAGE,
                                                "format", babl_format,
                                                "path", path,

Modified: trunk/gegl/buffer/gegl-buffer.c
==============================================================================
--- trunk/gegl/buffer/gegl-buffer.c	(original)
+++ trunk/gegl/buffer/gegl-buffer.c	Mon Feb 18 17:27:04 2008
@@ -806,7 +806,8 @@
 
   if (format != buffer->format)
     {
-      fish = babl_fish (buffer->format, format);
+      fish = babl_fish ((gpointer) buffer->format,
+                        (gpointer) format);
     }
 
   {
@@ -889,7 +890,8 @@
 
   if (format != buffer->format)
     {
-      fish = babl_fish (buffer->format, format);
+      fish = babl_fish ((gpointer) buffer->format,
+                        (gpointer) format);
     }
 
   {
@@ -1018,11 +1020,13 @@
     {
       if (write)
         {
-          fish = babl_fish (format, buffer->format);
+          fish = babl_fish ((gpointer) format,
+                            (gpointer) buffer->format);
         }
       else
         {
-          fish = babl_fish (buffer->format, format);
+          fish = babl_fish ((gpointer) buffer->format,
+                            (gpointer) format);
         }
     }