diff options
author | Tor Andersson <tor.andersson@artifex.com> | 2017-03-15 17:26:52 +0100 |
---|---|---|
committer | Tor Andersson <tor.andersson@artifex.com> | 2017-03-22 12:07:26 +0100 |
commit | 8e791ab5cd73dc783aded93f2dd7c77d89623fe8 (patch) | |
tree | b96eb72513bf2dd89517cd59efee051b7b2a5286 /source/fitz | |
parent | cfb66cd25bbf31857b471735e5ff0f7c2aea4d3c (diff) | |
download | mupdf-8e791ab5cd73dc783aded93f2dd7c77d89623fe8.tar.xz |
Always use %g for short-as-possible format character.
Call fz_append_string instead of fz_append_printf for static strings.
Call fz_write_string instead of fz_write_printf for static strings.
Diffstat (limited to 'source/fitz')
-rw-r--r-- | source/fitz/output-pcl.c | 8 | ||||
-rw-r--r-- | source/fitz/output-ps.c | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/source/fitz/output-pcl.c b/source/fitz/output-pcl.c index ab95f6aa..e26b8c34 100644 --- a/source/fitz/output-pcl.c +++ b/source/fitz/output-pcl.c @@ -736,7 +736,7 @@ color_pcl_write_header(fz_context *ctx, fz_band_writer *writer_) /* Raster presentation */ /* Print in orientation of the logical page */ - fz_write_printf(ctx, out, "\033&r0F"); + fz_write_string(ctx, out, "\033&r0F"); /* Set color mode */ fz_write_data(ctx, out, "\033*v6W" @@ -762,11 +762,11 @@ color_pcl_write_header(fz_context *ctx, fz_band_writer *writer_) /* start raster graphics */ /* 0 = start at default left graphics margin */ - fz_write_printf(ctx, out, "\033*r0A"); + fz_write_string(ctx, out, "\033*r0A"); /* Now output the actual bitmap */ /* Adaptive Compression */ - fz_write_printf(ctx, out, "\033*b5M"); + fz_write_string(ctx, out, "\033*b5M"); } static void @@ -921,7 +921,7 @@ color_pcl_write_trailer(fz_context *ctx, fz_band_writer *writer_) } /* End Raster Graphics */ - fz_write_printf(ctx, out, "\033*rC"); + fz_write_string(ctx, out, "\033*rC"); } static void diff --git a/source/fitz/output-ps.c b/source/fitz/output-ps.c index 9b6aeb06..ef90dadc 100644 --- a/source/fitz/output-ps.c +++ b/source/fitz/output-ps.c @@ -81,13 +81,13 @@ ps_write_header(fz_context *ctx, fz_band_writer *writer_) switch(n) { case 1: - fz_write_printf(ctx, out, "/DeviceGray setcolorspace\n"); + fz_write_string(ctx, out, "/DeviceGray setcolorspace\n"); break; case 3: - fz_write_printf(ctx, out, "/DeviceRGB setcolorspace\n"); + fz_write_string(ctx, out, "/DeviceRGB setcolorspace\n"); break; case 4: - fz_write_printf(ctx, out, "/DeviceCMYK setcolorspace\n"); + fz_write_string(ctx, out, "/DeviceCMYK setcolorspace\n"); break; default: fz_throw(ctx, FZ_ERROR_GENERIC, "Unexpected colorspace for ps output"); @@ -97,7 +97,7 @@ ps_write_header(fz_context *ctx, fz_band_writer *writer_) "/ImageType 1\n" "/Width %d\n" "/Height %d\n" - "/ImageMatrix [ %f 0 0 -%f 0 %d ]\n" + "/ImageMatrix [ %g 0 0 -%g 0 %d ]\n" "/MultipleDataSources false\n" "/DataSource DataFile\n" "/BitsPerComponent 8\n" @@ -124,8 +124,8 @@ ps_write_trailer(fz_context *ctx, fz_band_writer *writer_) if (err != Z_STREAM_END) fz_throw(ctx, FZ_ERROR_GENERIC, "compression error %d", err); - fz_write(ctx, out, writer->output, writer->output_size - writer->stream.avail_out); - fz_write_printf(ctx, out, "\nshowpage\n%%%%PageTrailer\n%%%%EndPageTrailer\n\n"); + fz_write_data(ctx, out, writer->output, writer->output_size - writer->stream.avail_out); + fz_write_string(ctx, out, "\nshowpage\n%%%%PageTrailer\n%%%%EndPageTrailer\n\n"); } static void |