gdk: Remove gdk_cairo_surface_create_from_pixbuf()

It's unused and people should use textures and snapshots anyway.

diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index e237f65b104a3ccb72f9c6f8ba2b5a0307fd72e2..af17b4c9e7d9acc322345257fbca98a71f730e43 100644 (file)
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -415,7 +415,6 @@ gdk_cairo_set_source_pixbuf
 gdk_cairo_rectangle
 gdk_cairo_region
 gdk_cairo_region_create_from_surface
-gdk_cairo_surface_create_from_pixbuf
 gdk_cairo_draw_from_gl
 gdk_cairo_surface_upload_to_gl
 </SECTION>

diff --git a/gdk/gdkcairo.c b/gdk/gdkcairo.c
index 548e87bf80c15bae91a7bee649307e98a8c0bac5..cd39028404d7eff9e43dc0300d8974daaa23d288 100644 (file)
--- a/gdk/gdkcairo.c
+++ b/gdk/gdkcairo.c
@@ -237,46 +237,6 @@ gdk_cairo_surface_paint_pixbuf (cairo_surface_t *surface,
   cairo_surface_mark_dirty (surface);
 }
 
-/**
- * gdk_cairo_surface_create_from_pixbuf:
- * @pixbuf: a #GdkPixbuf
- * @scale: the scale of the new surface, or 0 to use same as @surface
- * @for_surface: (allow-none): The surface this will be drawn to, or %NULL
- *
- * Creates an image surface with the same contents as
- * the pixbuf.
- *
- * Returns: a new cairo surface, must be freed with cairo_surface_destroy()
- */
-cairo_surface_t *
-gdk_cairo_surface_create_from_pixbuf (const GdkPixbuf *pixbuf,
-                                      int              scale,
-                                      GdkSurface       *for_surface)
-{
-  cairo_format_t format;
-  cairo_surface_t *surface;
-
-  g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-  g_return_val_if_fail (scale >= 0, NULL);
-  g_return_val_if_fail (for_surface == NULL || GDK_IS_SURFACE (for_surface), NULL);
-
-  if (gdk_pixbuf_get_n_channels (pixbuf) == 3)
-    format = CAIRO_FORMAT_RGB24;
-  else
-    format = CAIRO_FORMAT_ARGB32;
-
-  surface =
-     gdk_surface_create_similar_image_surface (for_surface,
-                                             format,
-                                              gdk_pixbuf_get_width (pixbuf),
-                                              gdk_pixbuf_get_height (pixbuf),
-                                             scale);
-
-  gdk_cairo_surface_paint_pixbuf (surface, pixbuf);
-
-  return surface;
-}
-
 /**
  * gdk_cairo_set_source_pixbuf:
  * @cr: a cairo context

diff --git a/gdk/gdkcairo.h b/gdk/gdkcairo.h
index 0c9926fe632320778a17a777ad4ed16732d2f009..ecd1bb73d6cdfcecabba4ed603c3aef5a38a532a 100644 (file)
--- a/gdk/gdkcairo.h
+++ b/gdk/gdkcairo.h
@@ -56,10 +56,6 @@ cairo_region_t *
                                         (cairo_surface_t      *surface);
 
 GDK_AVAILABLE_IN_ALL
-cairo_surface_t * gdk_cairo_surface_create_from_pixbuf      (const GdkPixbuf *pixbuf,
-                                                             int scale,
-                                                             GdkSurface *for_surface);
-GDK_AVAILABLE_IN_ALL
 void       gdk_cairo_draw_from_gl (cairo_t              *cr,
                                    GdkSurface            *surface,
                                    int                   source,