callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the _-prefix from gdk_pixbuf_set_option and

Browse Source 
gdk_pixbuf_non_anim_new again.
This commit is contained in:
Matthias Clasen
2002-09-19 21:00:52 +00:00
parent 3f5ad7890f
commit 944334da7f
10 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,8 @@
2002-09-19 Matthias Clasen <maclas@gmx.de>
* Revert the previous change; the symbols need to be exported
to be usable from dlopened modules.
2002-09-18 Matthias Clasen <maclas@gmx.de> 2002-09-18 Matthias Clasen <maclas@gmx.de>
* io-xpm.c, io-xbm.c, io-ico.c, io-ani.c, io-png.c, * io-xpm.c, io-xbm.c, io-ico.c, io-ani.c, io-png.c,

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) if (pixbuf == NULL)
return NULL; return NULL;
animation = _gdk_pixbuf_non_anim_new (pixbuf); animation = gdk_pixbuf_non_anim_new (pixbuf);
g_object_unref (pixbuf); g_object_unref (pixbuf);
} else { } else {
@ -613,7 +613,7 @@ gdk_pixbuf_non_anim_finalize (GObject *object)
} }
GdkPixbufAnimation* GdkPixbufAnimation*
_gdk_pixbuf_non_anim_new (GdkPixbuf *pixbuf) gdk_pixbuf_non_anim_new (GdkPixbuf *pixbuf)
{ {
GdkPixbufNonAnim *non_anim; GdkPixbufNonAnim *non_anim;

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

@ -257,7 +257,7 @@ gdk_pixbuf_loader_prepare (GdkPixbuf *pixbuf,
if (anim) if (anim)
g_object_ref (anim); g_object_ref (anim);
else else
anim = _gdk_pixbuf_non_anim_new (pixbuf); anim = gdk_pixbuf_non_anim_new (pixbuf);
priv->animation = anim; priv->animation = anim;
@ -627,7 +627,7 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader,
g_object_ref (tmp); g_object_ref (tmp);
pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, tmp->has_alpha, 8, priv->width, priv->height); pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, tmp->has_alpha, 8, priv->width, priv->height);
g_object_unref (priv->animation); 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); g_signal_emit (loader, pixbuf_loader_signals[AREA_PREPARED], 0);
gdk_pixbuf_scale (tmp, pixbuf, 0, 0, priv->width, priv->height, 0, 0, gdk_pixbuf_scale (tmp, pixbuf, 0, 0, priv->width, priv->height, 0, 0,
(double) priv->width / tmp->width, (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 */ /* 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 *key,
const gchar *value); 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 * @pixbuf: a #GdkPixbuf
* @key: a nul-terminated string. * @key: a nul-terminated string.
* @value: a nul-terminated string. * @value: a nul-terminated string.
@ -537,7 +537,7 @@ gdk_pixbuf_get_option (GdkPixbuf *pixbuf,
* Return value: %TRUE on success. * Return value: %TRUE on success.
**/ **/
gboolean gboolean
_gdk_pixbuf_set_option (GdkPixbuf *pixbuf, gdk_pixbuf_set_option (GdkPixbuf *pixbuf,
const gchar *key, const gchar *key,
const gchar *value) 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); context->animation->height = gdk_pixbuf_get_height (pixbuf);
if (context->title != NULL) if (context->title != NULL)
_gdk_pixbuf_set_option (pixbuf, "Title", context->title); gdk_pixbuf_set_option (pixbuf, "Title", context->title);
if (context->author != NULL) if (context->author != NULL)
_gdk_pixbuf_set_option (pixbuf, "Author", context->author); gdk_pixbuf_set_option (pixbuf, "Author", context->author);
g_object_ref (pixbuf); g_object_ref (pixbuf);
context->animation->pixbufs[context->pos] = 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); g_print ("INAM %s\n", context->title);
#endif #endif
for (i = 0; i < context->pos; i++) 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) 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); g_print ("IART %s\n", context->author);
#endif #endif
for (i = 0; i < context->pos; i++) 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 #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) { if (State->cursor) {
gchar hot[10]; gchar hot[10];
g_snprintf (hot, 10, "%d", State->x_hot); 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); 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) 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)) { if (png_get_text (png_ptr, info_ptr, &text_ptr, &num_texts)) {
for (i = 0; i < num_texts; i++) { for (i = 0; i < num_texts; i++) {
png_text_to_pixbuf_option (text_ptr[i], &key, &value); 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 (key);
g_free (value); 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], if (png_text_to_pixbuf_option (png_text_ptr[i],
&key, &value)) { &key, &value)) {
_gdk_pixbuf_set_option (lc->pixbuf, key, value); gdk_pixbuf_set_option (lc->pixbuf, key, value);
g_free (key); g_free (key);
g_free (value); 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) { if (x_hot != -1 && y_hot != -1) {
gchar hot[10]; gchar hot[10];
g_snprintf (hot, 10, "%d", x_hot); 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); 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); 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) { if (items == 6) {
gchar hot[10]; gchar hot[10];
g_snprintf (hot, 10, "%d", x_hot); 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); g_snprintf (hot, 10, "%d", y_hot);
_gdk_pixbuf_set_option (pixbuf, "y_hot", hot); gdk_pixbuf_set_option (pixbuf, "y_hot", hot);
} }