fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-02-05 18:10:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[trace] Correctly push font-face onto the operand stack.

Browse source 
We tried to push a reference to an undefined font-face, now we just copy
from the operand stack.
This commit is contained in:
Chris Wilson 2008-11-19 17:03:13 +00:00
parent b426346b48
commit 0d5e533b6c
1 changed files with 36 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
util/cairo-trace/trace.c
View file

@ -779,6 +779,22 @@ _has_font_face_id (cairo_font_face_t *font_face)
return _has_id (FONT_FACE, font_face);
}
static void
_emit_font_face_id (cairo_font_face_t *font_face)
{
Object *obj = _get_object (FONT_FACE, font_face);
if (obj == NULL) {
fprintf (logfile, "null ");
} else {
if (obj->defined) {
fprintf (logfile, "f%ld ", obj->token);
} else {
fprintf (logfile, "%d index ",
current_stack_depth - obj->operand - 1);
}
}
}
static bool
_has_pattern_id (cairo_pattern_t *pattern)
{
@ -2251,32 +2267,27 @@ void
cairo_set_font_face (cairo_t *cr, cairo_font_face_t *font_face)
{
_emit_line_info ();
if (cr != NULL && font_face != NULL) {
if (_pop_operands_to (FONT_FACE, font_face)) {
if (_is_current (CONTEXT, cr, 1)) {
if (_write_lock ()) {
_consume_operand ();
fprintf (logfile, "set_font_face\n");
_write_unlock ();
}
} else {
if (_get_object (CONTEXT, cr)->defined) {
if (_write_lock ()) {
_consume_operand ();
fprintf (logfile,
"c%ld exch set_font_face pop\n",
_get_context_id (cr));
_write_unlock ();
}
} else {
_emit_cairo_op (cr, "f%ld set_font_face\n",
_get_font_face_id (font_face));
}
}
} else {
_emit_cairo_op (cr, "f%ld set_font_face\n",
_get_font_face_id (font_face));
if (cr != NULL && font_face != NULL && _write_lock ()) {
if (_is_current (FONT_FACE, font_face, 0) &&
_is_current (CONTEXT, cr, 1))
{
_consume_operand ();
}
else if (_is_current (FONT_FACE, font_face, 1) &&
_is_current (CONTEXT, cr, 0))
{
fprintf (logfile, "exch ");
_exch_operands ();
_consume_operand ();
}
else
{
_emit_context (cr);
_emit_font_face_id (font_face);
}
fprintf (logfile, "set_font_face\n");
_write_unlock ();
}
return DLCALL (cairo_set_font_face, cr, font_face);