summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2014-07-25 13:56:26 +0000
committerKhaled Hosny <khaledhosny@eglug.org>2014-07-25 13:56:26 +0000
commitc953c51fc011990ac2c82ef8b88f7acf33781d2d (patch)
tree79f870e690865cbb340d25c9a390ba46ecce91c3
parent9adf1abc0cf6efef23eeefc44daa5376c1ceb6db (diff)
Revert "texk/dvipdfm-x: Support CID-keyed OpenType: Avoid compiler warnings"
This reverts commit ad3c9243dfdb9c12ecde97f7846bcd23fe5a5878. git-svn-id: svn://tug.org/texlive/trunk@34716 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog6
-rw-r--r--Build/source/texk/dvipdfm-x/pdffont.c2
-rw-r--r--Build/source/texk/dvipdfm-x/tt_cmap.c2
-rw-r--r--Build/source/texk/dvipdfm-x/type0.c6
4 files changed, 5 insertions, 11 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 561d89e0182..b4fec2eb3e1 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,9 +1,3 @@
-2014-07-24 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * pdffont.c (pdf_get_font): Drop unused variable.
- * tt_cmap.c (gid_to_cid): Declare as static.
- * type0.c (Type0Font_*_ToUnicode_stream): Declare as static.
-
2014-07-23 Jiang Jiang <gzjjgod@gmail.com>
* cff.c, pdfdev.c, pdffont.c, pdffont.h, tt_cmap.c, type0.c, type0.h:
diff --git a/Build/source/texk/dvipdfm-x/pdffont.c b/Build/source/texk/dvipdfm-x/pdffont.c
index 4ac335318d3..2bea295e7d8 100644
--- a/Build/source/texk/dvipdfm-x/pdffont.c
+++ b/Build/source/texk/dvipdfm-x/pdffont.c
@@ -382,6 +382,8 @@ pdf_get_font_wmode (int font_id)
pdf_font *
pdf_get_font (int font_id)
{
+ pdf_font *font;
+
CHECK_ID(font_id);
return GET_FONT(font_id);
diff --git a/Build/source/texk/dvipdfm-x/tt_cmap.c b/Build/source/texk/dvipdfm-x/tt_cmap.c
index fa17d2d1549..a2e8e21f679 100644
--- a/Build/source/texk/dvipdfm-x/tt_cmap.c
+++ b/Build/source/texk/dvipdfm-x/tt_cmap.c
@@ -951,7 +951,7 @@ handle_subst_glyphs (CMap *cmap,
return count;
}
-static unsigned int
+unsigned int
gid_to_cid(sfnt *sfont, USHORT gid)
{
unsigned int cid = 0;
diff --git a/Build/source/texk/dvipdfm-x/type0.c b/Build/source/texk/dvipdfm-x/type0.c
index 61785509c0c..b74b3f27e02 100644
--- a/Build/source/texk/dvipdfm-x/type0.c
+++ b/Build/source/texk/dvipdfm-x/type0.c
@@ -153,8 +153,7 @@ Type0Font_clean (Type0Font *font)
/* PLEASE FIX THIS */
#include "tt_cmap.h"
-static pdf_obj *
-Type0Font_create_ToUnicode_stream(Type0Font *font) {
+pdf_obj *Type0Font_create_ToUnicode_stream(Type0Font *font) {
CIDFont *cidfont = font->descendant;
char *used = Type0Font_get_usedglyphs(font);
if (!used)
@@ -169,8 +168,7 @@ Type0Font_create_ToUnicode_stream(Type0Font *font) {
/* Try to load ToUnicode CMap from file system first, if not found fallback to
* font CMap reverse lookup. */
-static pdf_obj *
-Type0Font_try_load_ToUnicode_stream(Type0Font *font, char *cmap_base) {
+pdf_obj *Type0Font_try_load_ToUnicode_stream(Type0Font *font, char *cmap_base) {
char *cmap_name = NEW(strlen(cmap_base) + strlen("-UTF-16"), char);
pdf_obj *tounicode;