Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return the same pixbuf as the input parameter.

Browse Source 
2000-01-21  Federico Mena Quintero  <federico@helixcode.com>

	* gdk-pixbuf/gdk-pixbuf.c (gdk_pixbuf_ref): Return the same pixbuf
	as the input parameter.

	* gdk-pixbuf/gdk-pixbuf-animation.c (gdk_pixbuf_animation_ref):
	Return the same animation as the input parameter.
This commit is contained in:
Federico Mena Quintero
2000-01-21 22:54:44 +00:00
committed by Arturo Espinosa
parent 2f27c99f36
commit bb8a563730
8 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
demos/testpixbuf-drawable.c
View File

@@ -103,4 +103,5 @@ int main(int argc, char **argv)
gtk_widget_show_all(window);
gtk_main();
return 0;
}

4
docs/reference/gdk-pixbuf/gdk-pixbuf-decl.txt
View File

@@ -224,7 +224,7 @@ GdkPixbuf *pixbuf
</FUNCTION>
<FUNCTION>
<NAME>gdk_pixbuf_ref</NAME>
<RETURNS>void </RETURNS>
<RETURNS>GdkPixbuf *</RETURNS>
GdkPixbuf *pixbuf
</FUNCTION>
<FUNCTION>
@@ -331,7 +331,7 @@ const char *filename
</FUNCTION>
<FUNCTION>
<NAME>gdk_pixbuf_animation_ref</NAME>
<RETURNS>void </RETURNS>
<RETURNS>GdkPixbufAnimation *</RETURNS>
GdkPixbufAnimation *animation
</FUNCTION>
<FUNCTION>

1
docs/reference/gdk-pixbuf/tmpl/animation.sgml
View File

@@ -73,6 +73,7 @@ Animations as multi-frame structures.
</para>
@animation:
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_animation_unref ##### -->

1
docs/reference/gdk-pixbuf/tmpl/refcounting.sgml
View File

@@ -26,6 +26,7 @@ Functions to perform reference counting on a #GdkPixbuf.
</para>
@pixbuf:
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_unref ##### -->

28
gdk-pixbuf/ChangeLog
View File

@@ -1,5 +1,13 @@
2000-01-21 Federico Mena Quintero <federico@helixcode.com>
* gdk-pixbuf/gdk-pixbuf.c (gdk_pixbuf_ref): Return the same pixbuf
as the input parameter.
* gdk-pixbuf/gdk-pixbuf-animation.c (gdk_pixbuf_animation_ref):
Return the same animation as the input parameter.
2000-01-16 Elliot Lee <sopwith@redhat.com>
* gdk-pixbuf/Makefile.am: Don't link against libgnomecanvaspixbuf.la
2000-01-16 Federico Mena Quintero <federico@helixcode.com>
@@ -80,22 +88,22 @@
loading.
* gdk-pixbuf/io-gif.c (image_load_increment): I think the
ref-counting mess is finally fixed. Added progressive animation
loading.
loading.
(gif_get_lzw): remove memory_leak
* doc/tmpl/gdk-pixbuf-loader.sgml: much longer long description
added.
added.
2000-01-05 Owen Taylor <otaylor@redhat.com>
* gdk-pixbuf/pixops/pixops.c (pixops_process): Fix computation of end of run indices.
* gdk-pixbuf/pixops/pixops.c: Fix double increments when dest_channels == 4.
(Pointed out by Tomas Ogren)
2000-01-05 Mark Crichton <crichton@gimp.org>
* gdk-pixbuf/gdk-pixbuf-loader.c (gdk_pixbuf_loader_eat_header_write):
* gdk-pixbuf/gdk-pixbuf-loader.c (gdk_pixbuf_loader_eat_header_write):
Return 0 if gdk_pixbuf_load_loader_module returns FALSE.
2000-01-05 Elliot Lee <sopwith@redhat.com>
@@ -104,7 +112,7 @@
2000-01-05 Owen Taylor <otaylor@redhat.com>
* doc/Makefile.am doc/gdk-pixbuf-sections.txt
doc/gdk-pixbuf.sgml doc/tmpl/scaling.sgml:
doc/gdk-pixbuf.sgml doc/tmpl/scaling.sgml:
Added scaling functions into gtk-doc framework.
* gdk-pixbuf/gdk-pixbuf-scale.c: Documentation fixes.
@@ -124,9 +132,9 @@
* gdk-pixbuf/gdk-pixbuf-io.h: Change the order of the update func
to make it more compatible with the rest of GTK. Added animation
framework for progressive loading.
* gdk-pixbuf/io-bmp.c (image_begin_load): Modified to handle new
system.
system.
* gdk-pixbuf/io-ico.c (image_begin_load): ditto
* gdk-pixbuf/io-png.c (image_begin_load): ditto
* gdk-pixbuf/io-ras.c (image_begin_load): ditto
@@ -153,10 +161,10 @@
* gdk-pixbuf/gdk-pixbuf.h gdk-pixbuf/gdk-pixbuf-scale.c:
Nice wrapper routines for the code in pixops that operate
on pixbufs instead of raw data.
* gdk-pixbuf/testpixbuf-scale: Test program for scaling
routines.
2000-01-05 Jonathan Blandford <jrb@redhat.com>
* doc/tmpl/animation.sgml: Documentation changes.

