Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dorota Czaplejewicz
gtk
Commits
944334da
Commit
944334da
authored
Sep 19, 2002
by
Matthias Clasen
Browse files
Remove the _-prefix from gdk_pixbuf_set_option and
gdk_pixbuf_non_anim_new again.
parent
3f5ad789
Changes
10
Hide whitespace changes
Inline
Side-by-side
gdk-pixbuf/ChangeLog
View file @
944334da
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
>
*
io
-
xpm
.
c
,
io
-
xbm
.
c
,
io
-
ico
.
c
,
io
-
ani
.
c
,
io
-
png
.
c
,
...
...
gdk-pixbuf/gdk-pixbuf-animation.c
View file @
944334da
...
...
@@ -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
;
...
...
gdk-pixbuf/gdk-pixbuf-loader.c
View file @
944334da
...
...
@@ -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
,
...
...
gdk-pixbuf/gdk-pixbuf-private.h
View file @
944334da
...
...
@@ -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
);
...
...
gdk-pixbuf/gdk-pixbuf.c
View file @
944334da
...
...
@@ -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
)
{
...
...
gdk-pixbuf/io-ani.c
View file @
944334da
...
...
@@ -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
...
...
gdk-pixbuf/io-ico.c
View file @
944334da
...
...
@@ -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
)
...
...
gdk-pixbuf/io-png.c
View file @
944334da
...
...
@@ -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
);
}
...
...
gdk-pixbuf/io-xbm.c
View file @
944334da
...
...
@@ -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
);
...
...
gdk-pixbuf/io-xpm.c
View file @
944334da
...
...
@@ -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
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment