diff options
-rw-r--r-- | draw/draw_mesh.c | 2 | ||||
-rw-r--r-- | fitz/fitz-internal.h | 2 | ||||
-rw-r--r-- | fitz/fitz.h | 4 | ||||
-rw-r--r-- | fitz/res_colorspace.c | 14 | ||||
-rw-r--r-- | xps/xps_outline.c | 6 | ||||
-rw-r--r-- | xps/xps_resource.c | 4 | ||||
-rw-r--r-- | xps/xps_zip.c | 16 |
7 files changed, 24 insertions, 24 deletions
diff --git a/draw/draw_mesh.c b/draw/draw_mesh.c index 8be48e02..3f60130b 100644 --- a/draw/draw_mesh.c +++ b/draw/draw_mesh.c @@ -221,7 +221,7 @@ fz_paint_shade(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm, fz_pixmap if (shade->use_function) { fz_color_converter cc; - fz_find_color_converter(&cc, ctx, dest->colorspace, shade->colorspace); + fz_lookup_color_converter(&cc, ctx, dest->colorspace, shade->colorspace); for (i = 0; i < 256; i++) { cc.convert(&cc, color, shade->function[i]); diff --git a/fitz/fitz-internal.h b/fitz/fitz-internal.h index 40c7b516..e2bd2df4 100644 --- a/fitz/fitz-internal.h +++ b/fitz/fitz-internal.h @@ -1081,7 +1081,7 @@ struct fz_color_converter_s fz_colorspace *ss; }; -void fz_find_color_converter(fz_color_converter *cc, fz_context *ctx, fz_colorspace *ds, fz_colorspace *ss); +void fz_lookup_color_converter(fz_color_converter *cc, fz_context *ctx, fz_colorspace *ds, fz_colorspace *ss); /* * Fonts come in two variants: diff --git a/fitz/fitz.h b/fitz/fitz.h index 8817672d..fd999421 100644 --- a/fitz/fitz.h +++ b/fitz/fitz.h @@ -1418,10 +1418,10 @@ void fz_drop_bitmap(fz_context *ctx, fz_bitmap *bit); typedef struct fz_colorspace_s fz_colorspace; /* - fz_find_device_colorspace: Find a standard colorspace based upon + fz_lookup_device_colorspace: Find a standard colorspace based upon it's name. */ -fz_colorspace *fz_find_device_colorspace(fz_context *ctx, char *name); +fz_colorspace *fz_lookup_device_colorspace(fz_context *ctx, char *name); /* fz_colorspace_is_indexed: Return true, iff a given colorspace is diff --git a/fitz/res_colorspace.c b/fitz/res_colorspace.c index 2a99f9ba..9603f46d 100644 --- a/fitz/res_colorspace.c +++ b/fitz/res_colorspace.c @@ -243,7 +243,7 @@ fz_device_cmyk(fz_context *ctx) } fz_colorspace * -fz_find_device_colorspace(fz_context *ctx, char *name) +fz_lookup_device_colorspace(fz_context *ctx, char *name) { if (!strcmp(name, "DeviceGray")) return fz_device_gray(ctx); @@ -830,7 +830,7 @@ fz_std_conv_pixmap(fz_context *ctx, fz_pixmap *dst, fz_pixmap *src) { fz_color_converter cc; - fz_find_color_converter(&cc, ctx, ds, ss); + fz_lookup_color_converter(&cc, ctx, ds, ss); for (; xy > 0; xy--) { srcv[0] = *s++ / 255.0f * 100; @@ -851,7 +851,7 @@ fz_std_conv_pixmap(fz_context *ctx, fz_pixmap *dst, fz_pixmap *src) { fz_color_converter cc; - fz_find_color_converter(&cc, ctx, ds, ss); + fz_lookup_color_converter(&cc, ctx, ds, ss); for (; xy > 0; xy--) { for (k = 0; k < srcn; k++) @@ -872,7 +872,7 @@ fz_std_conv_pixmap(fz_context *ctx, fz_pixmap *dst, fz_pixmap *src) unsigned char lookup[FZ_MAX_COLORS * 256]; fz_color_converter cc; - fz_find_color_converter(&cc, ctx, ds, ss); + fz_lookup_color_converter(&cc, ctx, ds, ss); for (i = 0; i < 256; i++) { srcv[0] = i / 255.0f; @@ -899,7 +899,7 @@ fz_std_conv_pixmap(fz_context *ctx, fz_pixmap *dst, fz_pixmap *src) unsigned char *sold = &dummy; fz_color_converter cc; - fz_find_color_converter(&cc, ctx, ds, ss); + fz_lookup_color_converter(&cc, ctx, ds, ss); lookup = fz_new_hash_table(ctx, 509, srcn, -1); for (; xy > 0; xy--) @@ -1113,7 +1113,7 @@ cmyk2bgr(fz_color_converter *cc, float *dv, float *sv) #endif } -void fz_find_color_converter(fz_color_converter *cc, fz_context *ctx, fz_colorspace *ds, fz_colorspace *ss) +void fz_lookup_color_converter(fz_color_converter *cc, fz_context *ctx, fz_colorspace *ds, fz_colorspace *ss) { cc->ctx = ctx; cc->ds = ds; @@ -1173,7 +1173,7 @@ fz_convert_color(fz_context *ctx, fz_colorspace *ds, float *dv, fz_colorspace *s { fz_color_converter cc; - fz_find_color_converter(&cc, ctx, ds, ss); + fz_lookup_color_converter(&cc, ctx, ds, ss); cc.convert(&cc, dv, sv); } diff --git a/xps/xps_outline.c b/xps/xps_outline.c index aa1121d1..4e2a2620 100644 --- a/xps/xps_outline.c +++ b/xps/xps_outline.c @@ -5,13 +5,13 @@ */ static fz_outline * -xps_find_last_outline_at_level(fz_outline *node, int level, int target_level) +xps_lookup_last_outline_at_level(fz_outline *node, int level, int target_level) { while (node->next) node = node->next; if (level == target_level || !node->down) return node; - return xps_find_last_outline_at_level(node->down, level + 1, target_level); + return xps_lookup_last_outline_at_level(node->down, level + 1, target_level); } static fz_outline * @@ -46,7 +46,7 @@ xps_parse_document_outline(xps_document *doc, fz_xml *root) } else { - tail = xps_find_last_outline_at_level(head, 1, this_level); + tail = xps_lookup_last_outline_at_level(head, 1, this_level); if (this_level > last_level) tail->down = entry; else diff --git a/xps/xps_resource.c b/xps/xps_resource.c index b94b6d3e..3c0f8848 100644 --- a/xps/xps_resource.c +++ b/xps/xps_resource.c @@ -1,7 +1,7 @@ #include "muxps-internal.h" static fz_xml * -xps_find_resource(xps_document *doc, xps_resource *dict, char *name, char **urip) +xps_lookup_resource(xps_document *doc, xps_resource *dict, char *name, char **urip) { xps_resource *head, *node; for (head = dict; head; head = head->parent) @@ -33,7 +33,7 @@ xps_parse_resource_reference(xps_document *doc, xps_resource *dict, char *att, c if (s) *s = 0; - return xps_find_resource(doc, dict, name, urip); + return xps_lookup_resource(doc, dict, name, urip); } void diff --git a/xps/xps_zip.c b/xps/xps_zip.c index 8aa48662..007887cb 100644 --- a/xps/xps_zip.c +++ b/xps/xps_zip.c @@ -79,7 +79,7 @@ xps_compare_entries(const void *a0, const void *b0) } static xps_entry * -xps_find_zip_entry(xps_document *doc, char *name) +xps_lookup_zip_entry(xps_document *doc, char *name) { int l = 0; int r = doc->zip_count - 1; @@ -342,7 +342,7 @@ xps_read_zip_part(xps_document *doc, char *partname) name ++; /* All in one piece */ - ent = xps_find_zip_entry(doc, name); + ent = xps_lookup_zip_entry(doc, name); if (ent) { part = xps_new_part(doc, partname, ent->usize); @@ -364,11 +364,11 @@ xps_read_zip_part(xps_document *doc, char *partname) while (!seen_last) { sprintf(buf, "%s/[%d].piece", name, count); - ent = xps_find_zip_entry(doc, buf); + ent = xps_lookup_zip_entry(doc, buf); if (!ent) { sprintf(buf, "%s/[%d].last.piece", name, count); - ent = xps_find_zip_entry(doc, buf); + ent = xps_lookup_zip_entry(doc, buf); seen_last = (ent != NULL); } if (!ent) @@ -390,7 +390,7 @@ xps_read_zip_part(xps_document *doc, char *partname) sprintf(buf, "%s/[%d].piece", name, i); else sprintf(buf, "%s/[%d].last.piece", name, i); - ent = xps_find_zip_entry(doc, buf); + ent = xps_lookup_zip_entry(doc, buf); fz_try(doc->ctx) { xps_read_zip_entry(doc, ent, part->data + offset); @@ -415,13 +415,13 @@ xps_has_zip_part(xps_document *doc, char *name) char buf[2048]; if (name[0] == '/') name++; - if (xps_find_zip_entry(doc, name)) + if (xps_lookup_zip_entry(doc, name)) return 1; sprintf(buf, "%s/[0].piece", name); - if (xps_find_zip_entry(doc, buf)) + if (xps_lookup_zip_entry(doc, buf)) return 1; sprintf(buf, "%s/[0].last.piece", name); - if (xps_find_zip_entry(doc, buf)) + if (xps_lookup_zip_entry(doc, buf)) return 1; return 0; } |