9
gdk-pixbuf/gdk-pixbuf-animation.c
View File

@@ -117,14 +117,17 @@ gdk_pixbuf_animation_new_from_file (const char *filename)
*
* Adds a reference to an animation. It must be released afterwards using
* gdk_pixbuf_animation_unref().
*
* Return value: The same as the @animation argument.
**/
void
GdkPixbufAnimation *
gdk_pixbuf_animation_ref (GdkPixbufAnimation *animation)
{
g_return_if_fail (animation != NULL);
g_return_if_fail (animation->ref_count > 0);
g_return_val_if_fail (animation != NULL, NULL);
g_return_val_if_fail (animation->ref_count > 0, NULL);
animation->ref_count++;
return animation;
}
/**

9
gdk-pixbuf/gdk-pixbuf.c
View File

@@ -41,14 +41,17 @@
*
* Adds a reference to a pixbuf. It must be released afterwards using
* gdk_pixbuf_unref().
*
* Return value: The same as the @pixbuf argument.
**/
void
GdkPixbuf *
gdk_pixbuf_ref (GdkPixbuf *pixbuf)
{
g_return_if_fail (pixbuf != NULL);
g_return_if_fail (pixbuf->ref_count > 0);
g_return_val_if_fail (pixbuf != NULL, NULL);
g_return_val_if_fail (pixbuf->ref_count > 0, NULL);
pixbuf->ref_count++;
return pixbuf;
}
/**

4
gdk-pixbuf/gdk-pixbuf.h
View File

@@ -97,7 +97,7 @@ int gdk_pixbuf_get_rowstride (GdkPixbuf *pixbuf);
/* Reference counting */
void gdk_pixbuf_ref (GdkPixbuf *pixbuf);
GdkPixbuf *gdk_pixbuf_ref (GdkPixbuf *pixbuf);
void gdk_pixbuf_unref (GdkPixbuf *pixbuf);
/* Wrap a libart pixbuf */
@@ -234,7 +234,7 @@ GdkPixbuf *gdk_pixbuf_composite_color_simple (GdkPixbuf *src,
GdkPixbufAnimation *gdk_pixbuf_animation_new_from_file (const char *filename);
void gdk_pixbuf_animation_ref (GdkPixbufAnimation *animation);
GdkPixbufAnimation *gdk_pixbuf_animation_ref (GdkPixbufAnimation *animation);
void gdk_pixbuf_animation_unref (GdkPixbufAnimation *animation);
/* General (presently empty) initialization hooks, primarily for gnome-libs */