summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2015-02-21 19:37:24 +0000
committerKhaled Hosny <khaledhosny@eglug.org>2015-02-21 19:37:24 +0000
commit26d05f98df73cfe45cccdfa13ba70975b5e1a9df (patch)
tree6df91f39387451d524e38de2ebcb61e62080e05e
parent94adc306943103c2c6afbe4ba23f6100395d395b (diff)
pdf_load_native_font is noop now
git-svn-id: svn://tug.org/texlive/trunk@36342 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog1
-rw-r--r--Build/source/texk/dvipdfm-x/dvi.c2
-rw-r--r--Build/source/texk/dvipdfm-x/fontmap.c12
-rw-r--r--Build/source/texk/dvipdfm-x/fontmap.h4
4 files changed, 6 insertions, 13 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 3a060337cac..a6f78b509e0 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -12,6 +12,7 @@
* dvi.c (dvi_locate_native_font): correctly load vertical glyph
metrics.
* configure.ac, Makefile.am: drop FreeType dependency.
+ * dvi.c, fontmap.c, fontmap.h: remove the nonop pdf_load_native_font.
2015-02-21 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
diff --git a/Build/source/texk/dvipdfm-x/dvi.c b/Build/source/texk/dvipdfm-x/dvi.c
index 16f1a46a85c..13833ed1b21 100644
--- a/Build/source/texk/dvipdfm-x/dvi.c
+++ b/Build/source/texk/dvipdfm-x/dvi.c
@@ -951,7 +951,7 @@ dvi_locate_native_font (const char *filename, uint32_t index,
sprintf(fontmap_key, "%s/%u/%c/%d/%d/%d", path, index, layout_dir == 0 ? 'H' : 'V', extend, slant, embolden);
mrec = pdf_lookup_fontmap_record(fontmap_key);
if (mrec == NULL) {
- if (pdf_load_native_font(path, index, layout_dir, extend, slant, embolden) == -1) {
+ if (pdf_insert_native_fontmap_record(path, index, layout_dir, extend, slant, embolden) == -1) {
ERROR("Cannot proceed without the font: %s", filename);
}
mrec = pdf_lookup_fontmap_record(fontmap_key);
diff --git a/Build/source/texk/dvipdfm-x/fontmap.c b/Build/source/texk/dvipdfm-x/fontmap.c
index 14e37955f7a..400d41e3725 100644
--- a/Build/source/texk/dvipdfm-x/fontmap.c
+++ b/Build/source/texk/dvipdfm-x/fontmap.c
@@ -1035,8 +1035,8 @@ pdf_load_fontmap_file (const char *filename, int mode)
}
#ifdef XETEX
-static int
-pdf_insert_native_fontmap_record (const char *path, int index,
+int
+pdf_insert_native_fontmap_record (const char *path, uint32_t index,
int layout_dir, int extend, int slant, int embolden)
{
char *fontmap_key;
@@ -1075,14 +1075,6 @@ pdf_insert_native_fontmap_record (const char *path, int index,
return 0;
}
-
-int
-pdf_load_native_font (const char *filename, unsigned long index,
- int layout_dir, int extend, int slant, int embolden)
-{
- return pdf_insert_native_fontmap_record(filename, index,
- layout_dir, extend, slant, embolden);
-}
#endif /* XETEX */
#if 0
diff --git a/Build/source/texk/dvipdfm-x/fontmap.h b/Build/source/texk/dvipdfm-x/fontmap.h
index 85557cf77de..c0d095b2643 100644
--- a/Build/source/texk/dvipdfm-x/fontmap.h
+++ b/Build/source/texk/dvipdfm-x/fontmap.h
@@ -94,8 +94,8 @@ extern fontmap_rec *pdf_lookup_fontmap_record (const char *kp);
extern int is_pdfm_mapline (const char *mline);
#ifdef XETEX
-extern int pdf_load_native_font (const char *filename, unsigned long index,
- int layout_dir, int extend, int slant, int embolden);
+extern int pdf_insert_native_fontmap_record (const char *filename, uint32_t index,
+ int layout_dir, int extend, int slant, int embolden);
#endif
#endif /* _FONTMAP_H_ */