AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 10:50:10 +00:00
Code Issues Projects Releases Wiki Activity

_-prefix gdk_pixbuf_non_anim_new and gdk_pixbuf_set_option. Adjust all

Browse Source 
* io-xpm.c, io-xbm.c, io-ico.c, io-ani.c, io-png.c,
	gdk-pixbuf.c, gdk-pixbuf-animation.c, gdk-pixbuf-loader.c,
	gdk-pixbuf-private.h: _-prefix gdk_pixbuf_non_anim_new and
	gdk_pixbuf_set_option. Adjust all callers.
This commit is contained in:
Matthias Clasen 2002-09-17 22:52:44 +00:00
parent 703b02db6a
commit 1e3c6144b4
10 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,10 @@
2002-09-18 Matthias Clasen <maclas@gmx.de>
* io-xpm.c, io-xbm.c, io-ico.c, io-ani.c, io-png.c,
gdk-pixbuf.c, gdk-pixbuf-animation.c, gdk-pixbuf-loader.c,
gdk-pixbuf-private.h: _-prefix gdk_pixbuf_non_anim_new and
gdk_pixbuf_set_option. Adjust all callers.
2002-09-14 Hans Breuer <hans@breuer.org>
* pixops/Makefile.am : added makefile.msc to EXTRA_DIST

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

