From 89eb79f950acbfcb719804f82708f8a49c788c70 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 17 Aug 2015 06:25:12 +0000 Subject: texk/dvipdfm-x: Still more static functions git-svn-id: svn://tug.org/texlive/trunk@38135 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/ChangeLog | 20 ++++++++++++++++++++ Build/source/texk/dvipdfm-x/pdfcolor.c | 6 ------ Build/source/texk/dvipdfm-x/pdfcolor.h | 1 - Build/source/texk/dvipdfm-x/pdfdev.h | 3 --- Build/source/texk/dvipdfm-x/pdfdoc.c | 11 ++--------- Build/source/texk/dvipdfm-x/pdfdoc.h | 6 ------ Build/source/texk/dvipdfm-x/pdfdraw.h | 6 ------ Build/source/texk/dvipdfm-x/pdfnames.c | 2 +- Build/source/texk/dvipdfm-x/pdfnames.h | 2 -- Build/source/texk/dvipdfm-x/pdfximage.h | 3 --- Build/source/texk/dvipdfm-x/tfm.c | 2 ++ Build/source/texk/dvipdfm-x/tfm.h | 4 ++-- Build/source/texk/dvipdfm-x/tt_table.c | 2 +- Build/source/texk/dvipdfm-x/tt_table.h | 3 --- 14 files changed, 28 insertions(+), 43 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index 3de0ba85b2f..26641e1f110 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,23 @@ +2015-08-14 Peter Breitenlohner + + * pdfcolor.[ch]: Drop unused pdf_color_set_default(). + + * pdfdev.h: Drop pdf_dev_setfont() and pdf_dev_set_colormode(). + + * pdfdoc.[ch]: Drop unused pdf_doc_{end,make}_article(). + Declare pdf_doc_get_mediabox() as static. + + * pdfdraw.h: Drop pdf_dev_{fill,eofill,stroke,fillstroke}(), and + pdf_dev_grestoreall(). + + * pdfnames.[ch]: Declare printable_key() as static. + + * pdfximage.h: Drop pdf_ximage_disable_ebb(). + + * tfm.[ch]: Drop tfm_get_space(). Skip tfm_string_{depth,height}. + + * tt_table.[ch]: Declare tt_get_name() as static. + 2015-08-14 Peter Breitenlohner * cff.[ch]: Declare cff_match_string() as static. diff --git a/Build/source/texk/dvipdfm-x/pdfcolor.c b/Build/source/texk/dvipdfm-x/pdfcolor.c index ee6dac5490d..5e50727b29c 100644 --- a/Build/source/texk/dvipdfm-x/pdfcolor.c +++ b/Build/source/texk/dvipdfm-x/pdfcolor.c @@ -320,12 +320,6 @@ pdf_color default_color = { {0.0, 0.0, 0.0, 0.0} }; -void -pdf_color_set_default (const pdf_color *color) -{ - pdf_color_copycolor(&default_color, color); -} - #define DEV_COLOR_STACK_MAX 128 static struct { diff --git a/Build/source/texk/dvipdfm-x/pdfcolor.h b/Build/source/texk/dvipdfm-x/pdfcolor.h index 9db48a597e5..5a9276cb582 100644 --- a/Build/source/texk/dvipdfm-x/pdfcolor.h +++ b/Build/source/texk/dvipdfm-x/pdfcolor.h @@ -99,7 +99,6 @@ extern int pdf_colorspace_load_ICCBased (const char *ident, * See remark in spc_color.c. */ extern void pdf_color_set (pdf_color *sc, pdf_color *fc); -extern void pdf_color_set_default (const pdf_color *color); extern void pdf_color_push (pdf_color *sc, pdf_color *fc); extern void pdf_color_pop (void); diff --git a/Build/source/texk/dvipdfm-x/pdfdev.h b/Build/source/texk/dvipdfm-x/pdfdev.h index 60955014e32..38a59095939 100644 --- a/Build/source/texk/dvipdfm-x/pdfdev.h +++ b/Build/source/texk/dvipdfm-x/pdfdev.h @@ -151,8 +151,6 @@ extern int pdf_dev_put_image (int xobj_id, */ extern int pdf_dev_locate_font (const char *font_name, spt_t ptsize); -extern int pdf_dev_setfont (const char *font_name, spt_t ptsize); - /* The following two routines are NOT WORKING. * Dvipdfmx doesn't manage gstate well.. */ @@ -196,7 +194,6 @@ extern void pdf_dev_set_param (int param_type, int value); * auto_rotate is unset. */ #define pdf_dev_set_autorotate(v) pdf_dev_set_param(PDF_DEV_PARAM_AUTOROTATE, (v)) -#define pdf_dev_set_colormode(v) pdf_dev_set_param(PDF_DEV_PARAM_COLORMODE, (v)) /* * For pdf_doc, pdf_draw and others. diff --git a/Build/source/texk/dvipdfm-x/pdfdoc.c b/Build/source/texk/dvipdfm-x/pdfdoc.c index 63033ad7e3d..b7852f02dba 100644 --- a/Build/source/texk/dvipdfm-x/pdfdoc.c +++ b/Build/source/texk/dvipdfm-x/pdfdoc.c @@ -1747,6 +1747,7 @@ pdf_doc_close_names (pdf_doc *p) return; } +static void pdf_doc_get_mediabox (unsigned page_no, pdf_rect *mediabox); void pdf_doc_add_annot (unsigned page_no, const pdf_rect *rect, @@ -1845,14 +1846,6 @@ pdf_doc_begin_article (const char *article_id, pdf_obj *article_info) return; } -#if 0 -void -pdf_doc_end_article (const char *article_id) -{ - return; /* no-op */ -} -#endif - static pdf_bead * find_bead (pdf_article *article, const char *bead_id) { @@ -2105,7 +2098,7 @@ pdf_doc_set_mediabox (unsigned page_no, const pdf_rect *mediabox) return; } -void +static void pdf_doc_get_mediabox (unsigned page_no, pdf_rect *mediabox) { pdf_doc *p = &pdoc; diff --git a/Build/source/texk/dvipdfm-x/pdfdoc.h b/Build/source/texk/dvipdfm-x/pdfdoc.h index 7f24c6fcfdd..91ea269bc68 100644 --- a/Build/source/texk/dvipdfm-x/pdfdoc.h +++ b/Build/source/texk/dvipdfm-x/pdfdoc.h @@ -79,7 +79,6 @@ extern void pdf_doc_begin_page (double scale, double x_origin, double y_or extern void pdf_doc_end_page (void); extern void pdf_doc_set_mediabox (unsigned page_no, const pdf_rect *mediabox); -extern void pdf_doc_get_mediabox (unsigned page_no, pdf_rect *mediabox); extern void pdf_doc_add_page_content (const char *buffer, unsigned length); extern void pdf_doc_add_page_resource (const char *category, @@ -87,11 +86,6 @@ extern void pdf_doc_add_page_resource (const char *category, /* Article thread */ extern void pdf_doc_begin_article (const char *article_id, pdf_obj *info); -#if 0 -extern void pdf_doc_end_article (const char *article_id); /* Do nothing... */ -#endif -extern void pdf_doc_make_article (const char *article_id, - const char **bead_order, int num_beads); extern void pdf_doc_add_bead (const char *article_id, const char *bead_id, long page_no, const pdf_rect *rect); diff --git a/Build/source/texk/dvipdfm-x/pdfdraw.h b/Build/source/texk/dvipdfm-x/pdfdraw.h index 77577f2b4fb..927249da7c9 100644 --- a/Build/source/texk/dvipdfm-x/pdfdraw.h +++ b/Build/source/texk/dvipdfm-x/pdfdraw.h @@ -117,11 +117,6 @@ extern int pdf_dev_rectadd (double x, double y, double w, double h); extern int pdf_dev_flushpath (char p_op, int fill_rule); -#define pdf_dev_fill() pdf_dev_flushpath('f', PDF_FILL_RULE_NONZERO) -#define pdf_dev_eofill() pdf_dev_flushpath('f', PDF_FILL_RULE_EVENODD) -#define pdf_dev_stroke() pdf_dev_flushpath('S', PDF_FILL_RULE_NONZERO) -#define pdf_dev_fillstroke() pdf_dev_flushpath('B', PDF_FILL_RULE_NONZERO) - extern int pdf_dev_concat (const pdf_tmatrix *M); /* NULL pointer of M mean apply current transformation */ extern void pdf_dev_dtransform (pdf_coord *p, const pdf_tmatrix *M); @@ -160,7 +155,6 @@ extern void pdf_invertmatrix (pdf_tmatrix *M); */ extern int pdf_dev_current_depth (void); extern void pdf_dev_grestore_to (int depth); -#define pdf_dev_grestoreall() pdf_dev_grestore_to(0); #if 0 extern int pdf_dev_currentcolor (pdf_color *color, int is_fill); diff --git a/Build/source/texk/dvipdfm-x/pdfnames.c b/Build/source/texk/dvipdfm-x/pdfnames.c index e7e282d47f2..e8062fe6e3e 100644 --- a/Build/source/texk/dvipdfm-x/pdfnames.c +++ b/Build/source/texk/dvipdfm-x/pdfnames.c @@ -48,7 +48,7 @@ struct obj_data int closed; /* 1 if object is closed */ }; -char * +static char * printable_key (const char *key, int keylen) { #define MAX_KEY 32 diff --git a/Build/source/texk/dvipdfm-x/pdfnames.h b/Build/source/texk/dvipdfm-x/pdfnames.h index df72b9c2c2a..689167f07b0 100644 --- a/Build/source/texk/dvipdfm-x/pdfnames.h +++ b/Build/source/texk/dvipdfm-x/pdfnames.h @@ -45,6 +45,4 @@ extern pdf_obj *pdf_names_create_tree (struct ht_table *names, long *count, struct ht_table *filter); -extern char *printable_key (const char *key, int keylen); - #endif /* _PDF_NAMES_H_ */ diff --git a/Build/source/texk/dvipdfm-x/pdfximage.h b/Build/source/texk/dvipdfm-x/pdfximage.h index 9b369d38fb2..5d8f2340f62 100644 --- a/Build/source/texk/dvipdfm-x/pdfximage.h +++ b/Build/source/texk/dvipdfm-x/pdfximage.h @@ -83,9 +83,6 @@ pdf_ximage_scale_image (int id, transform_info *p /* arg */ ); -/* from dvipdfmx.c */ -extern void pdf_ximage_disable_ebb (void); - /* from spc_pdfm.c */ extern int pdf_ximage_get_subtype (int xobj_id); extern void diff --git a/Build/source/texk/dvipdfm-x/tfm.c b/Build/source/texk/dvipdfm-x/tfm.c index 706abcd4fbd..c8184012f00 100644 --- a/Build/source/texk/dvipdfm-x/tfm.c +++ b/Build/source/texk/dvipdfm-x/tfm.c @@ -1113,6 +1113,7 @@ tfm_string_width (int font_id, const unsigned char *s, unsigned len) return result; } +#if 0 fixword tfm_string_depth (int font_id, const unsigned char *s, unsigned len) { @@ -1166,6 +1167,7 @@ tfm_string_height (int font_id, const unsigned char *s, unsigned len) return result; } +#endif double tfm_get_design_size (int font_id) diff --git a/Build/source/texk/dvipdfm-x/tfm.h b/Build/source/texk/dvipdfm-x/tfm.h index 7ce1a688ab1..ba78e852872 100644 --- a/Build/source/texk/dvipdfm-x/tfm.h +++ b/Build/source/texk/dvipdfm-x/tfm.h @@ -41,10 +41,10 @@ extern fixword tfm_get_fw_height (int font_id, int32_t ch); extern fixword tfm_get_fw_depth (int font_id, int32_t ch); extern fixword tfm_string_width (int font_id, const unsigned char *s, unsigned len); +#if 0 extern fixword tfm_string_depth (int font_id, const unsigned char *s, unsigned len); extern fixword tfm_string_height (int font_id, const unsigned char *s, unsigned len); - -extern double tfm_get_space (int font_id); +#endif /* From TFM header */ extern double tfm_get_design_size (int font_id); diff --git a/Build/source/texk/dvipdfm-x/tt_table.c b/Build/source/texk/dvipdfm-x/tt_table.c index 65470c9fdb2..8b71a1e188d 100644 --- a/Build/source/texk/dvipdfm-x/tt_table.c +++ b/Build/source/texk/dvipdfm-x/tt_table.c @@ -424,7 +424,7 @@ tt_read_os2__table (sfnt *sfont) return table; } -USHORT +static USHORT tt_get_name (sfnt *sfont, char *dest, USHORT destlen, USHORT plat_id, USHORT enco_id, USHORT lang_id, USHORT name_id) diff --git a/Build/source/texk/dvipdfm-x/tt_table.h b/Build/source/texk/dvipdfm-x/tt_table.h index 225c8587b18..251dd21e131 100644 --- a/Build/source/texk/dvipdfm-x/tt_table.h +++ b/Build/source/texk/dvipdfm-x/tt_table.h @@ -189,9 +189,6 @@ extern struct tt_longMetrics *tt_read_longMetrics (sfnt *sfont, extern struct tt_os2__table *tt_read_os2__table (sfnt *sfont); /* name table */ -extern USHORT tt_get_name (sfnt *sfont, char *dest, USHORT destlen, - USHORT plat_id, USHORT enco_id, - USHORT lang_id, USHORT name_id); extern USHORT tt_get_ps_fontname (sfnt *sfont, char *dest, USHORT destlen); #endif /* _TT_TABLE_H_ */ -- cgit v1.2.3