diff options
| author | Robin Watts <robin.watts@artifex.com> | 2011-11-14 18:22:13 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2011-11-15 15:20:54 +0000 |
| commit | 9c0a49060475b2dea1e4c2668bebd1d566113a7b (patch) | |
| tree | 49e45a691cf105f4266d5c6b7242a4a3256c1200 /fitz/dev_trace.c | |
| parent | 60c0544742931da63db623ad7a79ba3758704cc1 (diff) | |
| parent | fd6def85f22b598d4c278e76138ab7dccbb84c36 (diff) | |
| download | mupdf-9c0a49060475b2dea1e4c2668bebd1d566113a7b.tar.xz | |
Merge branch 'master' into context
Mostly redoing the xps_context to xps_document change and adding
contexts to newly written code.
Conflicts:
apps/pdfapp.c
apps/pdfapp.h
apps/x11_main.c
apps/xpsdraw.c
draw/draw_device.c
draw/draw_scale.c
fitz/base_object.c
fitz/fitz.h
pdf/mupdf.h
pdf/pdf_interpret.c
pdf/pdf_outline.c
pdf/pdf_page.c
xps/muxps.h
xps/xps_doc.c
xps/xps_xml.c
Diffstat (limited to 'fitz/dev_trace.c')
| -rw-r--r-- | fitz/dev_trace.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/fitz/dev_trace.c b/fitz/dev_trace.c index 4db215a0..62661a3d 100644 --- a/fitz/dev_trace.c +++ b/fitz/dev_trace.c @@ -8,6 +8,13 @@ fz_trace_matrix(fz_matrix ctm) } static void +fz_trace_trm(fz_matrix trm) +{ + printf("trm=\"%g %g %g %g\" ", + trm.a, trm.b, trm.c, trm.d); +} + +static void fz_trace_color(fz_colorspace *colorspace, float *color, float alpha) { int i; @@ -135,7 +142,8 @@ fz_trace_fill_text(fz_device *dev, fz_text *text, fz_matrix ctm, { printf("<fill_text font=\"%s\" wmode=\"%d\" ", text->font->name, text->wmode); fz_trace_color(colorspace, color, alpha); - fz_trace_matrix(fz_concat(ctm, text->trm)); + fz_trace_matrix(ctm); + fz_trace_trm(text->trm); printf(">\n"); fz_debug_text(text, 0); printf("</fill_text>\n"); @@ -147,7 +155,8 @@ fz_trace_stroke_text(fz_device *dev, fz_text *text, fz_stroke_state *stroke, fz_ { printf("<stroke_text font=\"%s\" wmode=\"%d\" ", text->font->name, text->wmode); fz_trace_color(colorspace, color, alpha); - fz_trace_matrix(fz_concat(ctm, text->trm)); + fz_trace_matrix(ctm); + fz_trace_trm(text->trm); printf(">\n"); fz_debug_text(text, 0); printf("</stroke_text>\n"); @@ -158,7 +167,8 @@ fz_trace_clip_text(fz_device *dev, fz_text *text, fz_matrix ctm, int accumulate) { printf("<clip_text font=\"%s\" wmode=\"%d\" ", text->font->name, text->wmode); printf("accumulate=\"%d\" ", accumulate); - fz_trace_matrix(fz_concat(ctm, text->trm)); + fz_trace_matrix(ctm); + fz_trace_trm(text->trm); printf(">\n"); fz_debug_text(text, 0); printf("</clip_text>\n"); @@ -168,7 +178,8 @@ static void fz_trace_clip_stroke_text(fz_device *dev, fz_text *text, fz_stroke_state *stroke, fz_matrix ctm) { printf("<clip_stroke_text font=\"%s\" wmode=\"%d\" ", text->font->name, text->wmode); - fz_trace_matrix(fz_concat(ctm, text->trm)); + fz_trace_matrix(ctm); + fz_trace_trm(text->trm); printf(">\n"); fz_debug_text(text, 0); printf("</clip_stroke_text>\n"); @@ -178,7 +189,8 @@ static void fz_trace_ignore_text(fz_device *dev, fz_text *text, fz_matrix ctm) { printf("<ignore_text font=\"%s\" wmode=\"%d\" ", text->font->name, text->wmode); - fz_trace_matrix(fz_concat(ctm, text->trm)); + fz_trace_matrix(ctm); + fz_trace_trm(text->trm); printf(">\n"); fz_debug_text(text, 0); printf("</ignore_text>\n"); |