summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>2001-06-26 08:34:26 +0000
committerTim Janik <timj@src.gnome.org>2001-06-26 08:34:26 +0000
commit0b7418572ee7a8d900a315e67fcb12a56e21459b (patch)
tree0bdc0446657458a9df2a26a12f1a037a0396a476 /docs
parentbf0d61a59b9e1b889ba98b36b05a90e76f64eced (diff)
downloadgtk+-0b7418572ee7a8d900a315e67fcb12a56e21459b.tar.gz
hm, second attempt. it's fight CVS time again.
Tue Jun 26 09:48:02 2001 Tim Janik <timj@gtk.org> * Makefile.am (noinst_PROGRAMS): get rid of make-inline-pixbuf * gdk-pixbuf-data.[hc]: provide gdk_pixbuf_new_from_stream() instead from gdk_pixbuf_new_from_inline(). * gdk-pixdata.[hc]: auxillary GdkPixdata structure, public installed API for applications that need to serialize/deserialize on their own (gimp, BEAST). * gdk-pixbuf/gdk-pixbuf-csource.c: provide publically installed program that can dump images in CSource format and Pixbuf stream format. supports RLE encoding, MACRO formatting etc... invoke with --help. Tue Jun 26 10:04:30 2001 Tim Janik <timj@gtk.org> * gtk/gtkiconfactory.c: * gtk/gtkitemfactory.c: use gdk_pixbuf_new_from_stream(). fixed up item factory so inlined pixbufs actually work.
Diffstat (limited to 'docs')
-rw-r--r--docs/reference/gdk-pixbuf/tmpl/creating.sgml12
-rw-r--r--docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml11
-rw-r--r--docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml3
-rw-r--r--docs/reference/gtk/tmpl/gtkitemfactory.sgml1
4 files changed, 14 insertions, 13 deletions
diff --git a/docs/reference/gdk-pixbuf/tmpl/creating.sgml b/docs/reference/gdk-pixbuf/tmpl/creating.sgml
index 0bbce5405a..1d017da68a 100644
--- a/docs/reference/gdk-pixbuf/tmpl/creating.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/creating.sgml
@@ -82,18 +82,6 @@ Creating a pixbuf from image data that is already in memory.
@Returns:
-<!-- ##### FUNCTION gdk_pixbuf_new_from_inline ##### -->
-<para>
-
-</para>
-
-@inline_pixbuf:
-@copy_pixels:
-@length:
-@error:
-@Returns:
-
-
<!-- ##### FUNCTION gdk_pixbuf_new_subpixbuf ##### -->
<para>
diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
index 910ccef35f..099d29a515 100644
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
@@ -552,3 +552,14 @@ End:
</para>
+<!-- ##### FUNCTION gdk_pixbuf_new_from_inline ##### -->
+<para>
+
+</para>
+
+@inline_pixbuf:
+@copy_pixels:
+@length:
+@error:
+@Returns:
+
diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml
index 403941efa9..ecc32bc201 100644
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml
@@ -20,6 +20,9 @@ Information that describes an image.
</para>
+@GDK_PIXBUF_ERROR_HEADER_CORRUPT:
+@GDK_PIXBUF_ERROR_PIXEL_CORRUPT:
+@GDK_PIXBUF_ERROR_UNKNOWN_FORMAT:
@GDK_PIXBUF_ERROR_CORRUPT_IMAGE:
@GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY:
@GDK_PIXBUF_ERROR_BAD_OPTION_VALUE:
diff --git a/docs/reference/gtk/tmpl/gtkitemfactory.sgml b/docs/reference/gtk/tmpl/gtkitemfactory.sgml
index 18c4cc601d..abda892595 100644
--- a/docs/reference/gtk/tmpl/gtkitemfactory.sgml
+++ b/docs/reference/gtk/tmpl/gtkitemfactory.sgml
@@ -77,7 +77,6 @@ GtkItemFactory
@callback_action:
@item_type:
@extra_data:
-@extra_data2:
<!-- ##### STRUCT GtkItemFactoryItem ##### -->
<para>