summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2018-04-28 16:20:19 -0400
committerMatthias Clasen <mclasen@redhat.com>2018-04-28 16:22:29 -0400
commit059a181f7d80d8d073cc61052089acf6d1df42fe (patch)
tree7c8e2a9ea4164a2627aeace663c5ffc15cebffe0
parenta0f591297a40167422ce40725432276ddbaf98fd (diff)
downloadgtk+-059a181f7d80d8d073cc61052089acf6d1df42fe.tar.gz
Document GdkMemoryTexture
-rw-r--r--docs/reference/gdk/gdk4-sections.txt2
-rw-r--r--gdk/gdkmemorytexture.c14
-rw-r--r--gdk/gdkmemorytexture.h2
3 files changed, 16 insertions, 2 deletions
diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index ab95d6d6b5..3ca6c13862 100644
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -725,7 +725,7 @@ gdk_texture_get_height
gdk_texture_download
gdk_texture_save_to_png
GdkMemoryFormat
-GDK_MEMORY_FORMAT_DEFAULT
+GDK_MEMORY_DEFAULT
gdk_memory_texture_new
gdk_gl_texture_new
gdk_gl_texture_release
diff --git a/gdk/gdkmemorytexture.c b/gdk/gdkmemorytexture.c
index 7a84e3962f..08215820b5 100644
--- a/gdk/gdkmemorytexture.c
+++ b/gdk/gdkmemorytexture.c
@@ -105,6 +105,20 @@ gdk_memory_texture_init (GdkMemoryTexture *self)
{
}
+/**
+ * gdk_memory_texture_new:
+ * @width: the width of the texture
+ * @height: the height of the texture
+ * @format: the format of the data
+ * @bytes: the #GBytes containing the pixel data
+ * @stride: rowstride for the data
+ *
+ * Creates a new texture for a blob of image data.
+ * The #GBytes must contain @stride x @height pixels
+ * in the given format.
+ *
+ * Returns: A newly-created #GdkTexture
+ */
GdkTexture *
gdk_memory_texture_new (int width,
int height,
diff --git a/gdk/gdkmemorytexture.h b/gdk/gdkmemorytexture.h
index c02fc784d4..067f164baa 100644
--- a/gdk/gdkmemorytexture.h
+++ b/gdk/gdkmemorytexture.h
@@ -28,7 +28,7 @@
G_BEGIN_DECLS
-/*
+/**
* GdkMemoryFormat:
* @GDK_MEMORY_B8G8R8A8_PREMULTIPLIED: 4 bytes; for blue, green, red, alpha.
* The color values are premultiplied with the alpha value.