@ -199,7 +199,7 @@ gdk_pixbuf_animation_new_from_file (const char *filename,
if (pixbuf == NULL)
return NULL;
animation = gdk_pixbuf_non_anim_new (pixbuf);
animation = _gdk_pixbuf_non_anim_new (pixbuf);
g_object_unref (pixbuf);
} else {
@ -613,7 +613,7 @@ gdk_pixbuf_non_anim_finalize (GObject *object)
}
GdkPixbufAnimation*
gdk_pixbuf_non_anim_new (GdkPixbuf *pixbuf)
_gdk_pixbuf_non_anim_new (GdkPixbuf *pixbuf)
{
GdkPixbufNonAnim *non_anim;

4
gdk-pixbuf/gdk-pixbuf-loader.c
View File

@ -257,7 +257,7 @@ gdk_pixbuf_loader_prepare (GdkPixbuf *pixbuf,
if (anim)
g_object_ref (anim);
else
anim = gdk_pixbuf_non_anim_new (pixbuf);
anim = _gdk_pixbuf_non_anim_new (pixbuf);
priv->animation = anim;
@ -627,7 +627,7 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader,
g_object_ref (tmp);
pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, tmp->has_alpha, 8, priv->width, priv->height);
g_object_unref (priv->animation);
priv->animation = gdk_pixbuf_non_anim_new (pixbuf);
priv->animation = _gdk_pixbuf_non_anim_new (pixbuf);
g_signal_emit (loader, pixbuf_loader_signals[AREA_PREPARED], 0);
gdk_pixbuf_scale (tmp, pixbuf, 0, 0, priv->width, priv->height, 0, 0,
(double) priv->width / tmp->width,

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

@ -129,13 +129,13 @@ struct _GdkPixbufAnimationIterClass {
};
GdkPixbufAnimation* gdk_pixbuf_non_anim_new (GdkPixbuf *pixbuf);
GdkPixbufAnimation* _gdk_pixbuf_non_anim_new (GdkPixbuf *pixbuf);
/* key/value pairs that can be attached by the pixbuf loader */
gboolean gdk_pixbuf_set_option (GdkPixbuf *pixbuf,
gboolean _gdk_pixbuf_set_option (GdkPixbuf *pixbuf,
const gchar *key,
const gchar *value);

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

@ -525,7 +525,7 @@ gdk_pixbuf_get_option (GdkPixbuf *pixbuf,
}
/**
* gdk_pixbuf_set_option:
* _gdk_pixbuf_set_option:
* @pixbuf: a #GdkPixbuf
* @key: a nul-terminated string.
* @value: a nul-terminated string.
@ -537,7 +537,7 @@ gdk_pixbuf_get_option (GdkPixbuf *pixbuf,
* Return value: %TRUE on success.
**/
gboolean
gdk_pixbuf_set_option (GdkPixbuf *pixbuf,
_gdk_pixbuf_set_option (GdkPixbuf *pixbuf,
const gchar *key,
const gchar *value)
{

8
gdk-pixbuf/io-ani.c
View File

@ -154,10 +154,10 @@ prepared_callback (GdkPixbufLoader *loader,
context->animation->height = gdk_pixbuf_get_height (pixbuf);
if (context->title != NULL)
gdk_pixbuf_set_option (pixbuf, "Title", context->title);
_gdk_pixbuf_set_option (pixbuf, "Title", context->title);
if (context->author != NULL)
gdk_pixbuf_set_option (pixbuf, "Author", context->author);
_gdk_pixbuf_set_option (pixbuf, "Author", context->author);
g_object_ref (pixbuf);
context->animation->pixbufs[context->pos] = pixbuf;
@ -447,7 +447,7 @@ ani_load_chunk (AniLoaderContext *context, GError **error)
g_print ("INAM %s\n", context->title);
#endif
for (i = 0; i < context->pos; i++)
gdk_pixbuf_set_option (context->animation->pixbufs[i], "Title", context->title);
_gdk_pixbuf_set_option (context->animation->pixbufs[i], "Title", context->title);
}
else if (context->chunk_id == TAG_IART)
{
@ -466,7 +466,7 @@ ani_load_chunk (AniLoaderContext *context, GError **error)
g_print ("IART %s\n", context->author);
#endif
for (i = 0; i < context->pos; i++)
gdk_pixbuf_set_option (context->animation->pixbufs[i], "Author", context->author);
_gdk_pixbuf_set_option (context->animation->pixbufs[i], "Author", context->author);
}
#ifdef DEBUG_ANI

4
gdk-pixbuf/io-ico.c
View File

@ -420,9 +420,9 @@ static void DecodeHeader(guchar *Data, gint Bytes,
if (State->cursor) {
gchar hot[10];
g_snprintf (hot, 10, "%d", State->x_hot);
gdk_pixbuf_set_option (State->pixbuf, "x_hot", hot);
_gdk_pixbuf_set_option (State->pixbuf, "x_hot", hot);
g_snprintf (hot, 10, "%d", State->y_hot);
gdk_pixbuf_set_option (State->pixbuf, "y_hot", hot);
_gdk_pixbuf_set_option (State->pixbuf, "y_hot", hot);
}
if (State->prepared_func != NULL)

4
gdk-pixbuf/io-png.c
View File

@ -317,7 +317,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
if (png_get_text (png_ptr, info_ptr, &text_ptr, &num_texts)) {
for (i = 0; i < num_texts; i++) {
png_text_to_pixbuf_option (text_ptr[i], &key, &value);
gdk_pixbuf_set_option (pixbuf, key, value);
_gdk_pixbuf_set_option (pixbuf, key, value);
g_free (key);
g_free (value);
}
@ -616,7 +616,7 @@ png_info_callback (png_structp png_read_ptr,
if (png_text_to_pixbuf_option (png_text_ptr[i],
&key, &value)) {
gdk_pixbuf_set_option (lc->pixbuf, key, value);
_gdk_pixbuf_set_option (lc->pixbuf, key, value);
g_free (key);
g_free (value);
}

4
gdk-pixbuf/io-xbm.c
View File

@ -298,9 +298,9 @@ gdk_pixbuf__xbm_image_load_real (FILE *f, XBMData *context, GError **error)
if (x_hot != -1 && y_hot != -1) {
gchar hot[10];
g_snprintf (hot, 10, "%d", x_hot);
gdk_pixbuf_set_option (pixbuf, "x_hot", hot);
_gdk_pixbuf_set_option (pixbuf, "x_hot", hot);
g_snprintf (hot, 10, "%d", y_hot);
gdk_pixbuf_set_option (pixbuf, "y_hot", hot);
_gdk_pixbuf_set_option (pixbuf, "y_hot", hot);
}
pixels = gdk_pixbuf_get_pixels (pixbuf);

4
gdk-pixbuf/io-xpm.c
View File

@ -1358,9 +1358,9 @@ pixbuf_create_from_xpm (const gchar * (*get_buf) (enum buf_op op, gpointer handl
if (items == 6) {
gchar hot[10];
g_snprintf (hot, 10, "%d", x_hot);
gdk_pixbuf_set_option (pixbuf, "x_hot", hot);
_gdk_pixbuf_set_option (pixbuf, "x_hot", hot);
g_snprintf (hot, 10, "%d", y_hot);
gdk_pixbuf_set_option (pixbuf, "y_hot", hot);
_gdk_pixbuf_set_option (pixbuf, "y_hot", hot);
}