From 92e5d321d66c77508227ad0ac71b20aa34a8b0bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 9 Oct 2009 15:22:00 +0200 Subject: [PATCH] Remove deprecated code from GdkPixbuf --- .../reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml | 4 +- docs/reference/gdk/gdk-sections.txt | 2 - docs/reference/gdk/tmpl/pixbufs.sgml | 40 -------- gdk/gdk.symbols | 4 - gdk/gdkpixbuf-render.c | 91 ------------------- gdk/gdkpixbuf.h | 27 ------ 6 files changed, 1 insertion(+), 167 deletions(-) diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml index 5b53c8eaf6..3ed25eea0d 100644 --- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml @@ -127,9 +127,7 @@ information on error domains and error codes. - These values can be passed to - gdk_pixbuf_render_to_drawable_alpha() to control how the alpha - channel of an image should be handled. This function can create a + This function can create a bilevel clipping mask (black and white) and use it while painting the image. In the future, when the X Window System gets an alpha channel extension, it will be possible to do full alpha diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt index 5d05c993c8..184b1a59af 100644 --- a/docs/reference/gdk/gdk-sections.txt +++ b/docs/reference/gdk/gdk-sections.txt @@ -354,8 +354,6 @@ GDK_TYPE_RGB_DITHER Pixbufs pixbufs gdk_pixbuf_render_threshold_alpha -gdk_pixbuf_render_to_drawable -gdk_pixbuf_render_to_drawable_alpha gdk_pixbuf_render_pixmap_and_mask gdk_pixbuf_render_pixmap_and_mask_for_colormap gdk_pixbuf_get_from_drawable diff --git a/docs/reference/gdk/tmpl/pixbufs.sgml b/docs/reference/gdk/tmpl/pixbufs.sgml index cf69413f90..53de271a52 100644 --- a/docs/reference/gdk/tmpl/pixbufs.sgml +++ b/docs/reference/gdk/tmpl/pixbufs.sgml @@ -35,46 +35,6 @@ pixbufs, see the #GdkPixbuf API documentation. @alpha_threshold: - - - - - -@pixbuf: -@drawable: -@gc: -@src_x: -@src_y: -@dest_x: -@dest_y: -@width: -@height: -@dither: -@x_dither: -@y_dither: - - - - - - - -@pixbuf: -@drawable: -@src_x: -@src_y: -@dest_x: -@dest_y: -@width: -@height: -@alpha_mode: -@alpha_threshold: -@dither: -@x_dither: -@y_dither: - - - diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols index bb6e2b2475..e58a3fafff 100644 --- a/gdk/gdk.symbols +++ b/gdk/gdk.symbols @@ -942,10 +942,6 @@ gdk_pixbuf_get_from_image gdk_pixbuf_render_pixmap_and_mask gdk_pixbuf_render_pixmap_and_mask_for_colormap gdk_pixbuf_render_threshold_alpha -#ifndef GDK_DISABLE_DEPRECATED -gdk_pixbuf_render_to_drawable -gdk_pixbuf_render_to_drawable_alpha -#endif #endif #endif diff --git a/gdk/gdkpixbuf-render.c b/gdk/gdkpixbuf-render.c index a702e2e7ca..a0ba77d8b2 100644 --- a/gdk/gdkpixbuf-render.c +++ b/gdk/gdkpixbuf-render.c @@ -133,97 +133,6 @@ gdk_pixbuf_render_threshold_alpha (GdkPixbuf *pixbuf, } } - - -/** - * gdk_pixbuf_render_to_drawable: - * @pixbuf: A pixbuf. - * @drawable: Destination drawable. - * @gc: GC used for rendering. - * @src_x: Source X coordinate within pixbuf. - * @src_y: Source Y coordinate within pixbuf. - * @dest_x: Destination X coordinate within drawable. - * @dest_y: Destination Y coordinate within drawable. - * @width: Width of region to render, in pixels, or -1 to use pixbuf width - * @height: Height of region to render, in pixels, or -1 to use pixbuf height - * @dither: Dithering mode for GdkRGB. - * @x_dither: X offset for dither. - * @y_dither: Y offset for dither. - * - * Renders a rectangular portion of a pixbuf to a drawable while using the - * specified GC. This is done using GdkRGB, so the specified drawable must have - * the GdkRGB visual and colormap. Note that this function will ignore the - * opacity information for images with an alpha channel; the GC must already - * have the clipping mask set if you want transparent regions to show through. - * - * For an explanation of dither offsets, see the GdkRGB documentation. In - * brief, the dither offset is important when re-rendering partial regions of an - * image to a rendered version of the full image, or for when the offsets to a - * base position change, as in scrolling. The dither matrix has to be shifted - * for consistent visual results. If you do not have any of these cases, the - * dither offsets can be both zero. - * - * Deprecated: 2.4: This function is obsolete. Use gdk_draw_pixbuf() instead. - **/ -void -gdk_pixbuf_render_to_drawable (GdkPixbuf *pixbuf, - GdkDrawable *drawable, - GdkGC *gc, - int src_x, int src_y, - int dest_x, int dest_y, - int width, int height, - GdkRgbDither dither, - int x_dither, int y_dither) -{ - gdk_draw_pixbuf (drawable, gc, pixbuf, - src_x, src_y, dest_x, dest_y, width, height, - dither, x_dither, y_dither); -} - - - -/** - * gdk_pixbuf_render_to_drawable_alpha: - * @pixbuf: A pixbuf. - * @drawable: Destination drawable. - * @src_x: Source X coordinate within pixbuf. - * @src_y: Source Y coordinates within pixbuf. - * @dest_x: Destination X coordinate within drawable. - * @dest_y: Destination Y coordinate within drawable. - * @width: Width of region to render, in pixels, or -1 to use pixbuf width. - * @height: Height of region to render, in pixels, or -1 to use pixbuf height. - * @alpha_mode: Ignored. Present for backwards compatibility. - * @alpha_threshold: Ignored. Present for backwards compatibility - * @dither: Dithering mode for GdkRGB. - * @x_dither: X offset for dither. - * @y_dither: Y offset for dither. - * - * Renders a rectangular portion of a pixbuf to a drawable. The destination - * drawable must have a colormap. All windows have a colormap, however, pixmaps - * only have colormap by default if they were created with a non-%NULL window argument. - * Otherwise a colormap must be set on them with gdk_drawable_set_colormap. - * - * On older X servers, rendering pixbufs with an alpha channel involves round trips - * to the X server, and may be somewhat slow. - * - * Deprecated: 2.4: This function is obsolete. Use gdk_draw_pixbuf() instead. - **/ -void -gdk_pixbuf_render_to_drawable_alpha (GdkPixbuf *pixbuf, - GdkDrawable *drawable, - int src_x, int src_y, - int dest_x, int dest_y, - int width, int height, - GdkPixbufAlphaMode alpha_mode, - int alpha_threshold, - GdkRgbDither dither, - int x_dither, int y_dither) -{ - gdk_draw_pixbuf (drawable, NULL, pixbuf, - src_x, src_y, dest_x, dest_y, width, height, - dither, x_dither, y_dither); -} - /** * gdk_pixbuf_render_pixmap_and_mask: * @pixbuf: A pixbuf. diff --git a/gdk/gdkpixbuf.h b/gdk/gdkpixbuf.h index e6cd09a36e..8beb2eba42 100644 --- a/gdk/gdkpixbuf.h +++ b/gdk/gdkpixbuf.h @@ -49,33 +49,6 @@ void gdk_pixbuf_render_threshold_alpha (GdkPixbuf *pixbuf, int width, int height, int alpha_threshold); -#ifndef GDK_DISABLE_DEPRECATED -void gdk_pixbuf_render_to_drawable (GdkPixbuf *pixbuf, - GdkDrawable *drawable, - GdkGC *gc, - int src_x, - int src_y, - int dest_x, - int dest_y, - int width, - int height, - GdkRgbDither dither, - int x_dither, - int y_dither); -void gdk_pixbuf_render_to_drawable_alpha (GdkPixbuf *pixbuf, - GdkDrawable *drawable, - int src_x, - int src_y, - int dest_x, - int dest_y, - int width, - int height, - GdkPixbufAlphaMode alpha_mode, - int alpha_threshold, - GdkRgbDither dither, - int x_dither, - int y_dither); -#endif /* GDK_DISABLE_DEPRECATED */ void gdk_pixbuf_render_pixmap_and_mask_for_colormap (GdkPixbuf *pixbuf, GdkColormap *colormap, GdkPixmap **pixmap_return,