mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace gdk_pixbuf_unref with g_object_unref

Browse Source 
Because gdk_pixbuf_unref is deprecated and for compatability with
gdk-pixbuf 2.21.4.
This commit is contained in:
Darxus@chaosreigns.com
2011-01-25 15:00:56 -05:00
committed by Kristian Høgsberg
parent d5fb9cc769
commit c4df99cb2c
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/window.c
+4 -4
View File
@@ -291,7 +291,7 @@ display_create_drm_surface_from_file(struct display *display,
if (!gdk_pixbuf_get_has_alpha(pixbuf) || if (!gdk_pixbuf_get_has_alpha(pixbuf) ||
gdk_pixbuf_get_n_channels(pixbuf) != 4) { gdk_pixbuf_get_n_channels(pixbuf) != 4) {
gdk_pixbuf_unref(pixbuf); g_object_unref(pixbuf);
return NULL; return NULL;
} }
@@ -322,7 +322,7 @@ display_create_drm_surface_from_file(struct display *display,
GL_RGBA, GL_UNSIGNED_BYTE, pixels); GL_RGBA, GL_UNSIGNED_BYTE, pixels);
cairo_device_release(display->device); cairo_device_release(display->device);
gdk_pixbuf_unref(pixbuf); g_object_unref(pixbuf);
return surface; return surface;
} }
@@ -435,7 +435,7 @@ display_create_shm_surface_from_file(struct display *display,
if (!gdk_pixbuf_get_has_alpha(pixbuf) || if (!gdk_pixbuf_get_has_alpha(pixbuf) ||
gdk_pixbuf_get_n_channels(pixbuf) != 4) { gdk_pixbuf_get_n_channels(pixbuf) != 4) {
gdk_pixbuf_unref(pixbuf); g_object_unref(pixbuf);
return NULL; return NULL;
} }
@@ -463,7 +463,7 @@ display_create_shm_surface_from_file(struct display *display,
} }
} }
gdk_pixbuf_unref(pixbuf); g_object_unref(pixbuf);
return surface; return surface;
} }
compositor/compositor.c
+2 -2
View File
@@ -211,7 +211,7 @@ create_buffer_from_png(struct wlsc_compositor *ec,
argb_pixels = malloc (height * width * 4); argb_pixels = malloc (height * width * 4);
if (argb_pixels == NULL) { if (argb_pixels == NULL) {
gdk_pixbuf_unref(pixbuf); g_object_unref(pixbuf);
return NULL; return NULL;
} }
@@ -250,7 +250,7 @@ create_buffer_from_png(struct wlsc_compositor *ec,
} }
} }
gdk_pixbuf_unref(pixbuf); g_object_unref(pixbuf);
buffer = ec->create_buffer(ec, width, height, buffer = ec->create_buffer(ec, width, height,
&ec->compositor.premultiplied_argb_visual, &ec->compositor.premultiplied_argb_visual,
compositor/screenshooter.c
+2 -2
View File
@@ -61,8 +61,8 @@ screenshooter_shoot(struct wl_client *client, struct wl_screenshooter *shooter)
NULL, NULL); NULL, NULL);
normal = gdk_pixbuf_flip(pixbuf, FALSE); normal = gdk_pixbuf_flip(pixbuf, FALSE);
gdk_pixbuf_save(normal, buffer, "png", &error, NULL); gdk_pixbuf_save(normal, buffer, "png", &error, NULL);
gdk_pixbuf_unref(normal); g_object_unref(normal);
gdk_pixbuf_unref(pixbuf); g_object_unref(pixbuf);
free(data); free(data);
} }
} }