diff options
| author | Robin Watts <robin.watts@artifex.com> | 2012-03-13 15:11:32 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2012-03-13 15:11:32 +0000 |
| commit | 7888b56b928707329a84a61eca8f8e75ef6a745a (patch) | |
| tree | e4603f29da8e9175c45f5852020483bc0fe56378 /apps | |
| parent | 7fa60e876f733f3bd90787145d9a7eb0eb91e9a2 (diff) | |
| download | mupdf-7888b56b928707329a84a61eca8f8e75ef6a745a.tar.xz | |
Make fz_print functions all take a FILE *.
Also tidy up the taking of fz_context *'s, and hide an unwanted indent
param.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/mudraw.c | 12 | ||||
| -rw-r--r-- | apps/win_main.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/apps/mudraw.c b/apps/mudraw.c index 3f0f4ac6..29517873 100644 --- a/apps/mudraw.c +++ b/apps/mudraw.c @@ -176,15 +176,15 @@ static void drawpage(fz_context *ctx, fz_document *doc, int pagenum) dev = NULL; if (showtext == TEXT_XML) { - fz_print_text_page_xml(stdout, text); + fz_print_text_page_xml(ctx, stdout, text); } else if (showtext == TEXT_HTML) { - fz_print_text_page_html(stdout, text); + fz_print_text_page_html(ctx, stdout, text); } else if (showtext == TEXT_PLAIN) { - fz_print_text_page(stdout, text); + fz_print_text_page(ctx, stdout, text); printf("\f\n"); } } @@ -379,9 +379,9 @@ static void drawoutline(fz_context *ctx, fz_document *doc) { fz_outline *outline = fz_load_outline(doc); if (showoutline > 1) - fz_print_outline_xml(ctx, outline); + fz_print_outline_xml(ctx, stdout, outline); else - fz_print_outline(ctx, outline); + fz_print_outline(ctx, stdout, outline); fz_free_outline(ctx, outline); } @@ -526,7 +526,7 @@ int main(int argc, char **argv) { printf("</body>\n"); printf("<style>\n"); - fz_print_text_sheet(stdout, sheet); + fz_print_text_sheet(ctx, stdout, sheet); printf("</style>\n"); } diff --git a/apps/win_main.c b/apps/win_main.c index bf28c131..37864e19 100644 --- a/apps/win_main.c +++ b/apps/win_main.c @@ -379,7 +379,7 @@ void winblit() dibinf->bmiHeader.biHeight = -image_h; dibinf->bmiHeader.biSizeImage = image_h * 4; - if (gapp.image->n == 2) + if (image_n == 2) { int i = image_w * image_h; unsigned char *color = malloc(i*4); @@ -397,7 +397,7 @@ void winblit() dibinf, DIB_RGB_COLORS); free(color); } - if (gapp.image->n == 4) + if (image_n == 4) { SetDIBitsToDevice(hdc, gapp.panx, gapp.pany, image_w, image_h, |