summaryrefslogtreecommitdiff
path: root/source/tools
diff options
context:
space:
mode:
Diffstat (limited to 'source/tools')
-rw-r--r--source/tools/mudraw.c38
-rw-r--r--source/tools/muraster.c6
-rw-r--r--source/tools/murun.c10
-rw-r--r--source/tools/pdfcreate.c4
-rw-r--r--source/tools/pdfextract.c4
-rw-r--r--source/tools/pdfinfo.c68
-rw-r--r--source/tools/pdfpages.c12
-rw-r--r--source/tools/pdfshow.c36
8 files changed, 91 insertions, 87 deletions
diff --git a/source/tools/mudraw.c b/source/tools/mudraw.c
index 785bcaa2..77f400a4 100644
--- a/source/tools/mudraw.c
+++ b/source/tools/mudraw.c
@@ -352,27 +352,27 @@ static void
file_level_headers(fz_context *ctx)
{
if (output_format == OUT_STEXT || output_format == OUT_TRACE)
- fz_printf(ctx, out, "<?xml version=\"1.0\"?>\n");
+ fz_write_printf(ctx, out, "<?xml version=\"1.0\"?>\n");
if (output_format == OUT_TEXT || output_format == OUT_HTML || output_format == OUT_STEXT)
sheet = fz_new_stext_sheet(ctx);
if (output_format == OUT_HTML)
{
- fz_printf(ctx, out, "<style>\n");
- fz_printf(ctx, out, "body{background-color:gray;margin:12pt;}\n");
- fz_printf(ctx, out, "div.page{background-color:white;margin:6pt;padding:6pt;}\n");
- fz_printf(ctx, out, "div.block{border:1px solid gray;margin:6pt;padding:6pt;}\n");
- fz_printf(ctx, out, "div.metaline{display:table;width:100%%}\n");
- fz_printf(ctx, out, "div.line{display:table-row;padding:6pt}\n");
- fz_printf(ctx, out, "div.cell{display:table-cell;padding-left:6pt;padding-right:6pt}\n");
- fz_printf(ctx, out, "p{margin:0pt;padding:0pt;}\n");
- fz_printf(ctx, out, "</style>\n");
- fz_printf(ctx, out, "<body>\n");
+ fz_write_printf(ctx, out, "<style>\n");
+ fz_write_printf(ctx, out, "body{background-color:gray;margin:12pt;}\n");
+ fz_write_printf(ctx, out, "div.page{background-color:white;margin:6pt;padding:6pt;}\n");
+ fz_write_printf(ctx, out, "div.block{border:1px solid gray;margin:6pt;padding:6pt;}\n");
+ fz_write_printf(ctx, out, "div.metaline{display:table;width:100%%}\n");
+ fz_write_printf(ctx, out, "div.line{display:table-row;padding:6pt}\n");
+ fz_write_printf(ctx, out, "div.cell{display:table-cell;padding-left:6pt;padding-right:6pt}\n");
+ fz_write_printf(ctx, out, "p{margin:0pt;padding:0pt;}\n");
+ fz_write_printf(ctx, out, "</style>\n");
+ fz_write_printf(ctx, out, "<body>\n");
}
if (output_format == OUT_STEXT || output_format == OUT_TRACE)
- fz_printf(ctx, out, "<document name=\"%s\">\n", filename);
+ fz_write_printf(ctx, out, "<document name=\"%s\">\n", filename);
if (output_format == OUT_PS)
fz_write_ps_file_header(ctx, out);
@@ -385,14 +385,14 @@ static void
file_level_trailers(fz_context *ctx)
{
if (output_format == OUT_STEXT || output_format == OUT_TRACE)
- fz_printf(ctx, out, "</document>\n");
+ fz_write_printf(ctx, out, "</document>\n");
if (output_format == OUT_HTML)
{
- fz_printf(ctx, out, "</body>\n");
- fz_printf(ctx, out, "<style>\n");
+ fz_write_printf(ctx, out, "</body>\n");
+ fz_write_printf(ctx, out, "<style>\n");
fz_print_stext_sheet(ctx, out, sheet);
- fz_printf(ctx, out, "</style>\n");
+ fz_write_printf(ctx, out, "</style>\n");
}
if (output_format == OUT_PS)
@@ -456,7 +456,7 @@ static void dodrawpage(fz_context *ctx, fz_page *page, fz_display_list *list, in
{
fz_try(ctx)
{
- fz_printf(ctx, out, "<page mediabox=\"%g %g %g %g\">\n",
+ fz_write_printf(ctx, out, "<page mediabox=\"%g %g %g %g\">\n",
mediabox.x0, mediabox.y0, mediabox.x1, mediabox.y1);
dev = fz_new_trace_device(ctx, out);
if (lowmemory)
@@ -465,7 +465,7 @@ static void dodrawpage(fz_context *ctx, fz_page *page, fz_display_list *list, in
fz_run_display_list(ctx, list, dev, &fz_identity, &fz_infinite_rect, cookie);
else
fz_run_page(ctx, page, dev, &fz_identity, cookie);
- fz_printf(ctx, out, "</page>\n");
+ fz_write_printf(ctx, out, "</page>\n");
fz_close_device(ctx, dev);
}
fz_always(ctx)
@@ -519,7 +519,7 @@ static void dodrawpage(fz_context *ctx, fz_page *page, fz_display_list *list, in
else if (output_format == OUT_TEXT)
{
fz_print_stext_page(ctx, out, text);
- fz_printf(ctx, out, "\f\n");
+ fz_write_printf(ctx, out, "\f\n");
}
}
fz_always(ctx)
diff --git a/source/tools/muraster.c b/source/tools/muraster.c
index 468bb212..78fd18fa 100644
--- a/source/tools/muraster.c
+++ b/source/tools/muraster.c
@@ -253,6 +253,8 @@ static const suffix_t suffix_table[] =
#endif
};
+#ifndef DISABLE_MUTHREADS
+
static mu_mutex mutexes[FZ_LOCK_MAX];
static void muraster_lock(void *user, int lock)
@@ -295,6 +297,8 @@ static fz_locks_context *init_muraster_locks(void)
return &muraster_locks;
}
+#endif
+
#ifdef MURASTER_CONFIG_RENDER_THREADS
#define NUM_RENDER_THREADS MURASTER_CONFIG_RENDER_THREADS
#elif defined(DISABLE_MUTHREADS)
@@ -1384,7 +1388,7 @@ int main(int argc, char **argv)
{
char *password = "";
fz_document *doc = NULL;
- int i, c;
+ int c;
fz_context *ctx;
fz_alloc_context alloc_ctx = { NULL, trace_malloc, trace_realloc, trace_free };
fz_locks_context *locks = NULL;
diff --git a/source/tools/murun.c b/source/tools/murun.c
index 25fd0d39..75f5d19f 100644
--- a/source/tools/murun.c
+++ b/source/tools/murun.c
@@ -1416,7 +1416,7 @@ static void ffi_Buffer_writeByte(js_State *J)
fz_buffer *buf = js_touserdata(J, 0, "fz_buffer");
unsigned char val = js_tonumber(J, 1);
fz_try(ctx)
- fz_write_buffer_byte(ctx, buf, val);
+ fz_append_byte(ctx, buf, val);
fz_catch(ctx)
rethrow(J);
}
@@ -1427,7 +1427,7 @@ static void ffi_Buffer_writeRune(js_State *J)
fz_buffer *buf = js_touserdata(J, 0, "fz_buffer");
int val = js_tonumber(J, 1);
fz_try(ctx)
- fz_write_buffer_rune(ctx, buf, val);
+ fz_append_rune(ctx, buf, val);
fz_catch(ctx)
rethrow(J);
}
@@ -1442,8 +1442,8 @@ static void ffi_Buffer_write(js_State *J)
const char *s = js_tostring(J, i);
fz_try(ctx) {
if (i > 1)
- fz_write_buffer_byte(ctx, buf, ' ');
- fz_write_buffer(ctx, buf, s, strlen(s));
+ fz_append_byte(ctx, buf, ' ');
+ fz_append_string(ctx, buf, s);
} fz_catch(ctx)
rethrow(J);
}
@@ -1455,7 +1455,7 @@ static void ffi_Buffer_writeLine(js_State *J)
fz_buffer *buf = js_touserdata(J, 0, "fz_buffer");
ffi_Buffer_write(J);
fz_try(ctx)
- fz_write_buffer_byte(ctx, buf, '\n');
+ fz_append_byte(ctx, buf, '\n');
fz_catch(ctx)
rethrow(J);
}
diff --git a/source/tools/pdfcreate.c b/source/tools/pdfcreate.c
index 79f4a29d..b7b580db 100644
--- a/source/tools/pdfcreate.c
+++ b/source/tools/pdfcreate.c
@@ -129,8 +129,8 @@ static void create_page(char *input)
}
else
{
- fz_write_buffer(ctx, contents, line, strlen(line));
- fz_write_buffer_byte(ctx, contents, '\n');
+ fz_append_string(ctx, contents, line);
+ fz_append_byte(ctx, contents, '\n');
}
}
fz_drop_stream(ctx, stm);
diff --git a/source/tools/pdfextract.c b/source/tools/pdfextract.c
index 4104cc20..c7390392 100644
--- a/source/tools/pdfextract.c
+++ b/source/tools/pdfextract.c
@@ -71,7 +71,7 @@ writejpeg(fz_context *ctx, const unsigned char *data, size_t len, const char *fi
fz_try(ctx)
{
out = fz_new_output_with_path(ctx, buf, 0);
- fz_write(ctx, out, data, len);
+ fz_write_data(ctx, out, data, len);
}
fz_always(ctx)
{
@@ -195,7 +195,7 @@ static void savefont(pdf_obj *dict, int num)
printf("extracting font %s\n", namebuf);
out = fz_new_output_with_path(ctx, namebuf, 0);
fz_try(ctx)
- fz_write(ctx, out, data, len);
+ fz_write_data(ctx, out, data, len);
fz_always(ctx)
fz_drop_output(ctx, out);
fz_catch(ctx)
diff --git a/source/tools/pdfinfo.c b/source/tools/pdfinfo.c
index e6b37709..8fac93f6 100644
--- a/source/tools/pdfinfo.c
+++ b/source/tools/pdfinfo.c
@@ -178,23 +178,23 @@ showglobalinfo(fz_context *ctx, globals *glo)
fz_output *out = glo->out;
pdf_document *doc = glo->doc;
- fz_printf(ctx, out, "\nPDF-%d.%d\n", doc->version / 10, doc->version % 10);
+ fz_write_printf(ctx, out, "\nPDF-%d.%d\n", doc->version / 10, doc->version % 10);
obj = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME_Info);
if (obj)
{
- fz_printf(ctx, out, "Info object (%d 0 R):\n", pdf_to_num(ctx, obj));
+ fz_write_printf(ctx, out, "Info object (%d 0 R):\n", pdf_to_num(ctx, obj));
pdf_print_obj(ctx, out, pdf_resolve_indirect(ctx, obj), 1);
}
obj = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME_Encrypt);
if (obj)
{
- fz_printf(ctx, out, "\nEncryption object (%d 0 R):\n", pdf_to_num(ctx, obj));
+ fz_write_printf(ctx, out, "\nEncryption object (%d 0 R):\n", pdf_to_num(ctx, obj));
pdf_print_obj(ctx, out, pdf_resolve_indirect(ctx, obj), 1);
}
- fz_printf(ctx, out, "\nPages: %d\n\n", glo->pagecount);
+ fz_write_printf(ctx, out, "\nPages: %d\n\n", glo->pagecount);
}
static void
@@ -680,10 +680,10 @@ printinfo(fz_context *ctx, globals *glo, char *filename, int show, int page)
if (show & DIMENSIONS && glo->dims > 0)
{
- fz_printf(ctx, out, "Mediaboxes (%d):\n", glo->dims);
+ fz_write_printf(ctx, out, "Mediaboxes (%d):\n", glo->dims);
for (i = 0; i < glo->dims; i++)
{
- fz_printf(ctx, out, PAGE_FMT_zu "[ %g %g %g %g ]\n",
+ fz_write_printf(ctx, out, PAGE_FMT_zu "[ %g %g %g %g ]\n",
glo->dim[i].page,
pdf_to_num(ctx, glo->dim[i].pageref),
glo->dim[i].u.dim.bbox->x0,
@@ -691,15 +691,15 @@ printinfo(fz_context *ctx, globals *glo, char *filename, int show, int page)
glo->dim[i].u.dim.bbox->x1,
glo->dim[i].u.dim.bbox->y1);
}
- fz_printf(ctx, out, "\n");
+ fz_write_printf(ctx, out, "\n");
}
if (show & FONTS && glo->fonts > 0)
{
- fz_printf(ctx, out, "Fonts (%d):\n", glo->fonts);
+ fz_write_printf(ctx, out, "Fonts (%d):\n", glo->fonts);
for (i = 0; i < glo->fonts; i++)
{
- fz_printf(ctx, out, PAGE_FMT_zu "%s '%s' %s%s(%d 0 R)\n",
+ fz_write_printf(ctx, out, PAGE_FMT_zu "%s '%s' %s%s(%d 0 R)\n",
glo->font[i].page,
pdf_to_num(ctx, glo->font[i].pageref),
pdf_to_name(ctx, glo->font[i].u.font.subtype),
@@ -708,18 +708,18 @@ printinfo(fz_context *ctx, globals *glo, char *filename, int show, int page)
glo->font[i].u.font.encoding ? " " : "",
pdf_to_num(ctx, glo->font[i].u.font.obj));
}
- fz_printf(ctx, out, "\n");
+ fz_write_printf(ctx, out, "\n");
}
if (show & IMAGES && glo->images > 0)
{
- fz_printf(ctx, out, "Images (%d):\n", glo->images);
+ fz_write_printf(ctx, out, "Images (%d):\n", glo->images);
for (i = 0; i < glo->images; i++)
{
char *cs = NULL;
char *altcs = NULL;
- fz_printf(ctx, out, PAGE_FMT_zu "[ ",
+ fz_write_printf(ctx, out, PAGE_FMT_zu "[ ",
glo->image[i].page,
pdf_to_num(ctx, glo->image[i].pageref));
@@ -734,7 +734,7 @@ printinfo(fz_context *ctx, globals *glo, char *filename, int show, int page)
if (strstr(filter, "Decode"))
*(strstr(filter, "Decode")) = '\0';
- fz_printf(ctx, out, "%s%s",
+ fz_write_printf(ctx, out, "%s%s",
filter,
j == pdf_array_len(ctx, glo->image[i].u.image.filter) - 1 ? "" : " ");
fz_free(ctx, filter);
@@ -748,11 +748,11 @@ printinfo(fz_context *ctx, globals *glo, char *filename, int show, int page)
if (strstr(filter, "Decode"))
*(strstr(filter, "Decode")) = '\0';
- fz_printf(ctx, out, "%s", filter);
+ fz_write_printf(ctx, out, "%s", filter);
fz_free(ctx, filter);
}
else
- fz_printf(ctx, out, "Raw");
+ fz_write_printf(ctx, out, "Raw");
if (glo->image[i].u.image.cs)
{
@@ -793,7 +793,7 @@ printinfo(fz_context *ctx, globals *glo, char *filename, int show, int page)
fz_strlcpy(altcs, "Sep", 4);
}
- fz_printf(ctx, out, " ] %dx%d %dbpc %s%s%s (%d 0 R)\n",
+ fz_write_printf(ctx, out, " ] %dx%d %dbpc %s%s%s (%d 0 R)\n",
pdf_to_int(ctx, glo->image[i].u.image.width),
pdf_to_int(ctx, glo->image[i].u.image.height),
glo->image[i].u.image.bpc ? pdf_to_int(ctx, glo->image[i].u.image.bpc) : 1,
@@ -805,12 +805,12 @@ printinfo(fz_context *ctx, globals *glo, char *filename, int show, int page)
fz_free(ctx, cs);
fz_free(ctx, altcs);
}
- fz_printf(ctx, out, "\n");
+ fz_write_printf(ctx, out, "\n");
}
if (show & SHADINGS && glo->shadings > 0)
{
- fz_printf(ctx, out, "Shading patterns (%d):\n", glo->shadings);
+ fz_write_printf(ctx, out, "Shading patterns (%d):\n", glo->shadings);
for (i = 0; i < glo->shadings; i++)
{
char *shadingtype[] =
@@ -825,18 +825,18 @@ printinfo(fz_context *ctx, globals *glo, char *filename, int show, int page)
"Tensor patch",
};
- fz_printf(ctx, out, PAGE_FMT_zu "%s (%d 0 R)\n",
+ fz_write_printf(ctx, out, PAGE_FMT_zu "%s (%d 0 R)\n",
glo->shading[i].page,
pdf_to_num(ctx, glo->shading[i].pageref),
shadingtype[pdf_to_int(ctx, glo->shading[i].u.shading.type)],
pdf_to_num(ctx, glo->shading[i].u.shading.obj));
}
- fz_printf(ctx, out, "\n");
+ fz_write_printf(ctx, out, "\n");
}
if (show & PATTERNS && glo->patterns > 0)
{
- fz_printf(ctx, out, "Patterns (%d):\n", glo->patterns);
+ fz_write_printf(ctx, out, "Patterns (%d):\n", glo->patterns);
for (i = 0; i < glo->patterns; i++)
{
if (pdf_to_int(ctx, glo->pattern[i].u.pattern.type) == 1)
@@ -855,7 +855,7 @@ printinfo(fz_context *ctx, globals *glo, char *filename, int show, int page)
"Constant/fast tiling",
};
- fz_printf(ctx, out, PAGE_FMT_zu "Tiling %s %s (%d 0 R)\n",
+ fz_write_printf(ctx, out, PAGE_FMT_zu "Tiling %s %s (%d 0 R)\n",
glo->pattern[i].page,
pdf_to_num(ctx, glo->pattern[i].pageref),
painttype[pdf_to_int(ctx, glo->pattern[i].u.pattern.paint)],
@@ -864,22 +864,22 @@ printinfo(fz_context *ctx, globals *glo, char *filename, int show, int page)
}
else
{
- fz_printf(ctx, out, PAGE_FMT_zu "Shading %d 0 R (%d 0 R)\n",
+ fz_write_printf(ctx, out, PAGE_FMT_zu "Shading %d 0 R (%d 0 R)\n",
glo->pattern[i].page,
pdf_to_num(ctx, glo->pattern[i].pageref),
pdf_to_num(ctx, glo->pattern[i].u.pattern.shading),
pdf_to_num(ctx, glo->pattern[i].u.pattern.obj));
}
}
- fz_printf(ctx, out, "\n");
+ fz_write_printf(ctx, out, "\n");
}
if (show & XOBJS && glo->forms > 0)
{
- fz_printf(ctx, out, "Form xobjects (%d):\n", glo->forms);
+ fz_write_printf(ctx, out, "Form xobjects (%d):\n", glo->forms);
for (i = 0; i < glo->forms; i++)
{
- fz_printf(ctx, out, PAGE_FMT_zu "Form%s%s%s%s (%d 0 R)\n",
+ fz_write_printf(ctx, out, PAGE_FMT_zu "Form%s%s%s%s (%d 0 R)\n",
glo->form[i].page,
pdf_to_num(ctx, glo->form[i].pageref),
glo->form[i].u.form.groupsubtype ? " " : "",
@@ -888,20 +888,20 @@ printinfo(fz_context *ctx, globals *glo, char *filename, int show, int page)
glo->form[i].u.form.reference ? " Reference" : "",
pdf_to_num(ctx, glo->form[i].u.form.obj));
}
- fz_printf(ctx, out, "\n");
+ fz_write_printf(ctx, out, "\n");
}
if (show & XOBJS && glo->psobjs > 0)
{
- fz_printf(ctx, out, "Postscript xobjects (%d):\n", glo->psobjs);
+ fz_write_printf(ctx, out, "Postscript xobjects (%d):\n", glo->psobjs);
for (i = 0; i < glo->psobjs; i++)
{
- fz_printf(ctx, out, PAGE_FMT_zu "(%d 0 R)\n",
+ fz_write_printf(ctx, out, PAGE_FMT_zu "(%d 0 R)\n",
glo->psobj[i].page,
pdf_to_num(ctx, glo->psobj[i].pageref),
pdf_to_num(ctx, glo->psobj[i].u.form.obj));
}
- fz_printf(ctx, out, "\n");
+ fz_write_printf(ctx, out, "\n");
}
}
@@ -923,15 +923,15 @@ showinfo(fz_context *ctx, globals *glo, char *filename, int show, const char *pa
while ((pagelist = fz_parse_page_range(ctx, pagelist, &spage, &epage, pagecount)))
{
if (allpages)
- fz_printf(ctx, out, "Retrieving info from pages %d-%d...\n", spage, epage);
+ fz_write_printf(ctx, out, "Retrieving info from pages %d-%d...\n", spage, epage);
for (page = spage; page <= epage; page++)
{
gatherpageinfo(ctx, glo, page, show);
if (!allpages)
{
- fz_printf(ctx, out, "Page %d:\n", page);
+ fz_write_printf(ctx, out, "Page %d:\n", page);
printinfo(ctx, glo, filename, show, page);
- fz_printf(ctx, out, "\n");
+ fz_write_printf(ctx, out, "\n");
clearinfo(ctx, glo);
}
}
@@ -967,7 +967,7 @@ pdfinfo_info(fz_context *ctx, fz_output *out, char *filename, char *password, in
closexref(ctx, &glo);
filename = argv[argidx];
- fz_printf(ctx, out, "%s:\n", filename);
+ fz_write_printf(ctx, out, "%s:\n", filename);
glo.doc = pdf_open_document(glo.ctx, filename);
if (pdf_needs_password(ctx, glo.doc))
if (!pdf_authenticate_password(ctx, glo.doc, password))
diff --git a/source/tools/pdfpages.c b/source/tools/pdfpages.c
index cb6a6a2d..598f7594 100644
--- a/source/tools/pdfpages.c
+++ b/source/tools/pdfpages.c
@@ -31,7 +31,7 @@ showbox(fz_context *ctx, fz_output *out, pdf_obj *page, char *text, pdf_obj *nam
pdf_to_rect(ctx, obj, &bbox);
- fz_printf(ctx, out, "<%s l=\"%g\" b=\"%g\" r=\"%g\" t=\"%g\" />\n", text, bbox.x0, bbox.y0, bbox.x1, bbox.y1);
+ fz_write_printf(ctx, out, "<%s l=\"%g\" b=\"%g\" r=\"%g\" t=\"%g\" />\n", text, bbox.x0, bbox.y0, bbox.x1, bbox.y1);
}
fz_catch(ctx)
{
@@ -53,7 +53,7 @@ shownum(fz_context *ctx, fz_output *out, pdf_obj *page, char *text, pdf_obj *nam
if (!pdf_is_number(ctx, obj))
break;
- fz_printf(ctx, out, "<%s v=\"%g\" />\n", text, pdf_to_real(ctx, obj));
+ fz_write_printf(ctx, out, "<%s v=\"%g\" />\n", text, pdf_to_real(ctx, obj));
}
fz_catch(ctx)
{
@@ -69,7 +69,7 @@ showpage(fz_context *ctx, pdf_document *doc, fz_output *out, int page)
pdf_obj *pageref;
int failed = 0;
- fz_printf(ctx, out, "<page pagenum=\"%d\">\n", page);
+ fz_write_printf(ctx, out, "<page pagenum=\"%d\">\n", page);
fz_try(ctx)
{
pageref = pdf_lookup_page_obj(ctx, doc, page-1);
@@ -78,7 +78,7 @@ showpage(fz_context *ctx, pdf_document *doc, fz_output *out, int page)
}
fz_catch(ctx)
{
- fz_printf(ctx, out, "Failed to gather information for page %d\n", page);
+ fz_write_printf(ctx, out, "Failed to gather information for page %d\n", page);
failed = 1;
}
@@ -93,7 +93,7 @@ showpage(fz_context *ctx, pdf_document *doc, fz_output *out, int page)
failed |= shownum(ctx, out, pageref, "UserUnit", PDF_NAME_UserUnit);
}
- fz_printf(ctx, out, "</page>\n");
+ fz_write_printf(ctx, out, "</page>\n");
return failed;
}
@@ -141,7 +141,7 @@ pdfpages_pages(fz_context *ctx, fz_output *out, char *filename, char *password,
pdf_drop_document(ctx, doc);
filename = argv[argidx];
- fz_printf(ctx, out, "%s:\n", filename);
+ fz_write_printf(ctx, out, "%s:\n", filename);
doc = pdf_open_document(ctx, filename);
if (pdf_needs_password(ctx, doc))
if (!pdf_authenticate_password(ctx, doc, password))
diff --git a/source/tools/pdfshow.c b/source/tools/pdfshow.c
index a6f897ca..03c93da8 100644
--- a/source/tools/pdfshow.c
+++ b/source/tools/pdfshow.c
@@ -25,9 +25,9 @@ static void showtrailer(void)
{
if (!doc)
fz_throw(ctx, FZ_ERROR_GENERIC, "no file specified");
- fz_printf(ctx, out, "trailer\n");
+ fz_write_printf(ctx, out, "trailer\n");
pdf_print_obj(ctx, out, pdf_trailer(ctx, doc), 0);
- fz_printf(ctx, out, "\n");
+ fz_write_printf(ctx, out, "\n");
}
static void showencrypt(void)
@@ -39,9 +39,9 @@ static void showencrypt(void)
encrypt = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME_Encrypt);
if (!encrypt)
fz_throw(ctx, FZ_ERROR_GENERIC, "document not encrypted");
- fz_printf(ctx, out, "encryption dictionary\n");
+ fz_write_printf(ctx, out, "encryption dictionary\n");
pdf_print_obj(ctx, out, pdf_resolve_indirect(ctx, encrypt), 0);
- fz_printf(ctx, out, "\n");
+ fz_write_printf(ctx, out, "\n");
}
static void showxref(void)
@@ -49,7 +49,7 @@ static void showxref(void)
if (!doc)
fz_throw(ctx, FZ_ERROR_GENERIC, "no file specified");
pdf_print_xref(ctx, doc);
- fz_printf(ctx, out, "\n");
+ fz_write_printf(ctx, out, "\n");
}
static void showpagetree(void)
@@ -65,9 +65,9 @@ static void showpagetree(void)
for (i = 0; i < count; i++)
{
ref = pdf_lookup_page_obj(ctx, doc, i);
- fz_printf(ctx, out, "page %d = %d 0 R\n", i + 1, pdf_to_num(ctx, ref));
+ fz_write_printf(ctx, out, "page %d = %d 0 R\n", i + 1, pdf_to_num(ctx, ref));
}
- fz_printf(ctx, out, "\n");
+ fz_write_printf(ctx, out, "\n");
}
static void showsafe(unsigned char *buf, size_t n)
@@ -112,7 +112,7 @@ static void showstream(int num)
if (n == 0)
break;
if (showbinary)
- fz_write(ctx, out, buf, n);
+ fz_write_data(ctx, out, buf, n);
else
showsafe(buf, n);
}
@@ -137,19 +137,19 @@ static void showobject(int num)
}
else
{
- fz_printf(ctx, out, "%d 0 obj\n", num);
+ fz_write_printf(ctx, out, "%d 0 obj\n", num);
pdf_print_obj(ctx, out, obj, 0);
- fz_printf(ctx, out, "\nstream\n");
+ fz_write_printf(ctx, out, "\nstream\n");
showstream(num);
- fz_printf(ctx, out, "endstream\n");
- fz_printf(ctx, out, "endobj\n\n");
+ fz_write_printf(ctx, out, "endstream\n");
+ fz_write_printf(ctx, out, "endobj\n\n");
}
}
else
{
- fz_printf(ctx, out, "%d 0 obj\n", num);
+ fz_write_printf(ctx, out, "%d 0 obj\n", num);
pdf_print_obj(ctx, out, obj, 0);
- fz_printf(ctx, out, "\nendobj\n\n");
+ fz_write_printf(ctx, out, "\nendobj\n\n");
}
pdf_drop_obj(ctx, obj);
@@ -178,17 +178,17 @@ static void showgrep(char *filename)
pdf_sort_dict(ctx, obj);
- fz_printf(ctx, out, "%s:%d: ", filename, i);
+ fz_write_printf(ctx, out, "%s:%d: ", filename, i);
pdf_print_obj(ctx, out, obj, 1);
- fz_printf(ctx, out, "\n");
+ fz_write_printf(ctx, out, "\n");
pdf_drop_obj(ctx, obj);
}
}
- fz_printf(ctx, out, "%s:trailer: ", filename);
+ fz_write_printf(ctx, out, "%s:trailer: ", filename);
pdf_print_obj(ctx, out, pdf_trailer(ctx, doc), 1);
- fz_printf(ctx, out, "\n");
+ fz_write_printf(ctx, out, "\n");
}
static void showoutline(void)
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-04 19:38:13 +0000