summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2023-02-14 07:45:52 +0100
committerBenjamin Otte <otte@redhat.com>2023-02-15 00:39:18 +0100
commitcca5de3c7f0de75fdd4476caa3def9581b8ea7fc (patch)
tree187c508a222dbd1ed8639d0188686cd01cf656b3 /gdk
parent774696011d4ae81fa422772ea59d7053474fd8fb (diff)
downloadgtk+-cca5de3c7f0de75fdd4476caa3def9581b8ea7fc.tar.gz
memorytexture: Export less private API
It's not needed anymore with GdkTextureDownloader now.
Diffstat (limited to 'gdk')
-rw-r--r--gdk/gdkmemorytexture.c16
-rw-r--r--gdk/gdkmemorytextureprivate.h5
-rw-r--r--gdk/gdktexturedownloader.c3
3 files changed, 6 insertions, 18 deletions
diff --git a/gdk/gdkmemorytexture.c b/gdk/gdkmemorytexture.c
index 6f9967dcfb..641386b786 100644
--- a/gdk/gdkmemorytexture.c
+++ b/gdk/gdkmemorytexture.c
@@ -233,21 +233,11 @@ gdk_memory_texture_from_texture (GdkTexture *texture,
return GDK_MEMORY_TEXTURE (result);
}
-const guchar *
-gdk_memory_texture_get_data (GdkMemoryTexture *self)
-{
- return g_bytes_get_data (self->bytes, NULL);
-}
-
GBytes *
-gdk_memory_texture_get_bytes (GdkMemoryTexture *self)
+gdk_memory_texture_get_bytes (GdkMemoryTexture *self,
+ gsize *out_stride)
{
+ *out_stride = self->stride;
return self->bytes;
}
-gsize
-gdk_memory_texture_get_stride (GdkMemoryTexture *self)
-{
- return self->stride;
-}
-
diff --git a/gdk/gdkmemorytextureprivate.h b/gdk/gdkmemorytextureprivate.h
index 7e4092b77c..f182f7fbd9 100644
--- a/gdk/gdkmemorytextureprivate.h
+++ b/gdk/gdkmemorytextureprivate.h
@@ -37,9 +37,8 @@ GdkTexture * gdk_memory_texture_new_subtexture (GdkMemoryTexture *
int width,
int height);
-const guchar * gdk_memory_texture_get_data (GdkMemoryTexture *self);
-GBytes * gdk_memory_texture_get_bytes (GdkMemoryTexture *self);
-gsize gdk_memory_texture_get_stride (GdkMemoryTexture *self);
+GBytes * gdk_memory_texture_get_bytes (GdkMemoryTexture *self,
+ gsize *out_stride);
G_END_DECLS
diff --git a/gdk/gdktexturedownloader.c b/gdk/gdktexturedownloader.c
index f45a6aceb7..4a948dc40a 100644
--- a/gdk/gdktexturedownloader.c
+++ b/gdk/gdktexturedownloader.c
@@ -254,8 +254,7 @@ gdk_texture_downloader_download_bytes (const GdkTextureDownloader *self,
{
GdkMemoryTexture *memtex = GDK_MEMORY_TEXTURE (self->texture);
- *out_stride = gdk_memory_texture_get_stride (memtex);
- return g_bytes_ref (gdk_memory_texture_get_bytes (memtex));
+ return g_bytes_ref (gdk_memory_texture_get_bytes (memtex, out_stride));
}
stride = self->texture->width * gdk_memory_format_bytes_per_pixel (self->format);