diff options
| author | Robin Watts <robin.watts@artifex.com> | 2014-03-13 16:08:35 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2014-03-13 16:34:21 +0000 |
| commit | 604b0ca88e1b0275d5a8021d1a90700649142b4a (patch) | |
| tree | fc9054779e4da1beeb2a462cb2bcd90d940cdeb8 | |
| parent | bbd29699598cc56e096ca1badf987f6e661673a1 (diff) | |
| download | mupdf-604b0ca88e1b0275d5a8021d1a90700649142b4a.tar.xz | |
Make pdf_output_obj consistent with pdf_fprint_obj
Pass in the 'tight' flag.
| -rw-r--r-- | include/mupdf/pdf/object.h | 2 | ||||
| -rw-r--r-- | source/pdf/pdf-object.c | 3 | ||||
| -rw-r--r-- | source/pdf/pdf-op-buffer.c | 12 |
3 files changed, 8 insertions, 9 deletions
diff --git a/include/mupdf/pdf/object.h b/include/mupdf/pdf/object.h index 2c9600a2..c8417224 100644 --- a/include/mupdf/pdf/object.h +++ b/include/mupdf/pdf/object.h @@ -112,7 +112,7 @@ int pdf_obj_parent_num(pdf_obj *obj); int pdf_sprint_obj(char *s, int n, pdf_obj *obj, int tight); int pdf_fprint_obj(FILE *fp, pdf_obj *obj, int tight); -int pdf_output_obj(fz_output *out, pdf_obj *obj); +int pdf_output_obj(fz_output *out, pdf_obj *obj, int tight); #ifndef NDEBUG void pdf_print_obj(pdf_obj *obj); diff --git a/source/pdf/pdf-object.c b/source/pdf/pdf-object.c index 1576525e..88ed25e5 100644 --- a/source/pdf/pdf-object.c +++ b/source/pdf/pdf-object.c @@ -1742,12 +1742,11 @@ pdf_fprint_obj(FILE *fp, pdf_obj *obj, int tight) return n; } -int pdf_output_obj(fz_output *out, pdf_obj *obj) +int pdf_output_obj(fz_output *out, pdf_obj *obj, int tight) { char buf[1024]; char *ptr; int n; - int tight = 1; n = pdf_sprint_obj(NULL, 0, obj, tight); if ((n + 1) < sizeof buf) diff --git a/source/pdf/pdf-op-buffer.c b/source/pdf/pdf-op-buffer.c index ed7c28aa..7660b03e 100644 --- a/source/pdf/pdf-op-buffer.c +++ b/source/pdf/pdf-op-buffer.c @@ -61,7 +61,7 @@ put_string_or_obj(pdf_csi *csi, fz_output *out) if (csi->string_len) put_string(csi, out); else - pdf_output_obj(out, csi->obj); + pdf_output_obj(out, csi->obj, 1); } static void @@ -105,7 +105,7 @@ pdf_buffer_BDC(pdf_csi *csi, void *state_) pdf_buffer_state *state = (pdf_buffer_state *)state_; fz_printf(state->out, "/%s ", csi->name); - pdf_output_obj(state->out, csi->obj); + pdf_output_obj(state->out, csi->obj, 1); fz_printf(state->out, " BDC\n"); } @@ -126,7 +126,7 @@ pdf_buffer_BI(pdf_csi *csi, void *state_) fz_read_byte(file); fz_printf(state->out, "BI "); - pdf_output_obj(state->out, obj); + pdf_output_obj(state->out, obj, 1); fz_printf(state->out, " ID\n"); /* FIXME */ @@ -172,7 +172,7 @@ pdf_buffer_DP(pdf_csi *csi, void *state_) pdf_buffer_state *state = (pdf_buffer_state *)state_; fz_printf(state->out, "/%s ", csi->name); - pdf_output_obj(state->out, csi->obj); + pdf_output_obj(state->out, csi->obj, 1); fz_printf(state->out, " DP\n"); } @@ -318,7 +318,7 @@ pdf_buffer_TJ(pdf_csi *csi, void *state_) { pdf_buffer_state *state = (pdf_buffer_state *)state_; - pdf_output_obj(state->out, csi->obj); + pdf_output_obj(state->out, csi->obj, 1); fz_printf(state->out, " TJ\n"); } @@ -462,7 +462,7 @@ pdf_buffer_d(pdf_csi *csi, void *state_) { pdf_buffer_state *state = (pdf_buffer_state *)state_; - pdf_output_obj(state->out, csi->obj); + pdf_output_obj(state->out, csi->obj, 1); fz_printf(state->out, " %f d\n", csi->stack[0]); } |