diff options
author | Olaf Weber <olaf@infovore.xs4all.nl> | 2007-01-21 11:58:36 +0000 |
---|---|---|
committer | Olaf Weber <olaf@infovore.xs4all.nl> | 2007-01-21 11:58:36 +0000 |
commit | 49c84cc9d21aa6119c000f950076650170ce1730 (patch) | |
tree | ae2e7c60b360e562e2f6be7ea9fcb38d11c2f9cb | |
parent | 05e07df9c2467f06b060b7fe4321460e06009dff (diff) |
Sync with dvipdfmx source.
git-svn-id: svn://tug.org/texlive/trunk@3658 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/texk/xdvipdfmx/src/fontmap.c | 2 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/src/spc_html.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Build/source/texk/xdvipdfmx/src/fontmap.c b/Build/source/texk/xdvipdfmx/src/fontmap.c index 4e007bfc948..bc4dfa45612 100644 --- a/Build/source/texk/xdvipdfmx/src/fontmap.c +++ b/Build/source/texk/xdvipdfmx/src/fontmap.c @@ -444,7 +444,7 @@ fontmap_parse_mapdef (fontmap_rec *mrec, if (v < 0 || v > 16) WARN("Invalid valur for option 'p': %s", q); else { - mrec->opt.mapc |= v << 16; + mrec->opt.mapc = v << 16; } RELEASE(q); break; diff --git a/Build/source/texk/xdvipdfmx/src/spc_html.c b/Build/source/texk/xdvipdfmx/src/spc_html.c index 7d993f2b98c..956d1a548be 100644 --- a/Build/source/texk/xdvipdfmx/src/spc_html.c +++ b/Build/source/texk/xdvipdfmx/src/spc_html.c @@ -288,6 +288,7 @@ fqurl (const char *baseurl, const char *name) len += strlen(baseurl) + 1; /* we may want to add '/' */ q = NEW(len + 1, char); + *q = '\0'; if (baseurl && baseurl[0]) { char *p; strcpy(q, baseurl); |