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

[trace] Correct emission of set_font_face and set_source

Browse source 
set_font_face was not consuming it's operand but blithely placing an
undefined font_face onto the operand stack, whereas set_source was
performing invalid exchanges on the stack.
This commit is contained in:
Chris Wilson 2008-11-05 01:16:25 +00:00
parent 4a4b10271a
commit d1b8186fd7
1 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1423,13 +1423,6 @@ cairo_set_source (cairo_t *cr, cairo_pattern_t *source)
_exch_operands ();
_consume_operand ();
}
else if (_is_current (PATTERN, source, 0))
{
_emit_context (cr);
fprintf (logfile, "exch ");
_exch_operands ();
_consume_operand ();
}
else
{
_emit_context (cr);
@ -1938,8 +1931,33 @@ cairo_get_font_face (cairo_t *cr)
void
cairo_set_font_face (cairo_t *cr, cairo_font_face_t *font_face)
{
_emit_cairo_op (cr, "f%ld set_font_face\n",
_get_font_face_id (font_face));
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));
}
}
return DLCALL (cairo_set_font_face, cr, font_face);
}