diff options
author | Benjamin Otte <otte@redhat.com> | 2010-07-13 23:28:20 +0200 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2010-08-10 21:02:26 +0200 |
commit | 6f5084551a771120eefae91b8a514e237ff4d278 (patch) | |
tree | eb8efb3252433a038767cb792103647d0303f97c /gdk/directfb | |
parent | 2a72ffd4de67fe60dd4ebd7aa86599f496492f9e (diff) | |
download | gtk+-6f5084551a771120eefae91b8a514e237ff4d278.tar.gz |
API: remove gdk_drawable_copy_to_image()
Diffstat (limited to 'gdk/directfb')
-rw-r--r-- | gdk/directfb/gdkdrawable-directfb.c | 1 | ||||
-rw-r--r-- | gdk/directfb/gdkimage-directfb.c | 70 | ||||
-rw-r--r-- | gdk/directfb/gdkprivate-directfb.h | 9 |
3 files changed, 0 insertions, 80 deletions
diff --git a/gdk/directfb/gdkdrawable-directfb.c b/gdk/directfb/gdkdrawable-directfb.c index 312645b433..167d51a305 100644 --- a/gdk/directfb/gdkdrawable-directfb.c +++ b/gdk/directfb/gdkdrawable-directfb.c @@ -1003,7 +1003,6 @@ gdk_drawable_impl_directfb_class_init (GdkDrawableImplDirectFBClass *klass) drawable_class->get_size = gdk_directfb_get_size; - drawable_class->_copy_to_image = _gdk_directfb_copy_to_image; drawable_class->get_screen = gdk_directfb_get_screen; diff --git a/gdk/directfb/gdkimage-directfb.c b/gdk/directfb/gdkimage-directfb.c index fe7b6aa833..e9533c59f2 100644 --- a/gdk/directfb/gdkimage-directfb.c +++ b/gdk/directfb/gdkimage-directfb.c @@ -217,76 +217,6 @@ _gdk_image_new_for_depth (GdkScreen *screen, return image; } - -GdkImage* -_gdk_directfb_copy_to_image (GdkDrawable *drawable, - GdkImage *image, - gint src_x, - gint src_y, - gint dest_x, - gint dest_y, - gint width, - gint height) -{ - GdkDrawableImplDirectFB *impl; - GdkImageDirectFB *private; - int pitch; - DFBRectangle rect = { src_x, src_y, width, height }; - IDirectFBDisplayLayer *layer = _gdk_display->layer; - - g_return_val_if_fail (GDK_IS_DRAWABLE_IMPL_DIRECTFB (drawable), NULL); - g_return_val_if_fail (image != NULL || (dest_x == 0 && dest_y == 0), NULL); - - impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable); - - if (impl->wrapper == _gdk_parent_root) - { - DFBResult ret; - - ret = layer->SetCooperativeLevel (layer, DLSCL_ADMINISTRATIVE); - if (ret) - { - DirectFBError ("_gdk_directfb_copy_to_image - SetCooperativeLevel", - ret); - return NULL; - } - - ret = layer->GetSurface (layer, &impl->surface); - if (ret) - { - layer->SetCooperativeLevel (layer, DLSCL_SHARED); - DirectFBError ("_gdk_directfb_copy_to_image - GetSurface", ret); - return NULL; - } - } - - if (! impl->surface) - return NULL; - - if (!image) - image = gdk_image_new (GDK_IMAGE_NORMAL, - gdk_drawable_get_visual (drawable), width, height); - - private = image->windowing_data; - - private->surface->Unlock( private->surface ); - - private->surface->Blit( private->surface, - impl->surface, &rect, dest_x, dest_y ); - - private->surface->Lock( private->surface, DSLF_READ | DSLF_WRITE, &image->mem, &pitch ); - image->bpl = pitch; - - if (impl->wrapper == _gdk_parent_root) - { - impl->surface->Release (impl->surface); - impl->surface = NULL; - layer->SetCooperativeLevel (layer, DLSCL_SHARED); - } - - return image; -} - guint32 gdk_image_get_pixel (GdkImage *image, gint x, diff --git a/gdk/directfb/gdkprivate-directfb.h b/gdk/directfb/gdkprivate-directfb.h index db04f9275f..a8147d1319 100644 --- a/gdk/directfb/gdkprivate-directfb.h +++ b/gdk/directfb/gdkprivate-directfb.h @@ -229,15 +229,6 @@ GdkGC * _gdk_directfb_gc_new (GdkDrawable *drawable, GdkGCValues *values, GdkGCValuesMask values_mask); -GdkImage* _gdk_directfb_copy_to_image (GdkDrawable *drawable, - GdkImage *image, - gint src_x, - gint src_y, - gint dest_x, - gint dest_y, - gint width, - gint height); - void gdk_directfb_event_windows_add (GdkWindow *window); void gdk_directfb_event_windows_remove (GdkWindow *window); |