Commit 7a4c6893 authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington

Some updates

2000-10-18  Havoc Pennington  <hp@redhat.com>

	* gtk/gtk-sections.txt: Some updates

	* gdk/gdk-sections.txt: remove GdkPixbufAlphaMode

	* gdk-pixbuf/gdk-pixbuf-sections.txt: Add new API, remove
	GdkPixbufClass/GdkAnimationClass since those are private

	* gdk-pixbuf/Makefile.am (IGNORE_HFILES): ignore more headers

2000-10-18  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktextiter.c (gtk_text_iter_forward_to_newline): Fix a bug
	where any number of empty lines would get skipped

	* gtk/gtktextiter.h: Remove padding from GtkTextIter; live on the
	edge.

	* gtk/gtktextiter.c (gtk_text_iter_make_surreal): enhance the
	warning about invalid iterators (explain more thoroughly)
	(gtk_text_iter_in_region): rename gtk_text_iter_in_range

	* gtk/gtktextview.c (FOCUS_EDGE_WIDTH): Make focus rectangle less
	big

	* demos/*.c: Add error handling

	* gtk/gtktextbuffer.c: don't modify const iterators

	* gtk/gdk-pixbuf-loader.c: Add full error handling here

	* gtk/gtkimage.c (gtk_image_set_from_file): ignore errors
	on file load

	* gtk/gtkiconfactory.c: Update to reflect addition of error
	handling to gdk-pixbuf loaders

2000-10-16  Havoc Pennington  <hp@redhat.com>

	* gdk-pixbuf-io.c (gdk_pixbuf_get_module)
	(gdk_pixbuf_get_named_module) (gdk_pixbuf_load_module):
	add error reporting here also

	* make-inline-pixbuf.c (main): use GError

	* io-xpm.c: include unistd.h

	* gdk-pixbuf-util.c: include string.h

	* io-*.c: add error reporting

	* gdk-pixbuf-animation.c (gdk_pixbuf_animation_new_from_file): add
	error reporting

	* gdk-pixbuf-io.c (gdk_pixbuf_new_from_file): Add error reporting

	* gdk-pixbuf-io.h: Add GError** to load_increment and load
	methods

	* gdk-pixbuf-io.c (gdk_pixbuf_save) (gdk_pixbuf_savev): return
	a G_FILE_ERROR if we fail to write or close the file.

	* gdk-pixbuf.h: remove GDK_PIXBUF_ERROR_IO, instead we'll use
	G_FILE_ERROR_*. Rename enum to GdkPixbufError, properly following
	the GError naming rules. Add GError** to load functions.
parent 74209088
Wed Oct 18 11:14:05 2000 Owen Taylor <otaylor@redhat.com> 2000-10-18 Havoc Pennington <hp@redhat.com>
* gtk/gtktextiter.c (gtk_text_iter_forward_to_newline): Fix a bug
where any number of empty lines would get skipped
* gtk/gtktextiter.h: Remove padding from GtkTextIter; live on the
edge.
* gtk/gtktextiter.c (gtk_text_iter_make_surreal): enhance the
warning about invalid iterators (explain more thoroughly)
(gtk_text_iter_in_region): rename gtk_text_iter_in_range
* gtk/gtktextview.c (FOCUS_EDGE_WIDTH): Make focus rectangle less
big
* demos/*.c: Add error handling
* gtk/gtktextbuffer.c: don't modify const iterators
* gtk/gdk-pixbuf-loader.c: Add full error handling here
* gtk/gtkimage.c (gtk_image_set_from_file): ignore errors
on file load
* gtk/gtkiconfactory.c: Update to reflect addition of error
handling to gdk-pixbuf loaders
Wed Oct 18 11:14:05 2000 Owen Taylor <otaylor@redhat.com>
* configure.in demos/Makefile.am demos/testgtk/*: Start of work to * configure.in demos/Makefile.am demos/testgtk/*: Start of work to
move to new modularized testgtk. move to new modularized testgtk.
......
Wed Oct 18 11:14:05 2000 Owen Taylor <otaylor@redhat.com> 2000-10-18 Havoc Pennington <hp@redhat.com>
* gtk/gtktextiter.c (gtk_text_iter_forward_to_newline): Fix a bug
where any number of empty lines would get skipped
* gtk/gtktextiter.h: Remove padding from GtkTextIter; live on the
edge.
* gtk/gtktextiter.c (gtk_text_iter_make_surreal): enhance the
warning about invalid iterators (explain more thoroughly)
(gtk_text_iter_in_region): rename gtk_text_iter_in_range
* gtk/gtktextview.c (FOCUS_EDGE_WIDTH): Make focus rectangle less
big
* demos/*.c: Add error handling
* gtk/gtktextbuffer.c: don't modify const iterators
* gtk/gdk-pixbuf-loader.c: Add full error handling here
* gtk/gtkimage.c (gtk_image_set_from_file): ignore errors
on file load
* gtk/gtkiconfactory.c: Update to reflect addition of error
handling to gdk-pixbuf loaders
Wed Oct 18 11:14:05 2000 Owen Taylor <otaylor@redhat.com>
* configure.in demos/Makefile.am demos/testgtk/*: Start of work to * configure.in demos/Makefile.am demos/testgtk/*: Start of work to
move to new modularized testgtk. move to new modularized testgtk.
......
Wed Oct 18 11:14:05 2000 Owen Taylor <otaylor@redhat.com> 2000-10-18 Havoc Pennington <hp@redhat.com>
* gtk/gtktextiter.c (gtk_text_iter_forward_to_newline): Fix a bug
where any number of empty lines would get skipped
* gtk/gtktextiter.h: Remove padding from GtkTextIter; live on the
edge.
* gtk/gtktextiter.c (gtk_text_iter_make_surreal): enhance the
warning about invalid iterators (explain more thoroughly)
(gtk_text_iter_in_region): rename gtk_text_iter_in_range
* gtk/gtktextview.c (FOCUS_EDGE_WIDTH): Make focus rectangle less
big
* demos/*.c: Add error handling
* gtk/gtktextbuffer.c: don't modify const iterators
* gtk/gdk-pixbuf-loader.c: Add full error handling here
* gtk/gtkimage.c (gtk_image_set_from_file): ignore errors
on file load
* gtk/gtkiconfactory.c: Update to reflect addition of error
handling to gdk-pixbuf loaders
Wed Oct 18 11:14:05 2000 Owen Taylor <otaylor@redhat.com>
* configure.in demos/Makefile.am demos/testgtk/*: Start of work to * configure.in demos/Makefile.am demos/testgtk/*: Start of work to
move to new modularized testgtk. move to new modularized testgtk.
......
Wed Oct 18 11:14:05 2000 Owen Taylor <otaylor@redhat.com> 2000-10-18 Havoc Pennington <hp@redhat.com>
* gtk/gtktextiter.c (gtk_text_iter_forward_to_newline): Fix a bug
where any number of empty lines would get skipped
* gtk/gtktextiter.h: Remove padding from GtkTextIter; live on the
edge.
* gtk/gtktextiter.c (gtk_text_iter_make_surreal): enhance the
warning about invalid iterators (explain more thoroughly)
(gtk_text_iter_in_region): rename gtk_text_iter_in_range
* gtk/gtktextview.c (FOCUS_EDGE_WIDTH): Make focus rectangle less
big
* demos/*.c: Add error handling
* gtk/gtktextbuffer.c: don't modify const iterators
* gtk/gdk-pixbuf-loader.c: Add full error handling here
* gtk/gtkimage.c (gtk_image_set_from_file): ignore errors
on file load
* gtk/gtkiconfactory.c: Update to reflect addition of error
handling to gdk-pixbuf loaders
Wed Oct 18 11:14:05 2000 Owen Taylor <otaylor@redhat.com>
* configure.in demos/Makefile.am demos/testgtk/*: Start of work to * configure.in demos/Makefile.am demos/testgtk/*: Start of work to
move to new modularized testgtk. move to new modularized testgtk.
......
Wed Oct 18 11:14:05 2000 Owen Taylor <otaylor@redhat.com> 2000-10-18 Havoc Pennington <hp@redhat.com>
* gtk/gtktextiter.c (gtk_text_iter_forward_to_newline): Fix a bug
where any number of empty lines would get skipped
* gtk/gtktextiter.h: Remove padding from GtkTextIter; live on the
edge.
* gtk/gtktextiter.c (gtk_text_iter_make_surreal): enhance the
warning about invalid iterators (explain more thoroughly)
(gtk_text_iter_in_region): rename gtk_text_iter_in_range
* gtk/gtktextview.c (FOCUS_EDGE_WIDTH): Make focus rectangle less
big
* demos/*.c: Add error handling
* gtk/gtktextbuffer.c: don't modify const iterators
* gtk/gdk-pixbuf-loader.c: Add full error handling here
* gtk/gtkimage.c (gtk_image_set_from_file): ignore errors
on file load
* gtk/gtkiconfactory.c: Update to reflect addition of error
handling to gdk-pixbuf loaders
Wed Oct 18 11:14:05 2000 Owen Taylor <otaylor@redhat.com>
* configure.in demos/Makefile.am demos/testgtk/*: Start of work to * configure.in demos/Makefile.am demos/testgtk/*: Start of work to
move to new modularized testgtk. move to new modularized testgtk.
......
Wed Oct 18 11:14:05 2000 Owen Taylor <otaylor@redhat.com> 2000-10-18 Havoc Pennington <hp@redhat.com>
* gtk/gtktextiter.c (gtk_text_iter_forward_to_newline): Fix a bug
where any number of empty lines would get skipped
* gtk/gtktextiter.h: Remove padding from GtkTextIter; live on the
edge.
* gtk/gtktextiter.c (gtk_text_iter_make_surreal): enhance the
warning about invalid iterators (explain more thoroughly)
(gtk_text_iter_in_region): rename gtk_text_iter_in_range
* gtk/gtktextview.c (FOCUS_EDGE_WIDTH): Make focus rectangle less
big
* demos/*.c: Add error handling
* gtk/gtktextbuffer.c: don't modify const iterators
* gtk/gdk-pixbuf-loader.c: Add full error handling here
* gtk/gtkimage.c (gtk_image_set_from_file): ignore errors
on file load
* gtk/gtkiconfactory.c: Update to reflect addition of error
handling to gdk-pixbuf loaders
Wed Oct 18 11:14:05 2000 Owen Taylor <otaylor@redhat.com>
* configure.in demos/Makefile.am demos/testgtk/*: Start of work to * configure.in demos/Makefile.am demos/testgtk/*: Start of work to
move to new modularized testgtk. move to new modularized testgtk.
......
Wed Oct 18 11:14:05 2000 Owen Taylor <otaylor@redhat.com> 2000-10-18 Havoc Pennington <hp@redhat.com>
* gtk/gtktextiter.c (gtk_text_iter_forward_to_newline): Fix a bug
where any number of empty lines would get skipped
* gtk/gtktextiter.h: Remove padding from GtkTextIter; live on the
edge.
* gtk/gtktextiter.c (gtk_text_iter_make_surreal): enhance the
warning about invalid iterators (explain more thoroughly)
(gtk_text_iter_in_region): rename gtk_text_iter_in_range
* gtk/gtktextview.c (FOCUS_EDGE_WIDTH): Make focus rectangle less
big
* demos/*.c: Add error handling
* gtk/gtktextbuffer.c: don't modify const iterators
* gtk/gdk-pixbuf-loader.c: Add full error handling here
* gtk/gtkimage.c (gtk_image_set_from_file): ignore errors
on file load
* gtk/gtkiconfactory.c: Update to reflect addition of error
handling to gdk-pixbuf loaders
Wed Oct 18 11:14:05 2000 Owen Taylor <otaylor@redhat.com>
* configure.in demos/Makefile.am demos/testgtk/*: Start of work to * configure.in demos/Makefile.am demos/testgtk/*: Start of work to
move to new modularized testgtk. move to new modularized testgtk.
......
...@@ -65,7 +65,11 @@ load_pixbufs (void) ...@@ -65,7 +65,11 @@ load_pixbufs (void)
{ {
int i; int i;
background = gdk_pixbuf_new_from_file (BACKGROUND_NAME); /* We pass NULL for the error return location, we don't care
* about the error message.
*/
background = gdk_pixbuf_new_from_file (BACKGROUND_NAME, NULL);
if (!background) if (!background)
return FALSE; return FALSE;
...@@ -73,7 +77,7 @@ load_pixbufs (void) ...@@ -73,7 +77,7 @@ load_pixbufs (void)
back_height = gdk_pixbuf_get_height (background); back_height = gdk_pixbuf_get_height (background);
for (i = 0; i < N_IMAGES; i++) { for (i = 0; i < N_IMAGES; i++) {
images[i] = gdk_pixbuf_new_from_file (image_names[i]); images[i] = gdk_pixbuf_new_from_file (image_names[i], NULL);
if (!images[i]) if (!images[i])
return FALSE; return FALSE;
} }
......
...@@ -408,8 +408,18 @@ main (int argc, char **argv) ...@@ -408,8 +408,18 @@ main (int argc, char **argv)
return 0; return 0;
} else { } else {
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
animation = gdk_pixbuf_animation_new_from_file (argv[i]); GError *error;
error = NULL;
animation = gdk_pixbuf_animation_new_from_file (argv[i],
&error);
if (animation == NULL) {
g_warning ("Failed to load animation: %s",
error->message);
g_error_free (error);
}
if (animation) { if (animation) {
gint i = 0; gint i = 0;
GList *listptr; GList *listptr;
......
...@@ -62,7 +62,8 @@ main(int argc, char **argv) ...@@ -62,7 +62,8 @@ main(int argc, char **argv)
GtkWidget *hbox, *label, *hscale; GtkWidget *hbox, *label, *hscale;
GtkAdjustment *adjustment; GtkAdjustment *adjustment;
GtkRequisition scratch_requisition; GtkRequisition scratch_requisition;
GError *error;
pixbuf_init (); pixbuf_init ();
gtk_init (&argc, &argv); gtk_init (&argc, &argv);
...@@ -73,9 +74,12 @@ main(int argc, char **argv) ...@@ -73,9 +74,12 @@ main(int argc, char **argv)
exit (1); exit (1);
} }
pixbuf = gdk_pixbuf_new_from_file (argv[1]); error = NULL;
pixbuf = gdk_pixbuf_new_from_file (argv[1], &error);
if (!pixbuf) { if (!pixbuf) {
fprintf (stderr, "Cannot load %s\n", argv[1]); fprintf (stderr, "Cannot load image: %s\n",
error->message);
g_error_free (error);
exit(1); exit(1);
} }
......
...@@ -428,22 +428,27 @@ static gint ...@@ -428,22 +428,27 @@ static gint
update_timeout(gpointer data) update_timeout(gpointer data)
{ {
ProgressFileStatus *status = data; ProgressFileStatus *status = data;
gboolean done, error; gboolean done;
GError *error;
done = FALSE; done = FALSE;
error = FALSE; error = FALSE;
if (!feof(status->imagefile)) { if (!feof(status->imagefile)) {
gint nbytes; gint nbytes;
nbytes = fread(status->buf, 1, status->readlen, nbytes = fread(status->buf, 1, status->readlen,
status->imagefile); status->imagefile);
error = !gdk_pixbuf_loader_write (GDK_PIXBUF_LOADER (status->loader), status->buf, nbytes); error = NULL;
if (error) { if (!gdk_pixbuf_loader_write (GDK_PIXBUF_LOADER (status->loader), status->buf, nbytes, &error)) {
G_BREAKPOINT(); g_warning ("Error writing to loader: %s",
error->message);
g_error_free (error);
done = TRUE;
} }
} else { /* Really done */ } else { /* Really done */
GdkPixbuf *pixbuf = gdk_pixbuf_loader_get_pixbuf (status->loader); GdkPixbuf *pixbuf = gdk_pixbuf_loader_get_pixbuf (status->loader);
...@@ -452,11 +457,6 @@ update_timeout(gpointer data) ...@@ -452,11 +457,6 @@ update_timeout(gpointer data)
} }
if (error) {
g_warning ("Serious error writing to loader");
done = TRUE;
}
if (done) { if (done) {
gtk_widget_queue_draw(*status->rgbwin); gtk_widget_queue_draw(*status->rgbwin);
gdk_pixbuf_loader_close (GDK_PIXBUF_LOADER (status->loader)); gdk_pixbuf_loader_close (GDK_PIXBUF_LOADER (status->loader));
...@@ -556,17 +556,26 @@ main (int argc, char **argv) ...@@ -556,17 +556,26 @@ main (int argc, char **argv)
} }
/* Test loading from inline data. */ /* Test loading from inline data. */
pixbuf = gdk_pixbuf_new_from_inline (apple_red, FALSE, -1); pixbuf = gdk_pixbuf_new_from_inline (apple_red, FALSE, -1, NULL);
new_testrgb_window (pixbuf, "Red apple from inline data"); new_testrgb_window (pixbuf, "Red apple from inline data");
pixbuf = gdk_pixbuf_new_from_inline (gnome_foot, TRUE, sizeof (gnome_foot)); pixbuf = gdk_pixbuf_new_from_inline (gnome_foot, TRUE, sizeof (gnome_foot), NULL);
new_testrgb_window (pixbuf, "Foot from inline data"); new_testrgb_window (pixbuf, "Foot from inline data");
found_valid = TRUE; found_valid = TRUE;
} else { } else {
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
GError *error;
error = NULL;
pixbuf = gdk_pixbuf_new_from_file (argv[i], &error);
pixbuf = gdk_pixbuf_new_from_file (argv[i]); if (pixbuf == NULL) {
g_warning ("Error loading image: %s",
error->message);
g_error_free (error);
}
#if 0 #if 0
pixbuf = gdk_pixbuf_rotate(pixbuf, 10.0); pixbuf = gdk_pixbuf_rotate(pixbuf, 10.0);
#endif #endif
......
2000-10-18 Havoc Pennington <hp@redhat.com>
* gtk/gtk-sections.txt: Some updates
* gdk/gdk-sections.txt: remove GdkPixbufAlphaMode
* gdk-pixbuf/gdk-pixbuf-sections.txt: Add new API, remove
GdkPixbufClass/GdkAnimationClass since those are private
* gdk-pixbuf/Makefile.am (IGNORE_HFILES): ignore more headers
2000-10-06 Havoc Pennington <hp@redhat.com> 2000-10-06 Havoc Pennington <hp@redhat.com>
* gdk-pixbuf/*.sgml, gdk-pixbuf/tmpl/*.sgml: copy in from 1.0 * gdk-pixbuf/*.sgml, gdk-pixbuf/tmpl/*.sgml: copy in from 1.0
......
...@@ -14,7 +14,7 @@ SECOND_DOC_SOURCE_DIR=$(top_srcdir)/contrib/gdk-pixbuf-xlib ...@@ -14,7 +14,7 @@ SECOND_DOC_SOURCE_DIR=$(top_srcdir)/contrib/gdk-pixbuf-xlib
FIXXREF_OPTIONS= FIXXREF_OPTIONS=
# Header files to ignore when scanning # Header files to ignore when scanning
IGNORE_HFILES=pixops.h pixops-internal.h gdk-pixbuf-xlib-private.h IGNORE_HFILES=pixops.h pixops-internal.h gdk-pixbuf-xlib-private.h gdk-pixbuf-i18n.h gdk-pixbuf-private.h
# Extra files to add when scanning # Extra files to add when scanning
EXTRA_HFILES= \ EXTRA_HFILES= \
......
...@@ -17,9 +17,11 @@ GDK_PIXBUF_MICRO ...@@ -17,9 +17,11 @@ GDK_PIXBUF_MICRO
<SECTION> <SECTION>
<FILE>gdk-pixbuf</FILE> <FILE>gdk-pixbuf</FILE>
GdkPixbufError
GDK_PIXBUF_ERROR
GdkColorspace GdkColorspace
GdkPixbufAlphaMode
GdkPixbuf GdkPixbuf
GdkPixbufClass
gdk_pixbuf_get_colorspace gdk_pixbuf_get_colorspace
gdk_pixbuf_get_n_channels gdk_pixbuf_get_n_channels
gdk_pixbuf_get_has_alpha gdk_pixbuf_get_has_alpha
...@@ -33,12 +35,10 @@ gdk_pixbuf_get_rowstride ...@@ -33,12 +35,10 @@ gdk_pixbuf_get_rowstride
GDK_PIXBUF GDK_PIXBUF
GDK_TYPE_PIXBUF GDK_TYPE_PIXBUF
GDK_IS_PIXBUF GDK_IS_PIXBUF
GDK_IS_PIXBUF_CLASS
GDK_PIXBUF_CLASS
GDK_PIXBUF_GET_CLASS
<SUBSECTION Private> <SUBSECTION Private>
gdk_pixbuf_get_type gdk_pixbuf_get_type
gdk_pixbuf_error_quark
</SECTION> </SECTION>
<SECTION> <SECTION>
...@@ -53,11 +53,18 @@ gdk_pixbuf_unref ...@@ -53,11 +53,18 @@ gdk_pixbuf_unref
gdk_pixbuf_new_from_file gdk_pixbuf_new_from_file
</SECTION> </SECTION>
<SECTION>
<FILE>file-saving</FILE>
gdk_pixbuf_savev
gdk_pixbuf_save
</SECTION>
<SECTION> <SECTION>
<FILE>creating</FILE> <FILE>creating</FILE>
gdk_pixbuf_new gdk_pixbuf_new
gdk_pixbuf_new_from_data gdk_pixbuf_new_from_data
gdk_pixbuf_new_from_xpm_data gdk_pixbuf_new_from_xpm_data
gdk_pixbuf_new_from_inline
gdk_pixbuf_copy gdk_pixbuf_copy
</SECTION> </SECTION>
...@@ -65,6 +72,7 @@ gdk_pixbuf_copy ...@@ -65,6 +72,7 @@ gdk_pixbuf_copy
<FILE>util</FILE> <FILE>util</FILE>
gdk_pixbuf_add_alpha gdk_pixbuf_add_alpha
gdk_pixbuf_copy_area gdk_pixbuf_copy_area
gdk_pixbuf_saturate_and_pixelate
</SECTION> </SECTION>
<SECTION> <SECTION>
...@@ -72,7 +80,6 @@ gdk_pixbuf_copy_area ...@@ -72,7 +80,6 @@ gdk_pixbuf_copy_area
GdkPixbufFrameAction GdkPixbufFrameAction
GdkPixbufFrame GdkPixbufFrame
GdkPixbufAnimation GdkPixbufAnimation
GdkPixbufAnimationClass
gdk_pixbuf_animation_new_from_file gdk_pixbuf_animation_new_from_file
gdk_pixbuf_animation_ref gdk_pixbuf_animation_ref
gdk_pixbuf_animation_unref gdk_pixbuf_animation_unref
...@@ -88,10 +95,7 @@ gdk_pixbuf_frame_get_x_offset ...@@ -88,10 +95,7 @@ gdk_pixbuf_frame_get_x_offset
<SUBSECTION Standard> <SUBSECTION Standard>
GDK_PIXBUF_ANIMATION GDK_PIXBUF_ANIMATION
GDK_PIXBUF_ANIMATION_CLASS
GDK_TYPE_PIXBUF_ANIMATION GDK_TYPE_PIXBUF_ANIMATION
GDK_PIXBUF_ANIMATION_GET_CLASS
GDK_IS_PIXBUF_ANIMATION_CLASS
GDK_IS_PIXBUF_ANIMATION GDK_IS_PIXBUF_ANIMATION
<SUBSECTION Private> <SUBSECTION Private>
......
...@@ -41,11 +41,6 @@ frame. ...@@ -41,11 +41,6 @@ frame.
action. action.
</para> </para>
@pixbuf:
@x_offset:
@y_offset:
@delay_time:
@action:
<!-- ##### STRUCT GdkPixbufAnimation ##### --> <!-- ##### STRUCT GdkPixbufAnimation ##### -->
<para> <para>
...@@ -53,17 +48,6 @@ frame. ...@@ -53,17 +48,6 @@ frame.
list of #GdkPixbufFrame structures. list of #GdkPixbufFrame structures.
</para> </para>
@parent_instance:
@n_frames:
@frames:
@width:
@height:
<!-- ##### STRUCT GdkPixbufAnimationClass ##### -->
<para>
</para>
<!-- ##### FUNCTION gdk_pixbuf_animation_new_from_file ##### --> <!-- ##### FUNCTION gdk_pixbuf_animation_new_from_file ##### -->
<para> <para>
...@@ -71,6 +55,7 @@ frame. ...@@ -71,6 +55,7 @@ frame.
</para> </para>
@filename: @filename:
@error:
@Returns: @Returns:
......
...@@ -82,6 +82,18 @@ Creating a pixbuf from image data that is already in memory. ...@@ -82,6 +82,18 @@ Creating a pixbuf from image data that is already in memory.
@Returns: @Returns:
<!-- ##### FUNCTION gdk_pixbuf_new_from_inline ##### -->
<para>
</para>
@inline_pixbuf:
@copy_pixels:
@length:
@error:
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_copy ##### --> <!-- ##### FUNCTION gdk_pixbuf_copy ##### -->
<para> <para>
......
...@@ -31,6 +31,7 @@ Loading a pixbuf from a file. ...@@ -31,6 +31,7 @@ Loading a pixbuf from a file.
</para> </para>
@filename: @filename:
@error:
@Returns: <!-- @Returns: <!--
Local variables: Local variables:
mode: sgml mode: sgml
......
...@@ -88,6 +88,7 @@ Application-driven progressive image loading. ...@@ -88,6 +88,7 @@ Application-driven progressive image loading.
</para> </para>
@image_type: @image_type:
@error:
@Returns: @Returns:
...@@ -99,6 +100,7 @@ Application-driven progressive image loading. ...@@ -99,6 +100,7 @@ Application-driven progressive image loading.
@loader: @loader:
@buf: @buf:
@count: @count:
@error:
@Returns: @Returns:
......
<!-- ##### SECTION ./tmpl/from-drawables.sgml:Title ##### -->
Drawables to Pixbufs
<!-- ##### USER_FUNCTION GdkPixbufLastUnref ##### --> <!-- ##### USER_FUNCTION GdkPixbufLastUnref ##### -->
<para> <para>
A function of this type can be used to override the default A function of this type can be used to override the default
...@@ -19,6 +15,10 @@ Drawables to Pixbufs ...@@ -19,6 +15,10 @@ Drawables to Pixbufs
@pixbuf: The pixbuf that is losing its last reference. @pixbuf: The pixbuf that is losing its last reference.
@data: User closure data. @data: User closure data.
<!-- ##### SECTION ./tmpl/from-drawables.sgml:Title ##### -->
Drawables to Pixbufs
<!-- ##### ARG GnomeCanvasPixbuf:height_pixels ##### --> <!-- ##### ARG GnomeCanvasPixbuf:height_pixels ##### -->
<para> <para>
...@@ -415,13 +415,19 @@ XlibRGB ...@@ -415,13 +415,19 @@ XlibRGB
</para> </para>
<!-- ##### SECTION ./tmpl/xlib-from-drawables.sgml:See_Also ##### -->
<para>
</para>
<!-- ##### SECTION ./tmpl/from-drawables.sgml:See_Also ##### --> <!-- ##### SECTION ./tmpl/from-drawables.sgml:See_Also ##### -->
<para> <para>
gdk_image_get(). gdk_image_get().
</para> </para>