From 1c308431a64aaffbe8bd0d3a26223673fdae05a1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 15 May 2023 22:41:10 -0400 Subject: Drop unneeded exports from gdkpixbufutils.c --- gtk/gdkpixbufutils.c | 35 +++-------------------------------- gtk/gdkpixbufutilsprivate.h | 18 ------------------ 2 files changed, 3 insertions(+), 50 deletions(-) diff --git a/gtk/gdkpixbufutils.c b/gtk/gdkpixbufutils.c index 8d049311ac..c60335e228 100644 --- a/gtk/gdkpixbufutils.c +++ b/gtk/gdkpixbufutils.c @@ -91,7 +91,7 @@ size_prepared_cb (GdkPixbufLoader *loader, * load the image at its original size times the * given scale. */ -GdkPixbuf * +static GdkPixbuf * _gdk_pixbuf_new_from_stream_scaled (GInputStream *stream, double scale, GCancellable *cancellable, @@ -180,35 +180,6 @@ _gdk_pixbuf_new_from_stream (GInputStream *stream, return _gdk_pixbuf_new_from_stream_scaled (stream, 0, cancellable, error); } -/* Like gdk_pixbuf_new_from_resource_at_scale, but - * load the image at its original size times the - * given scale. - */ -GdkPixbuf * -_gdk_pixbuf_new_from_resource_scaled (const char *resource_path, - double scale, - GError **error) -{ - GInputStream *stream; - GdkPixbuf *pixbuf; - - stream = g_resources_open_stream (resource_path, 0, error); - if (stream == NULL) - return NULL; - - pixbuf = _gdk_pixbuf_new_from_stream_scaled (stream, scale, NULL, error); - g_object_unref (stream); - - return pixbuf; -} - -GdkPixbuf * -_gdk_pixbuf_new_from_resource (const char *resource_path, - GError **error) -{ - return _gdk_pixbuf_new_from_resource_scaled (resource_path, 0, error); -} - GdkPixbuf * _gdk_pixbuf_new_from_resource_at_scale (const char *resource_path, int width, @@ -464,7 +435,7 @@ gtk_make_symbolic_pixbuf_from_path (const char *path, return pixbuf; } -GdkPixbuf * +static GdkPixbuf * gtk_make_symbolic_pixbuf_from_file (GFile *file, int width, int height, @@ -576,7 +547,7 @@ on_loader_size_prepared (GdkPixbufLoader *loader, height * loader_data->scale_factor); } -GdkPaintable * +static GdkPaintable * gdk_paintable_new_from_bytes_scaled (GBytes *bytes, int scale_factor) { diff --git a/gtk/gdkpixbufutilsprivate.h b/gtk/gdkpixbufutilsprivate.h index f9c9fe852c..10801722e4 100644 --- a/gtk/gdkpixbufutilsprivate.h +++ b/gtk/gdkpixbufutilsprivate.h @@ -30,21 +30,11 @@ GdkPixbuf *_gdk_pixbuf_new_from_stream_at_scale (GInputStream *stream, gboolean aspect, GCancellable *cancellable, GError **error); -GdkPixbuf *_gdk_pixbuf_new_from_stream_scaled (GInputStream *stream, - double scale, - GCancellable *cancellable, - GError **error); -GdkPixbuf *_gdk_pixbuf_new_from_resource (const char *resource_path, - GError **error); GdkPixbuf *_gdk_pixbuf_new_from_resource_at_scale (const char *resource_path, int width, int height, gboolean preserve_aspect, GError **error); -GdkPixbuf *_gdk_pixbuf_new_from_resource_scaled (const char *resource_path, - double scale, - GError **error); - GdkPixbuf *gtk_make_symbolic_pixbuf_from_data (const char *data, gsize len, int width, @@ -52,11 +42,6 @@ GdkPixbuf *gtk_make_symbolic_pixbuf_from_data (const char *data, double scale, const char *debug_output_to, GError **error); -GdkPixbuf *gtk_make_symbolic_pixbuf_from_file (GFile *file, - int width, - int height, - double scale, - GError **error); GdkPixbuf *gtk_make_symbolic_pixbuf_from_path (const char *path, int width, int height, @@ -79,9 +64,6 @@ GdkTexture *gtk_make_symbolic_texture_from_resource (const char *path, int height, double scale, GError **error); - -GdkPaintable *gdk_paintable_new_from_bytes_scaled (GBytes *bytes, - int scale_factor); GdkPaintable *gdk_paintable_new_from_path_scaled (const char *path, int scale_factor); GdkPaintable *gdk_paintable_new_from_resource_scaled (const char *path, -- cgit v1.2.1