summaryrefslogtreecommitdiff
path: root/pdf
diff options
context:
space:
mode:
Diffstat (limited to 'pdf')
-rw-r--r--pdf/base_object.c6
-rw-r--r--pdf/mupdf-internal.h30
-rw-r--r--pdf/mupdf.h6
-rw-r--r--pdf/pdf_annot.c2
-rw-r--r--pdf/pdf_cmap.c6
-rw-r--r--pdf/pdf_cmap_load.c4
-rw-r--r--pdf/pdf_cmap_parse.c2
-rw-r--r--pdf/pdf_colorspace.c2
-rw-r--r--pdf/pdf_crypt.c10
-rw-r--r--pdf/pdf_font.c12
-rw-r--r--pdf/pdf_fontfile.c30
-rw-r--r--pdf/pdf_interpret.c6
-rw-r--r--pdf/pdf_metrics.c6
-rw-r--r--pdf/pdf_page.c2
-rw-r--r--pdf/pdf_store.c2
-rw-r--r--pdf/pdf_xref.c2
16 files changed, 64 insertions, 64 deletions
diff --git a/pdf/base_object.c b/pdf/base_object.c
index 1dc07f1a..460b89f2 100644
--- a/pdf/base_object.c
+++ b/pdf/base_object.c
@@ -1254,13 +1254,13 @@ pdf_fprint_obj(FILE *fp, pdf_obj *obj, int tight)
}
void
-pdf_debug_obj(pdf_obj *obj)
+pdf_print_obj(pdf_obj *obj)
{
pdf_fprint_obj(stdout, obj, 0);
}
void
-pdf_debug_ref(pdf_obj *ref)
+pdf_print_ref(pdf_obj *ref)
{
- pdf_debug_obj(pdf_resolve_indirect(ref));
+ pdf_print_obj(pdf_resolve_indirect(ref));
}
diff --git a/pdf/mupdf-internal.h b/pdf/mupdf-internal.h
index faec16b5..3e4a4729 100644
--- a/pdf/mupdf-internal.h
+++ b/pdf/mupdf-internal.h
@@ -201,7 +201,7 @@ fz_stream *pdf_open_image_decomp_stream(fz_context *ctx, fz_buffer *, pdf_image_
void pdf_repair_xref(pdf_document *doc, pdf_lexbuf *buf);
void pdf_repair_obj_stms(pdf_document *doc);
-void pdf_debug_xref(pdf_document *);
+void pdf_print_xref(pdf_document *);
void pdf_resize_xref(pdf_document *doc, int newcap);
/*
@@ -215,12 +215,12 @@ void pdf_crypt_obj(fz_context *ctx, pdf_crypt *crypt, pdf_obj *obj, int num, int
fz_stream *pdf_open_crypt(fz_stream *chain, pdf_crypt *crypt, int num, int gen);
fz_stream *pdf_open_crypt_with_filter(fz_stream *chain, pdf_crypt *crypt, char *name, int num, int gen);
-int pdf_get_crypt_revision(pdf_document *doc);
-char *pdf_get_crypt_method(pdf_document *doc);
-int pdf_get_crypt_length(pdf_document *doc);
-unsigned char *pdf_get_crypt_key(pdf_document *doc);
+int pdf_crypt_revision(pdf_document *doc);
+char *pdf_crypt_method(pdf_document *doc);
+int pdf_crypt_length(pdf_document *doc);
+unsigned char *pdf_crypt_key(pdf_document *doc);
-void pdf_debug_crypt(pdf_crypt *crypt);
+void pdf_print_crypt(pdf_crypt *crypt);
/*
* Functions, Colorspaces, Shadings and Images
@@ -338,9 +338,9 @@ void pdf_drop_cmap(fz_context *ctx, pdf_cmap *cmap);
void pdf_free_cmap_imp(fz_context *ctx, fz_storable *cmap);
unsigned int pdf_cmap_size(fz_context *ctx, pdf_cmap *cmap);
-void pdf_debug_cmap(fz_context *ctx, pdf_cmap *cmap);
-int pdf_get_wmode(fz_context *ctx, pdf_cmap *cmap);
-void pdf_set_wmode(fz_context *ctx, pdf_cmap *cmap, int wmode);
+void pdf_print_cmap(fz_context *ctx, pdf_cmap *cmap);
+int pdf_cmap_wmode(fz_context *ctx, pdf_cmap *cmap);
+void pdf_set_cmap_wmode(fz_context *ctx, pdf_cmap *cmap, int wmode);
void pdf_set_usecmap(fz_context *ctx, pdf_cmap *cmap, pdf_cmap *usecmap);
void pdf_add_codespace(fz_context *ctx, pdf_cmap *cmap, int low, int high, int n);
@@ -456,16 +456,16 @@ void pdf_add_hmtx(fz_context *ctx, pdf_font_desc *font, int lo, int hi, int w);
void pdf_add_vmtx(fz_context *ctx, pdf_font_desc *font, int lo, int hi, int x, int y, int w);
void pdf_end_hmtx(fz_context *ctx, pdf_font_desc *font);
void pdf_end_vmtx(fz_context *ctx, pdf_font_desc *font);
-pdf_hmtx pdf_get_hmtx(fz_context *ctx, pdf_font_desc *font, int cid);
-pdf_vmtx pdf_get_vmtx(fz_context *ctx, pdf_font_desc *font, int cid);
+pdf_hmtx pdf_lookup_hmtx(fz_context *ctx, pdf_font_desc *font, int cid);
+pdf_vmtx pdf_lookup_vmtx(fz_context *ctx, pdf_font_desc *font, int cid);
void pdf_load_to_unicode(pdf_document *doc, pdf_font_desc *font, char **strings, char *collection, pdf_obj *cmapstm);
int pdf_font_cid_to_gid(fz_context *ctx, pdf_font_desc *fontdesc, int cid);
-unsigned char *pdf_find_builtin_font(char *name, unsigned int *len);
-unsigned char *pdf_find_substitute_font(int mono, int serif, int bold, int italic, unsigned int *len);
-unsigned char *pdf_find_substitute_cjk_font(int ros, int serif, unsigned int *len);
+unsigned char *pdf_lookup_builtin_font(char *name, unsigned int *len);
+unsigned char *pdf_lookup_substitute_font(int mono, int serif, int bold, int italic, unsigned int *len);
+unsigned char *pdf_lookup_substitute_cjk_font(int ros, int serif, unsigned int *len);
pdf_font_desc *pdf_load_type3_font(pdf_document *doc, pdf_obj *rdb, pdf_obj *obj);
pdf_font_desc *pdf_load_font(pdf_document *doc, pdf_obj *rdb, pdf_obj *obj);
@@ -474,7 +474,7 @@ pdf_font_desc *pdf_new_font_desc(fz_context *ctx);
pdf_font_desc *pdf_keep_font(fz_context *ctx, pdf_font_desc *fontdesc);
void pdf_drop_font(fz_context *ctx, pdf_font_desc *font);
-void pdf_debug_font(fz_context *ctx, pdf_font_desc *fontdesc);
+void pdf_print_font(fz_context *ctx, pdf_font_desc *fontdesc);
/*
* Interactive features
diff --git a/pdf/mupdf.h b/pdf/mupdf.h
index 7566bc36..b88f7423 100644
--- a/pdf/mupdf.h
+++ b/pdf/mupdf.h
@@ -79,8 +79,8 @@ void pdf_dict_dels(pdf_obj *dict, char *key);
void pdf_sort_dict(pdf_obj *dict);
int pdf_fprint_obj(FILE *fp, pdf_obj *obj, int tight);
-void pdf_debug_obj(pdf_obj *obj);
-void pdf_debug_ref(pdf_obj *obj);
+void pdf_print_obj(pdf_obj *obj);
+void pdf_print_ref(pdf_obj *obj);
char *pdf_to_utf8(fz_context *ctx, pdf_obj *src);
unsigned short *pdf_to_ucs2(fz_context *ctx, pdf_obj *src); /* sumatrapdf */
@@ -164,7 +164,7 @@ int pdf_has_permission(pdf_document *doc, int p);
typedef struct pdf_page_s pdf_page;
-int pdf_find_page_number(pdf_document *doc, pdf_obj *pageobj);
+int pdf_lookup_page_number(pdf_document *doc, pdf_obj *pageobj);
int pdf_count_pages(pdf_document *doc);
/*
diff --git a/pdf/pdf_annot.c b/pdf/pdf_annot.c
index bd0ad808..28300c9b 100644
--- a/pdf/pdf_annot.c
+++ b/pdf/pdf_annot.c
@@ -60,7 +60,7 @@ pdf_parse_link_dest(pdf_document *xref, pdf_obj *dest)
if (pdf_is_int(obj))
ld.ld.gotor.page = pdf_to_int(obj);
else
- ld.ld.gotor.page = pdf_find_page_number(xref, obj);
+ ld.ld.gotor.page = pdf_lookup_page_number(xref, obj);
ld.kind = FZ_LINK_GOTO;
ld.ld.gotor.flags = 0;
diff --git a/pdf/pdf_cmap.c b/pdf/pdf_cmap.c
index 712ebfe7..3c4d07bc 100644
--- a/pdf/pdf_cmap.c
+++ b/pdf/pdf_cmap.c
@@ -98,19 +98,19 @@ pdf_set_usecmap(fz_context *ctx, pdf_cmap *cmap, pdf_cmap *usecmap)
}
int
-pdf_get_wmode(fz_context *ctx, pdf_cmap *cmap)
+pdf_cmap_wmode(fz_context *ctx, pdf_cmap *cmap)
{
return cmap->wmode;
}
void
-pdf_set_wmode(fz_context *ctx, pdf_cmap *cmap, int wmode)
+pdf_set_cmap_wmode(fz_context *ctx, pdf_cmap *cmap, int wmode)
{
cmap->wmode = wmode;
}
void
-pdf_debug_cmap(fz_context *ctx, pdf_cmap *cmap)
+pdf_print_cmap(fz_context *ctx, pdf_cmap *cmap)
{
int i, k, n;
diff --git a/pdf/pdf_cmap_load.c b/pdf/pdf_cmap_load.c
index 6867d845..8ab7e646 100644
--- a/pdf/pdf_cmap_load.c
+++ b/pdf/pdf_cmap_load.c
@@ -47,7 +47,7 @@ pdf_load_embedded_cmap(pdf_document *xref, pdf_obj *stmobj)
wmode = pdf_dict_gets(stmobj, "WMode");
if (pdf_is_int(wmode))
- pdf_set_wmode(ctx, cmap, pdf_to_int(wmode));
+ pdf_set_cmap_wmode(ctx, cmap, pdf_to_int(wmode));
obj = pdf_dict_gets(stmobj, "UseCMap");
if (pdf_is_name(obj))
{
@@ -97,7 +97,7 @@ pdf_new_identity_cmap(fz_context *ctx, int wmode, int bytes)
pdf_add_codespace(ctx, cmap, 0x0000, 0xffff, bytes);
pdf_map_range_to_range(ctx, cmap, 0x0000, 0xffff, 0);
pdf_sort_cmap(ctx, cmap);
- pdf_set_wmode(ctx, cmap, wmode);
+ pdf_set_cmap_wmode(ctx, cmap, wmode);
}
fz_catch(ctx)
{
diff --git a/pdf/pdf_cmap_parse.c b/pdf/pdf_cmap_parse.c
index 3396e3ae..93dd97c9 100644
--- a/pdf/pdf_cmap_parse.c
+++ b/pdf/pdf_cmap_parse.c
@@ -88,7 +88,7 @@ pdf_parse_wmode(fz_context *ctx, pdf_cmap *cmap, fz_stream *file)
/* RJW: Lost debugging: "syntaxerror in cmap" */
if (tok == PDF_TOK_INT)
- pdf_set_wmode(ctx, cmap, buf.i);
+ pdf_set_cmap_wmode(ctx, cmap, buf.i);
else
fz_warn(ctx, "expected integer after WMode in cmap");
}
diff --git a/pdf/pdf_colorspace.c b/pdf/pdf_colorspace.c
index 5bf84535..f195fa08 100644
--- a/pdf/pdf_colorspace.c
+++ b/pdf/pdf_colorspace.c
@@ -193,7 +193,7 @@ pdf_expand_indexed_pixmap(fz_context *ctx, fz_pixmap *src)
lookup = idx->lookup;
n = idx->base->n;
- dst = fz_new_pixmap_with_rect(ctx, idx->base, fz_bound_pixmap(src));
+ dst = fz_new_pixmap_with_bbox(ctx, idx->base, fz_bound_pixmap(src));
s = src->samples;
d = dst->samples;
diff --git a/pdf/pdf_crypt.c b/pdf/pdf_crypt.c
index 2927527e..b65786d9 100644
--- a/pdf/pdf_crypt.c
+++ b/pdf/pdf_crypt.c
@@ -618,7 +618,7 @@ pdf_has_permission(pdf_document *xref, int p)
}
unsigned char *
-pdf_get_crypt_key(pdf_document *xref)
+pdf_crypt_key(pdf_document *xref)
{
if (xref->crypt)
return xref->crypt->key;
@@ -626,7 +626,7 @@ pdf_get_crypt_key(pdf_document *xref)
}
int
-pdf_get_crypt_revision(pdf_document *xref)
+pdf_crypt_revision(pdf_document *xref)
{
if (xref->crypt)
return xref->crypt->v;
@@ -634,7 +634,7 @@ pdf_get_crypt_revision(pdf_document *xref)
}
char *
-pdf_get_crypt_method(pdf_document *xref)
+pdf_crypt_method(pdf_document *xref)
{
if (xref->crypt)
{
@@ -651,7 +651,7 @@ pdf_get_crypt_method(pdf_document *xref)
}
int
-pdf_get_crypt_length(pdf_document *xref)
+pdf_crypt_length(pdf_document *xref)
{
if (xref->crypt)
return xref->crypt->length;
@@ -822,7 +822,7 @@ pdf_open_crypt_with_filter(fz_stream *chain, pdf_crypt *crypt, char *name, int n
return chain;
}
-void pdf_debug_crypt(pdf_crypt *crypt)
+void pdf_print_crypt(pdf_crypt *crypt)
{
int i;
diff --git a/pdf/pdf_font.c b/pdf/pdf_font.c
index 11c97d37..ab60af72 100644
--- a/pdf/pdf_font.c
+++ b/pdf/pdf_font.c
@@ -178,7 +178,7 @@ pdf_load_builtin_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fontname)
unsigned char *data;
unsigned int len;
- data = pdf_find_builtin_font(fontname, &len);
+ data = pdf_lookup_builtin_font(fontname, &len);
if (!data)
fz_throw(ctx, "cannot find builtin font: '%s'", fontname);
@@ -195,7 +195,7 @@ pdf_load_substitute_font(fz_context *ctx, pdf_font_desc *fontdesc, int mono, int
unsigned char *data;
unsigned int len;
- data = pdf_find_substitute_font(mono, serif, bold, italic, &len);
+ data = pdf_lookup_substitute_font(mono, serif, bold, italic, &len);
if (!data)
fz_throw(ctx, "cannot find substitute font");
@@ -213,7 +213,7 @@ pdf_load_substitute_cjk_font(fz_context *ctx, pdf_font_desc *fontdesc, int ros,
unsigned char *data;
unsigned int len;
- data = pdf_find_substitute_cjk_font(ros, serif, &len);
+ data = pdf_lookup_substitute_cjk_font(ros, serif, &len);
if (!data)
fz_throw(ctx, "cannot find builtin CJK font");
@@ -789,7 +789,7 @@ load_cid_font(pdf_document *xref, pdf_obj *dict, pdf_obj *encoding, pdf_obj *to_
}
fontdesc->size += pdf_cmap_size(ctx, fontdesc->encoding);
- pdf_set_font_wmode(ctx, fontdesc, pdf_get_wmode(ctx, fontdesc->encoding));
+ pdf_set_font_wmode(ctx, fontdesc, pdf_cmap_wmode(ctx, fontdesc->encoding));
if (kind == TRUETYPE)
{
@@ -881,7 +881,7 @@ load_cid_font(pdf_document *xref, pdf_obj *dict, pdf_obj *encoding, pdf_obj *to_
/* Vertical */
- if (pdf_get_wmode(ctx, fontdesc->encoding) == 1)
+ if (pdf_cmap_wmode(ctx, fontdesc->encoding) == 1)
{
int dw2y = 880;
int dw2w = -1000;
@@ -1127,7 +1127,7 @@ pdf_load_font(pdf_document *xref, pdf_obj *rdb, pdf_obj *dict)
}
void
-pdf_debug_font(fz_context *ctx, pdf_font_desc *fontdesc)
+pdf_print_font(fz_context *ctx, pdf_font_desc *fontdesc)
{
int i;
diff --git a/pdf/pdf_fontfile.c b/pdf/pdf_fontfile.c
index 4dbbe91c..b67d8a32 100644
--- a/pdf/pdf_fontfile.c
+++ b/pdf/pdf_fontfile.c
@@ -16,7 +16,7 @@
#endif
unsigned char *
-pdf_find_builtin_font(char *name, unsigned int *len)
+pdf_lookup_builtin_font(char *name, unsigned int *len)
{
if (!strcmp("Courier", name)) {
*len = sizeof pdf_font_NimbusMonL_Regu;
@@ -79,32 +79,32 @@ pdf_find_builtin_font(char *name, unsigned int *len)
}
unsigned char *
-pdf_find_substitute_font(int mono, int serif, int bold, int italic, unsigned int *len)
+pdf_lookup_substitute_font(int mono, int serif, int bold, int italic, unsigned int *len)
{
#ifdef NODROIDFONT
if (mono) {
if (bold) {
- if (italic) return pdf_find_builtin_font("Courier-BoldOblique", len);
- else return pdf_find_builtin_font("Courier-Bold", len);
+ if (italic) return pdf_lookup_builtin_font("Courier-BoldOblique", len);
+ else return pdf_lookup_builtin_font("Courier-Bold", len);
} else {
- if (italic) return pdf_find_builtin_font("Courier-Oblique", len);
- else return pdf_find_builtin_font("Courier", len);
+ if (italic) return pdf_lookup_builtin_font("Courier-Oblique", len);
+ else return pdf_lookup_builtin_font("Courier", len);
}
} else if (serif) {
if (bold) {
- if (italic) return pdf_find_builtin_font("Times-BoldItalic", len);
- else return pdf_find_builtin_font("Times-Bold", len);
+ if (italic) return pdf_lookup_builtin_font("Times-BoldItalic", len);
+ else return pdf_lookup_builtin_font("Times-Bold", len);
} else {
- if (italic) return pdf_find_builtin_font("Times-Italic", len);
- else return pdf_find_builtin_font("Times-Roman", len);
+ if (italic) return pdf_lookup_builtin_font("Times-Italic", len);
+ else return pdf_lookup_builtin_font("Times-Roman", len);
}
} else {
if (bold) {
- if (italic) return pdf_find_builtin_font("Helvetica-BoldOblique", len);
- else return pdf_find_builtin_font("Helvetica-Bold", len);
+ if (italic) return pdf_lookup_builtin_font("Helvetica-BoldOblique", len);
+ else return pdf_lookup_builtin_font("Helvetica-Bold", len);
} else {
- if (italic) return pdf_find_builtin_font("Helvetica-Oblique", len);
- else return pdf_find_builtin_font("Helvetica", len);
+ if (italic) return pdf_lookup_builtin_font("Helvetica-Oblique", len);
+ else return pdf_lookup_builtin_font("Helvetica", len);
}
}
#else
@@ -119,7 +119,7 @@ pdf_find_substitute_font(int mono, int serif, int bold, int italic, unsigned int
}
unsigned char *
-pdf_find_substitute_cjk_font(int ros, int serif, unsigned int *len)
+pdf_lookup_substitute_cjk_font(int ros, int serif, unsigned int *len)
{
#ifndef NOCJKFONT
*len = sizeof pdf_font_DroidSansFallback;
diff --git a/pdf/pdf_interpret.c b/pdf/pdf_interpret.c
index 1c2a11f3..3888b35f 100644
--- a/pdf/pdf_interpret.c
+++ b/pdf/pdf_interpret.c
@@ -709,7 +709,7 @@ pdf_show_char(pdf_csi *csi, int cid)
if (fontdesc->wmode == 1)
{
- v = pdf_get_vmtx(ctx, fontdesc, cid);
+ v = pdf_lookup_vmtx(ctx, fontdesc, cid);
tsm.e -= v.x * gstate->size * 0.001f;
tsm.f -= v.y * gstate->size * 0.001f;
}
@@ -767,7 +767,7 @@ pdf_show_char(pdf_csi *csi, int cid)
if (fontdesc->wmode == 0)
{
- h = pdf_get_hmtx(ctx, fontdesc, cid);
+ h = pdf_lookup_hmtx(ctx, fontdesc, cid);
w0 = h.w * 0.001f;
tx = (w0 * gstate->size + gstate->char_space) * gstate->scale;
csi->tm = fz_concat(fz_translate(tx, 0), csi->tm);
@@ -1527,7 +1527,7 @@ pdf_run_extgstate(pdf_csi *csi, pdf_obj *rdb, pdf_obj *extgstate)
{
if (pdf_is_array(val))
val = pdf_array_get(val, 0);
- gstate->blendmode = fz_find_blendmode(pdf_to_name(val));
+ gstate->blendmode = fz_lookup_blendmode(pdf_to_name(val));
}
else if (!strcmp(s, "SMask"))
diff --git a/pdf/pdf_metrics.c b/pdf/pdf_metrics.c
index ae4405ed..888757c0 100644
--- a/pdf/pdf_metrics.c
+++ b/pdf/pdf_metrics.c
@@ -85,7 +85,7 @@ pdf_end_vmtx(fz_context *ctx, pdf_font_desc *font)
}
pdf_hmtx
-pdf_get_hmtx(fz_context *ctx, pdf_font_desc *font, int cid)
+pdf_lookup_hmtx(fz_context *ctx, pdf_font_desc *font, int cid)
{
int l = 0;
int r = font->hmtx_len - 1;
@@ -110,7 +110,7 @@ notfound:
}
pdf_vmtx
-pdf_get_vmtx(fz_context *ctx, pdf_font_desc *font, int cid)
+pdf_lookup_vmtx(fz_context *ctx, pdf_font_desc *font, int cid)
{
pdf_hmtx h;
pdf_vmtx v;
@@ -133,7 +133,7 @@ pdf_get_vmtx(fz_context *ctx, pdf_font_desc *font, int cid)
}
notfound:
- h = pdf_get_hmtx(ctx, font, cid);
+ h = pdf_lookup_hmtx(ctx, font, cid);
v = font->dvmtx;
v.x = h.w / 2;
return v;
diff --git a/pdf/pdf_page.c b/pdf/pdf_page.c
index 5b9106d1..c4083d20 100644
--- a/pdf/pdf_page.c
+++ b/pdf/pdf_page.c
@@ -140,7 +140,7 @@ pdf_count_pages(pdf_document *xref)
}
int
-pdf_find_page_number(pdf_document *xref, pdf_obj *page)
+pdf_lookup_page_number(pdf_document *xref, pdf_obj *page)
{
int i, num = pdf_to_num(page);
diff --git a/pdf/pdf_store.c b/pdf/pdf_store.c
index ae8eac9a..2a3b8b07 100644
--- a/pdf/pdf_store.c
+++ b/pdf/pdf_store.c
@@ -40,7 +40,7 @@ pdf_debug_key(void *key_)
{
printf("(%d %d R) ", pdf_to_num(key), pdf_to_gen(key));
} else
- pdf_debug_obj(key);
+ pdf_print_obj(key);
}
static fz_store_type pdf_obj_store_type =
diff --git a/pdf/pdf_xref.c b/pdf/pdf_xref.c
index 9e60955c..e0e9f190 100644
--- a/pdf/pdf_xref.c
+++ b/pdf/pdf_xref.c
@@ -843,7 +843,7 @@ pdf_close_document(pdf_document *xref)
}
void
-pdf_debug_xref(pdf_document *xref)
+pdf_print_xref(pdf_document *xref)
{
int i;
printf("xref\n0 %d\n", xref->len);
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-05 05:18:03 +0000