[gtk+/gtk-2-22] directfb: drop cairo < 1.6 dependency
- From: Sven Neumann <neo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-22] directfb: drop cairo < 1.6 dependency
- Date: Tue, 31 Aug 2010 19:09:56 +0000 (UTC)
commit 59d6e84459f111c1de91ec2dd3bba828dd5d4d55
Author: Lionel Landwerlin <llandwerlin gmail com>
Date: Wed May 5 22:56:30 2010 +0200
directfb: drop cairo < 1.6 dependency
This removes the cairo's versions checks < 1.6 since GTK+ now requires
cairo >= 1.6.
Signed-off-by: Lionel Landwerlin <llandwerlin gmail com>
gdk/directfb/gdkdrawable-directfb.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/gdk/directfb/gdkdrawable-directfb.c b/gdk/directfb/gdkdrawable-directfb.c
index 84a7a1b..3fd86e8 100644
--- a/gdk/directfb/gdkdrawable-directfb.c
+++ b/gdk/directfb/gdkdrawable-directfb.c
@@ -1673,11 +1673,7 @@ gdk_directfb_ref_cairo_surface (GdkDrawable *drawable)
if (!impl->cairo_surface) {
IDirectFBSurface *surface;
g_assert (impl->surface != NULL);
-#if defined(CAIRO_VERSION) && CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1,5,5)
impl->surface->GetSubSurface (impl->surface, NULL, &surface);
-#else
- surface = impl->surface;
-#endif
if (surface) {
impl->cairo_surface = cairo_directfb_surface_create (dfb, surface);
if (impl->cairo_surface) {
@@ -1685,9 +1681,7 @@ gdk_directfb_ref_cairo_surface (GdkDrawable *drawable)
&gdk_directfb_cairo_key, drawable,
gdk_directfb_cairo_surface_destroy);
}
-#if defined(CAIRO_VERSION) && CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1,5,5)
surface->Release (surface);
-#endif
}
} else {
cairo_surface_reference (impl->cairo_surface);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]