diff options
| author | Paul Gardiner <paulg.artifex@glidos.net> | 2012-08-29 10:58:09 +0100 |
|---|---|---|
| committer | Paul Gardiner <paulg.artifex@glidos.net> | 2012-08-29 10:58:09 +0100 |
| commit | 6a5b8879b3b3b2a9ef085f38c1758d62456b921b (patch) | |
| tree | f45fc1a9f32dcd31f335d27fffba75e4ceb9a23c /pdf/mupdf.h | |
| parent | d85ad485bb64508bc59cfd4977cb5a37cf882070 (diff) | |
| parent | 25552e9f2ec3f17a0ce1cbd8d7818170d132959a (diff) | |
| download | mupdf-6a5b8879b3b3b2a9ef085f38c1758d62456b921b.tar.xz | |
Merge branch 'master' into forms
Conflicts:
cbz/mucbz.c
pdf/pdf_parse.c
pdf/pdf_form.c
xps/xps_zip.c
Diffstat (limited to 'pdf/mupdf.h')
| -rw-r--r-- | pdf/mupdf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pdf/mupdf.h b/pdf/mupdf.h index f2d235b9..16b0f58b 100644 --- a/pdf/mupdf.h +++ b/pdf/mupdf.h @@ -17,7 +17,7 @@ pdf_obj *pdf_new_null(fz_context *ctx); pdf_obj *pdf_new_bool(fz_context *ctx, int b); pdf_obj *pdf_new_int(fz_context *ctx, int i); pdf_obj *pdf_new_real(fz_context *ctx, float f); -pdf_obj *fz_new_name(fz_context *ctx, char *str); +pdf_obj *pdf_new_name(fz_context *ctx, char *str); pdf_obj *pdf_new_string(fz_context *ctx, char *str, int len); pdf_obj *pdf_new_indirect(fz_context *ctx, int num, int gen, void *doc); pdf_obj *pdf_new_array(fz_context *ctx, int initialcap); |