summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-08-24 08:49:38 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-08-24 08:49:38 +0000
commit186bbd00ffa404c29caaeeeee89437c127e95df7 (patch)
tree1adffc6952f6d43b9ecd8002064da7189fbeae5d /Build/source
parent90e1eb12c7fa4c597d0b72e1a8af3186110e2bb2 (diff)
texk/dvipdfm-x: No reason to use 'long' for 32-bit integers
git-svn-id: svn://tug.org/texlive/trunk@38194 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog12
-rw-r--r--Build/source/texk/dvipdfm-x/agl.c24
-rw-r--r--Build/source/texk/dvipdfm-x/agl.h10
-rw-r--r--Build/source/texk/dvipdfm-x/cid.c4
-rw-r--r--Build/source/texk/dvipdfm-x/cid.h2
-rw-r--r--Build/source/texk/dvipdfm-x/cidtype0.c12
-rw-r--r--Build/source/texk/dvipdfm-x/cidtype0.h2
-rw-r--r--Build/source/texk/dvipdfm-x/cidtype2.c6
-rw-r--r--Build/source/texk/dvipdfm-x/cidtype2.h2
-rw-r--r--Build/source/texk/dvipdfm-x/cmap_p.h2
-rw-r--r--Build/source/texk/dvipdfm-x/cs_type2.c8
-rw-r--r--Build/source/texk/dvipdfm-x/cs_type2.h8
-rw-r--r--Build/source/texk/dvipdfm-x/dpxcrypt.c10
-rw-r--r--Build/source/texk/dvipdfm-x/dpxcrypt.h8
-rw-r--r--Build/source/texk/dvipdfm-x/dpxutil.c2
-rw-r--r--Build/source/texk/dvipdfm-x/dpxutil.h4
-rw-r--r--Build/source/texk/dvipdfm-x/dvi.c2
-rw-r--r--Build/source/texk/dvipdfm-x/error.h6
-rw-r--r--Build/source/texk/dvipdfm-x/fontmap.c2
-rw-r--r--Build/source/texk/dvipdfm-x/fontmap.h4
-rw-r--r--Build/source/texk/dvipdfm-x/mpost.c5
-rw-r--r--Build/source/texk/dvipdfm-x/otl_conf.c4
-rw-r--r--Build/source/texk/dvipdfm-x/pdfcolor.c32
-rw-r--r--Build/source/texk/dvipdfm-x/pdfcolor.h6
-rw-r--r--Build/source/texk/dvipdfm-x/pdfdev.h2
-rw-r--r--Build/source/texk/dvipdfm-x/pdfdoc.c4
-rw-r--r--Build/source/texk/dvipdfm-x/pdfencoding.c2
-rw-r--r--Build/source/texk/dvipdfm-x/pdfencrypt.c2
-rw-r--r--Build/source/texk/dvipdfm-x/pdfencrypt.h2
-rw-r--r--Build/source/texk/dvipdfm-x/pdfnames.c8
-rw-r--r--Build/source/texk/dvipdfm-x/pdfnames.h2
-rw-r--r--Build/source/texk/dvipdfm-x/pdfobj.c8
-rw-r--r--Build/source/texk/dvipdfm-x/pdfobj.h2
-rw-r--r--Build/source/texk/dvipdfm-x/sfnt.h12
-rw-r--r--Build/source/texk/dvipdfm-x/spc_pdfm.c2
-rw-r--r--Build/source/texk/dvipdfm-x/spc_xtx.c2
-rw-r--r--Build/source/texk/dvipdfm-x/system.h7
-rw-r--r--Build/source/texk/dvipdfm-x/t1_char.c14
-rw-r--r--Build/source/texk/dvipdfm-x/t1_char.h6
-rw-r--r--Build/source/texk/dvipdfm-x/truetype.c12
-rw-r--r--Build/source/texk/dvipdfm-x/tt_cmap.c45
-rw-r--r--Build/source/texk/dvipdfm-x/tt_cmap.h2
-rw-r--r--Build/source/texk/dvipdfm-x/unicode.c4
-rw-r--r--Build/source/texk/dvipdfm-x/unicode.h4
44 files changed, 168 insertions, 151 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 619849235c9..5794b532f67 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,15 @@
+2015-08-23 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * agl.[ch], cid.[ch], cidtype0.[ch], cidtype2.[ch], cmap_p.h,
+ cs_type2.[ch], dpxcrypt.[ch], dpxutil.[ch], dvi.c, fontmap.[ch],
+ otl_conf.c, pdfcolor..[ch], pdfdev.h, pdfdoc.c, pdfencoding.c,
+ pdfencrypt.[ch], pdfnames.[ch], pdfobj.[ch], sfnt.h, spc_pdfm.c,
+ spc_xtx.c, truetype.c, t1_char.[ch], tt_cmap.[ch], unicode.[ch]:
+ No reason to use 'long' for 32-bit integers.
+
+ * system.h: Moved #undef's for Win32 symbols from here ...
+ * error.h, mpost.c: ... to here.
+
2015-08-21 Peter Breitenlohner <peb@mppmu.mpg.de>
* dvipdfmx.c (main): Drop CDECL.
diff --git a/Build/source/texk/dvipdfm-x/agl.c b/Build/source/texk/dvipdfm-x/agl.c
index f2a65a89985..58427967e6a 100644
--- a/Build/source/texk/dvipdfm-x/agl.c
+++ b/Build/source/texk/dvipdfm-x/agl.c
@@ -415,7 +415,7 @@ agl_load_listfile (const char *filename, int is_predef)
agl_name *agln, *duplicate;
char *name;
int n_unicodes, i;
- long unicodes[AGL_MAX_UNICODES];
+ int32_t unicodes[AGL_MAX_UNICODES];
endptr = p + strlen(p);
skip_white(&p, endptr);
@@ -555,10 +555,10 @@ agl_name_is_unicode (const char *glyphname)
return 0;
}
-long
+int32_t
agl_name_convert_unicode (const char *glyphname)
{
- long ucv = -1;
+ int32_t ucv = -1;
const char *p;
if (!agl_name_is_unicode(glyphname))
@@ -623,12 +623,12 @@ xtol (const char *start, int len)
((u) >= 0x100000L && (u) <= 0x10FFFDL) \
)
-static long
+static int32_t
put_unicode_glyph (const char *name,
unsigned char **dstpp, unsigned char *limptr)
{
const char *p;
- long len = 0, ucv;
+ int32_t len = 0, ucv;
p = name;
ucv = 0;
@@ -649,12 +649,12 @@ put_unicode_glyph (const char *name,
return len;
}
-long
+int32_t
agl_sput_UTF16BE (const char *glyphstr,
unsigned char **dstpp, unsigned char *limptr,
int *fail_count)
{
- long len = 0;
+ int32_t len = 0;
int count = 0;
const char *p, *endptr;
@@ -668,7 +668,7 @@ agl_sput_UTF16BE (const char *glyphstr,
while (p < endptr) {
char *name;
const char *delim;
- long sub_len;
+ int32_t sub_len;
int i;
agl_name *agln0, *agln1 = NULL;
@@ -686,7 +686,7 @@ agl_sput_UTF16BE (const char *glyphstr,
} else if (!delim || delim > endptr) {
delim = endptr;
}
- sub_len = (long) (delim - p);
+ sub_len = (int32_t) (delim - p);
name = NEW(sub_len+1, char);
memcpy(name, p, sub_len);
@@ -735,7 +735,7 @@ agl_sput_UTF16BE (const char *glyphstr,
int
agl_get_unicodes (const char *glyphstr,
- long *unicodes, int max_unicodes)
+ int32_t *unicodes, int max_unicodes)
{
int count = 0;
const char *p, *endptr;
@@ -748,7 +748,7 @@ agl_get_unicodes (const char *glyphstr,
while (p < endptr) {
char *name;
const char *delim;
- long sub_len;
+ int32_t sub_len;
int i;
agl_name *agln0, *agln1 = NULL;
@@ -763,7 +763,7 @@ agl_get_unicodes (const char *glyphstr,
} else if (!delim || delim > endptr) {
delim = endptr;
}
- sub_len = (long) (delim - p);
+ sub_len = (int32_t) (delim - p);
name = NEW(sub_len+1, char);
memcpy(name, p, sub_len);
diff --git a/Build/source/texk/dvipdfm-x/agl.h b/Build/source/texk/dvipdfm-x/agl.h
index 49c7a9b8160..cc7687c34aa 100644
--- a/Build/source/texk/dvipdfm-x/agl.h
+++ b/Build/source/texk/dvipdfm-x/agl.h
@@ -32,7 +32,7 @@ struct agl_name {
char *name;
char *suffix;
int n_components;
- long unicodes[AGL_MAX_UNICODES];
+ int32_t unicodes[AGL_MAX_UNICODES];
struct agl_name *alternate;
int is_predef;
};
@@ -40,15 +40,15 @@ typedef struct agl_name agl_name;
extern char *agl_chop_suffix (const char *glyphname, char **suffix);
-extern long agl_sput_UTF16BE (const char *name,
+extern int32_t agl_sput_UTF16BE (const char *name,
unsigned char **dstpp,
unsigned char *limptr, int *num_fails);
extern int agl_get_unicodes (const char *glyphstr,
- long *unicodes, int max_uncodes);
+ int32_t *unicodes, int max_uncodes);
-extern int agl_name_is_unicode (const char *glyphname);
-extern long agl_name_convert_unicode (const char *glyphname);
+extern int agl_name_is_unicode (const char *glyphname);
+extern int32_t agl_name_convert_unicode (const char *glyphname);
extern const char *agl_suffix_to_otltag (const char *suffix);
diff --git a/Build/source/texk/dvipdfm-x/cid.c b/Build/source/texk/dvipdfm-x/cid.c
index e918277f17f..486892e68a6 100644
--- a/Build/source/texk/dvipdfm-x/cid.c
+++ b/Build/source/texk/dvipdfm-x/cid.c
@@ -109,7 +109,7 @@ static void release_opt (cid_opt *opt);
static CIDSysInfo *get_cidsysinfo (const char *map_name, fontmap_opt *fmap_opt);
static int __verbose = 0;
-static long cidoptflags = 0;
+static int cidoptflags = 0;
void
CIDFont_set_verbose (void)
@@ -799,7 +799,7 @@ get_cidsysinfo (const char *map_name, fontmap_opt *fmap_opt)
}
void
-CIDFont_set_flags (long flags)
+CIDFont_set_flags (int flags)
{
CIDFont_type0_set_flags(flags);
CIDFont_type2_set_flags(flags);
diff --git a/Build/source/texk/dvipdfm-x/cid.h b/Build/source/texk/dvipdfm-x/cid.h
index 4267e232ec4..18535d1be3f 100644
--- a/Build/source/texk/dvipdfm-x/cid.h
+++ b/Build/source/texk/dvipdfm-x/cid.h
@@ -40,7 +40,7 @@ extern void CIDFont_set_verbose (void);
#if 0
extern int CIDFont_require_version (void);
#endif
-extern void CIDFont_set_flags (long flags);
+extern void CIDFont_set_flags (int flags);
#define CIDFONT_FORCE_FIXEDPITCH (1 << 1)
diff --git a/Build/source/texk/dvipdfm-x/cidtype0.c b/Build/source/texk/dvipdfm-x/cidtype0.c
index 16c218de837..cc30ab049d5 100644
--- a/Build/source/texk/dvipdfm-x/cidtype0.c
+++ b/Build/source/texk/dvipdfm-x/cidtype0.c
@@ -71,7 +71,7 @@
#include "fontmap.h"
static int verbose = 0;
-static long opt_flags = 0;
+static int opt_flags = 0;
void
CIDFont_type0_set_verbose (void)
@@ -80,7 +80,7 @@ CIDFont_type0_set_verbose (void)
}
void
-CIDFont_type0_set_flags (long flags)
+CIDFont_type0_set_flags (int flags)
{
opt_flags = flags;
}
@@ -554,7 +554,7 @@ CIDFont_type0_try_open (const char *name,
int required_cid,
CIDType0Info *info)
{
- unsigned long offset = 0;
+ ULONG offset = 0;
int is_cid;
CIDFontInfo_init(info);
@@ -836,7 +836,7 @@ CIDFont_type0_open (CIDFont *font, const char *name,
sfnt *sfont = NULL;
cff_font *cffont;
FILE *fp = NULL;
- unsigned long offset = 0;
+ ULONG offset = 0;
int is_cid_font = 0;
int expect_cid_font = expected_flag == 0;
int expect_type1_font = expected_flag & CIDFONT_FLAG_TYPE1;
@@ -1308,7 +1308,7 @@ load_base_CMap (const char *font_name, int wmode, cff_font *cffont)
RELEASE(cmap_name);
for (gid = 1; gid < cffont->num_glyphs; gid++) {
- long ucv;
+ int32_t ucv;
s_SID sid;
char *glyph, *name, *suffix;
unsigned char srcCode[4];
@@ -1449,7 +1449,7 @@ create_ToUnicode_stream (cff_font *cffont,
for (cid = 1; cid < cffont->num_glyphs; cid++) { /* Skip .notdef */
if (is_used_char2(used_glyphs, cid)) {
char *glyph;
- long len;
+ int32_t len;
int fail_count;
wbuf[0] = (cid >> 8) & 0xff;
diff --git a/Build/source/texk/dvipdfm-x/cidtype0.h b/Build/source/texk/dvipdfm-x/cidtype0.h
index cb8759ee825..34cf49e7142 100644
--- a/Build/source/texk/dvipdfm-x/cidtype0.h
+++ b/Build/source/texk/dvipdfm-x/cidtype0.h
@@ -26,7 +26,7 @@
#include "fontmap.h"
extern void CIDFont_type0_set_verbose (void);
-extern void CIDFont_type0_set_flags (long flags);
+extern void CIDFont_type0_set_flags (int flags);
extern int CIDFont_type0_open (CIDFont *font, const char *name,
CIDSysInfo *cmap_csi, cid_opt *opt,
diff --git a/Build/source/texk/dvipdfm-x/cidtype2.c b/Build/source/texk/dvipdfm-x/cidtype2.c
index 757a6a37216..f9be32ec6b9 100644
--- a/Build/source/texk/dvipdfm-x/cidtype2.c
+++ b/Build/source/texk/dvipdfm-x/cidtype2.c
@@ -67,7 +67,7 @@ CIDFont_type2_set_verbose (void)
}
void
-CIDFont_type2_set_flags (long flags)
+CIDFont_type2_set_flags (int32_t flags)
{
opt_flags = flags;
}
@@ -499,7 +499,7 @@ CIDFont_type2_dofont (CIDFont *font)
struct tt_glyphs *glyphs;
CMap *cmap = NULL;
tt_cmap *ttcmap = NULL;
- unsigned long offset = 0;
+ ULONG offset = 0;
CID cid, last_cid;
unsigned char *cidtogidmap;
USHORT num_glyphs;
@@ -933,7 +933,7 @@ CIDFont_type2_open (CIDFont *font, const char *name,
{
char *fontname;
sfnt *sfont;
- unsigned long offset = 0;
+ ULONG offset = 0;
FILE *fp = NULL;
ASSERT(font && opt);
diff --git a/Build/source/texk/dvipdfm-x/cidtype2.h b/Build/source/texk/dvipdfm-x/cidtype2.h
index 00e39a3863d..27aeff10a23 100644
--- a/Build/source/texk/dvipdfm-x/cidtype2.h
+++ b/Build/source/texk/dvipdfm-x/cidtype2.h
@@ -25,7 +25,7 @@
#include "cid_p.h"
extern void CIDFont_type2_set_verbose (void);
-extern void CIDFont_type2_set_flags (long flags);
+extern void CIDFont_type2_set_flags (int flags);
extern int CIDFont_type2_open (CIDFont *font, const char *name,
CIDSysInfo *cmap_csi, cid_opt *opt);
diff --git a/Build/source/texk/dvipdfm-x/cmap_p.h b/Build/source/texk/dvipdfm-x/cmap_p.h
index 7b9828bfbd3..51647aa2525 100644
--- a/Build/source/texk/dvipdfm-x/cmap_p.h
+++ b/Build/source/texk/dvipdfm-x/cmap_p.h
@@ -61,9 +61,9 @@ typedef struct mapDef {
#define MEM_ALLOC_SIZE 4096
typedef struct mapData {
- long pos; /* Position of next free data segment */
unsigned char *data; /* CID, Code... MEM_ALLOC_SIZE bytes */
struct mapData *prev; /* Previous mapData data segment */
+ int pos; /* Position of next free data segment */
} mapData;
struct CMap {
diff --git a/Build/source/texk/dvipdfm-x/cs_type2.c b/Build/source/texk/dvipdfm-x/cs_type2.c
index 00fc7d3c8aa..f2629420f2e 100644
--- a/Build/source/texk/dvipdfm-x/cs_type2.c
+++ b/Build/source/texk/dvipdfm-x/cs_type2.c
@@ -779,9 +779,9 @@ cs_parse_init (void)
/*
* Not just copying...
*/
-long
-cs_copy_charstring (card8 *dst, long dstlen,
- card8 *src, long srclen,
+int
+cs_copy_charstring (card8 *dst, int dstlen,
+ card8 *src, int srclen,
cff_index *gsubr, cff_index *subr,
double default_width, double nominal_width, cs_ginfo *ginfo)
{
@@ -804,5 +804,5 @@ cs_copy_charstring (card8 *dst, long dstlen,
}
}
- return (long)(dst - save);
+ return (int)(dst - save);
}
diff --git a/Build/source/texk/dvipdfm-x/cs_type2.h b/Build/source/texk/dvipdfm-x/cs_type2.h
index 70623c055cd..76ff1b4dc08 100644
--- a/Build/source/texk/dvipdfm-x/cs_type2.h
+++ b/Build/source/texk/dvipdfm-x/cs_type2.h
@@ -35,9 +35,9 @@ typedef struct {
} seac; /* unused in Type 2 charstring */
} cs_ginfo;
-extern long cs_copy_charstring (card8 *dest, long destlen,
- card8 *src, long srclen,
- cff_index *gsubr, cff_index *subr,
- double default_width, double nominal_width, cs_ginfo *ginfo);
+extern int cs_copy_charstring (card8 *dest, int destlen,
+ card8 *src, int srclen,
+ cff_index *gsubr, cff_index *subr,
+ double default_width, double nominal_width, cs_ginfo *ginfo);
#endif /* _CS_TYPE2_H_ */
diff --git a/Build/source/texk/dvipdfm-x/dpxcrypt.c b/Build/source/texk/dvipdfm-x/dpxcrypt.c
index 5f1720ca243..e797466b543 100644
--- a/Build/source/texk/dvipdfm-x/dpxcrypt.c
+++ b/Build/source/texk/dvipdfm-x/dpxcrypt.c
@@ -208,7 +208,7 @@ static void transform (MD5_CONTEXT *ctx, const unsigned char *data)
/* The routine updates the message-digest context to
* account for the presence of each of the characters inBuf[0..inLen-1]
* in the message whose digest is being computed. */
-void MD5_write (MD5_CONTEXT *hd, const unsigned char *inbuf, unsigned long inlen)
+void MD5_write (MD5_CONTEXT *hd, const unsigned char *inbuf, unsigned int inlen)
{
if (hd->count == 64) { /* flush the buffer */
transform(hd, hd->buf);
@@ -529,7 +529,7 @@ _SHA256_transform (SHA256_CONTEXT *hd, const unsigned char *data)
#undef S1
#undef R
-void SHA256_write (SHA256_CONTEXT *hd, const unsigned char *inbuf, unsigned long inlen)
+void SHA256_write (SHA256_CONTEXT *hd, const unsigned char *inbuf, unsigned int inlen)
{
unsigned int stack_burn = 0;
@@ -1018,7 +1018,7 @@ _SHA512_transform (SHA512_CONTEXT *ctx, const unsigned char *data)
* we take the leftmost 48 of those bytes.
*/
-void SHA512_write (SHA512_CONTEXT *hd, const unsigned char *inbuf, unsigned long inlen)
+void SHA512_write (SHA512_CONTEXT *hd, const unsigned char *inbuf, unsigned int inlen)
{
unsigned int stack_burn = 0;
@@ -1138,7 +1138,7 @@ SHA512_final (unsigned char *outbuf, SHA512_CONTEXT *hd)
* heavily modified for GnuPG by Werner Koch <wk@gnupg.org>
*/
-static void do_encrypt_stream (ARC4_CONTEXT *ctx, unsigned char *outbuf, const unsigned char *inbuf, unsigned long len)
+static void do_encrypt_stream (ARC4_CONTEXT *ctx, unsigned char *outbuf, const unsigned char *inbuf, unsigned int len)
{
int i = ctx->idx_i;
int j = ctx->idx_j;
@@ -1158,7 +1158,7 @@ static void do_encrypt_stream (ARC4_CONTEXT *ctx, unsigned char *outbuf, const u
ctx->idx_j = j;
}
-void ARC4 (ARC4_CONTEXT *ctx, unsigned long len, const unsigned char *inbuf, unsigned char *outbuf)
+void ARC4 (ARC4_CONTEXT *ctx, unsigned int len, const unsigned char *inbuf, unsigned char *outbuf)
{
do_encrypt_stream(ctx, outbuf, inbuf, len);
_gcry_burn_stack(64);
diff --git a/Build/source/texk/dvipdfm-x/dpxcrypt.h b/Build/source/texk/dvipdfm-x/dpxcrypt.h
index 2510feedd28..e6c8f651cd0 100644
--- a/Build/source/texk/dvipdfm-x/dpxcrypt.h
+++ b/Build/source/texk/dvipdfm-x/dpxcrypt.h
@@ -38,7 +38,7 @@ typedef struct {
} MD5_CONTEXT;
void MD5_init (MD5_CONTEXT *ctx);
-void MD5_write(MD5_CONTEXT *ctx, const unsigned char *inbuf, unsigned long inlen);
+void MD5_write(MD5_CONTEXT *ctx, const unsigned char *inbuf, unsigned int inlen);
void MD5_final(unsigned char *outbuf, MD5_CONTEXT *ctx);
typedef struct {
@@ -63,7 +63,7 @@ typedef struct
void SHA256_init (SHA256_CONTEXT *ctx);
void SHA256_write(SHA256_CONTEXT *ctx,
- const unsigned char *inbuf, unsigned long inlen);
+ const unsigned char *inbuf, unsigned int inlen);
void SHA256_final(unsigned char *outbuf, SHA256_CONTEXT *ctx);
void SHA384_init (SHA512_CONTEXT *ctx);
@@ -71,7 +71,7 @@ void SHA384_init (SHA512_CONTEXT *ctx);
#define SHA384_final(b,c) SHA512_final((b),(c))
void SHA512_init (SHA512_CONTEXT *ctx);
void SHA512_write(SHA512_CONTEXT *ctx,
- const unsigned char *inbuf, unsigned long inlen);
+ const unsigned char *inbuf, unsigned int inlen);
void SHA512_final(unsigned char *outbuf, SHA512_CONTEXT *ctx);
/* libgcrypt arcfour */
@@ -82,7 +82,7 @@ typedef struct {
#define AES_BLOCKSIZE 16
-void ARC4 (ARC4_CONTEXT *ctx, unsigned long len, const unsigned char *inbuf, unsigned char *outbuf);
+void ARC4 (ARC4_CONTEXT *ctx, unsigned int len, const unsigned char *inbuf, unsigned char *outbuf);
void ARC4_set_key (ARC4_CONTEXT *ctx, unsigned int keylen, const unsigned char *key);
void AES_ecb_encrypt (const unsigned char *key, size_t key_len,
diff --git a/Build/source/texk/dvipdfm-x/dpxutil.c b/Build/source/texk/dvipdfm-x/dpxutil.c
index 05640096af0..b2611407a8c 100644
--- a/Build/source/texk/dvipdfm-x/dpxutil.c
+++ b/Build/source/texk/dvipdfm-x/dpxutil.c
@@ -103,7 +103,7 @@ ht_clear_table (struct ht_table *ht)
ht->hval_free_fn = NULL;
}
-long ht_table_size (struct ht_table *ht)
+int ht_table_size (struct ht_table *ht)
{
ASSERT(ht);
diff --git a/Build/source/texk/dvipdfm-x/dpxutil.h b/Build/source/texk/dvipdfm-x/dpxutil.h
index 930bb820ec6..574fa34547e 100644
--- a/Build/source/texk/dvipdfm-x/dpxutil.h
+++ b/Build/source/texk/dvipdfm-x/dpxutil.h
@@ -60,7 +60,7 @@ struct ht_entry {
typedef void (*hval_free_func) (void *);
struct ht_table {
- long count;
+ int count;
hval_free_func hval_free_fn;
struct ht_entry *table[HASH_TABLE_SIZE];
};
@@ -68,7 +68,7 @@ struct ht_table {
extern void ht_init_table (struct ht_table *ht,
hval_free_func hval_free_fn);
extern void ht_clear_table (struct ht_table *ht);
-extern long ht_table_size (struct ht_table *ht);
+extern int ht_table_size (struct ht_table *ht);
extern void *ht_lookup_table (struct ht_table *ht,
const void *key, int keylen);
extern void ht_append_table (struct ht_table *ht,
diff --git a/Build/source/texk/dvipdfm-x/dvi.c b/Build/source/texk/dvipdfm-x/dvi.c
index b9020ad313f..fedbc1dc837 100644
--- a/Build/source/texk/dvipdfm-x/dvi.c
+++ b/Build/source/texk/dvipdfm-x/dvi.c
@@ -992,7 +992,7 @@ dvi_locate_native_font (const char *filename, uint32_t index,
FILE *fp;
char *path;
sfnt *sfont;
- unsigned offset = 0;
+ ULONG offset = 0;
struct tt_head_table *head;
struct tt_maxp_table *maxp;
struct tt_hhea_table *hhea;
diff --git a/Build/source/texk/dvipdfm-x/error.h b/Build/source/texk/dvipdfm-x/error.h
index 75e37ff9bed..f6cddbb2c8e 100644
--- a/Build/source/texk/dvipdfm-x/error.h
+++ b/Build/source/texk/dvipdfm-x/error.h
@@ -27,6 +27,9 @@
extern void error_cleanup (void);
+/* Acoid conflict with NO_ERROR from <winerror.h>. */
+#undef NO_ERROR
+
#define FATAL_ERROR -1
#define NO_ERROR 0
@@ -35,6 +38,9 @@ extern void error_cleanup (void);
extern void shut_up (int quietness);
+/* Acoid conflict with ERROR from <winnt.h>. */
+#undef ERROR
+
extern void ERROR (const char *fmt, ...);
extern void MESG (const char *fmt, ...);
extern void WARN (const char *fmt, ...);
diff --git a/Build/source/texk/dvipdfm-x/fontmap.c b/Build/source/texk/dvipdfm-x/fontmap.c
index 833875ead52..832e166c8a1 100644
--- a/Build/source/texk/dvipdfm-x/fontmap.c
+++ b/Build/source/texk/dvipdfm-x/fontmap.c
@@ -878,7 +878,7 @@ pdf_insert_fontmap_record (const char *kp, const fontmap_rec *vp)
int
-pdf_read_fontmap_line (fontmap_rec *mrec, const char *mline, long mline_len, int format)
+pdf_read_fontmap_line (fontmap_rec *mrec, const char *mline, int mline_len, int format)
{
int error;
char *q;
diff --git a/Build/source/texk/dvipdfm-x/fontmap.h b/Build/source/texk/dvipdfm-x/fontmap.h
index 521fbb94f3e..f72c725b130 100644
--- a/Build/source/texk/dvipdfm-x/fontmap.h
+++ b/Build/source/texk/dvipdfm-x/fontmap.h
@@ -40,7 +40,7 @@ typedef struct fontmap_opt {
/* Synthetic font */
double slant, extend, bold;
/* comaptibility and other flags */
- long mapc, flags;
+ int mapc, flags;
char *otl_tags; /* currently unused */
char *tounicode; /* not implemented yet */
@@ -84,7 +84,7 @@ extern void pdf_init_fontmap_record (fontmap_rec *mrec);
extern void pdf_clear_fontmap_record (fontmap_rec *mrec);
extern int pdf_load_fontmap_file (const char *filename, int mode);
-extern int pdf_read_fontmap_line (fontmap_rec *mrec, const char *mline, long mline_strlen, int format);
+extern int pdf_read_fontmap_line (fontmap_rec *mrec, const char *mline, int mline_strlen, int format);
extern int pdf_append_fontmap_record (const char *kp, const fontmap_rec *mrec);
extern int pdf_remove_fontmap_record (const char *kp);
diff --git a/Build/source/texk/dvipdfm-x/mpost.c b/Build/source/texk/dvipdfm-x/mpost.c
index 047d4767650..b436b86148e 100644
--- a/Build/source/texk/dvipdfm-x/mpost.c
+++ b/Build/source/texk/dvipdfm-x/mpost.c
@@ -292,6 +292,11 @@ skip_prolog (const char **start, const char *end)
/* PostScript Operators */
+/* Acoid conflict with SET... from <wingdi.h>. */
+#undef SETLINECAP
+#undef SETLINEJOIN
+#undef SETMITERLIMIT
+
#define ADD 1
#define SUB 2
#define MUL 3
diff --git a/Build/source/texk/dvipdfm-x/otl_conf.c b/Build/source/texk/dvipdfm-x/otl_conf.c
index da57eb655dd..bafacc57a7c 100644
--- a/Build/source/texk/dvipdfm-x/otl_conf.c
+++ b/Build/source/texk/dvipdfm-x/otl_conf.c
@@ -48,7 +48,7 @@ parse_uc_coverage (pdf_obj *gclass, const char **pp, const char *endptr)
{
pdf_obj *coverage;
pdf_obj *value;
- long ucv = 0;
+ int32_t ucv = 0;
char *glyphname, *glyphclass;
if (*pp + 1 >= endptr)
@@ -131,7 +131,7 @@ add_rule (pdf_obj *rule, pdf_obj *gclass,
{
pdf_obj *glyph1, *glyph2;
#define MAX_UNICODES 16
- long unicodes[MAX_UNICODES];
+ int32_t unicodes[MAX_UNICODES];
int i, n_unicodes;
if (first[0] == '@') {
diff --git a/Build/source/texk/dvipdfm-x/pdfcolor.c b/Build/source/texk/dvipdfm-x/pdfcolor.c
index 5e50727b29c..6a8c9077a58 100644
--- a/Build/source/texk/dvipdfm-x/pdfcolor.c
+++ b/Build/source/texk/dvipdfm-x/pdfcolor.c
@@ -618,7 +618,7 @@ iccp_version_supported (int major, int minor)
return 0;
}
-typedef unsigned long iccSig;
+typedef uint32_t iccSig;
static iccSig
str2iccSig (const void *s)
{
@@ -631,14 +631,14 @@ str2iccSig (const void *s)
typedef struct
{
- long X, Y, Z; /* s15Fixed16Numeber */
+ int32_t X, Y, Z; /* s15Fixed16Number */
} iccXYZNumber;
typedef struct
{
long size;
iccSig CMMType;
- long version;
+ int32_t version;
iccSig devClass;
iccSig colorSpace;
iccSig PCS; /* Profile Connection Space */
@@ -649,7 +649,7 @@ typedef struct
iccSig devMnfct;
iccSig devModel;
char devAttr[8];
- long intent;
+ int32_t intent;
iccXYZNumber illuminant;
iccSig creator;
unsigned char ID[16]; /* MD5 checksum with Rendering intent,
@@ -700,7 +700,7 @@ iccp_init_iccHeader (iccHeader *icch)
*/
struct iccbased_cdata
{
- long sig; /* 'i' 'c' 'c' 'b' */
+ int32_t sig; /* 'i' 'c' 'c' 'b' */
unsigned char checksum[16]; /* 16 bytes MD5 Checksum */
int colorspace; /* input colorspace:
@@ -785,7 +785,7 @@ compare_iccbased (const char *ident1, const struct iccbased_cdata *cdata1,
}
int
-iccp_check_colorspace (int colortype, const void *profile, long proflen)
+iccp_check_colorspace (int colortype, const void *profile, int proflen)
{
iccSig colorspace;
const unsigned char *p;
@@ -823,11 +823,11 @@ iccp_check_colorspace (int colortype, const void *profile, long proflen)
}
pdf_obj *
-iccp_get_rendering_intent (const void *profile, long proflen)
+iccp_get_rendering_intent (const void *profile, int proflen)
{
pdf_obj *ri = NULL;
const unsigned char *p;
- long intent;
+ int32_t intent;
if (!profile || proflen < 128)
return NULL;
@@ -856,13 +856,13 @@ iccp_get_rendering_intent (const void *profile, long proflen)
return ri;
}
-#define sget_signed_long(p) ((long) ((p)[0] << 24|(p)[1] << 16|(p)[2] << 8|(p)[3]))
+#define sget_signed_long(p) ((int32_t) ((p)[0] << 24|(p)[1] << 16|(p)[2] << 8|(p)[3]))
#define sget_signed_short(p) ((short) ((p)[0] << 8|(p)[1]))
#define get_iccSig(p) ((iccSig) ((p)[0] << 24|(p)[1] << 16|(p)[2] << 8|(p)[3]))
static int
iccp_unpack_header (iccHeader *icch,
- const void *profile, long proflen, int check_size)
+ const void *profile, int proflen, int check_size)
{
const unsigned char *p, *endptr;
@@ -931,8 +931,8 @@ iccp_unpack_header (iccHeader *icch,
/* 28 bytes reserved - must be set to zeros */
for (; p < endptr; p++) {
if (*p != '\0') {
- WARN("Reserved pad not zero: %02x (at offset %ld in ICC profile header.)",
- *p, 128 - ((long) (endptr - p)));
+ WARN("Reserved pad not zero: %02x (at offset %d in ICC profile header.)",
+ *p, 128 - ((int) (endptr - p)));
return -1;
}
}
@@ -955,7 +955,7 @@ iccp_unpack_header (iccHeader *icch,
#include "dpxcrypt.h"
static void
-iccp_get_checksum (unsigned char *checksum, const void *profile, long proflen)
+iccp_get_checksum (unsigned char *checksum, const void *profile, int proflen)
{
const unsigned char *p;
MD5_CONTEXT md5;
@@ -1115,7 +1115,7 @@ iccp_devClass_allowed (int dev_class)
int
iccp_load_profile (const char *ident,
- const void *profile, long proflen)
+ const void *profile, int proflen)
{
int cspc_id;
pdf_obj *resource;
@@ -1213,11 +1213,11 @@ iccp_load_profile (const char *ident,
static unsigned char wbuf[WBUF_SIZE];
static pdf_obj *
-iccp_load_file_stream (unsigned char *checksum, long length, FILE *fp)
+iccp_load_file_stream (unsigned char *checksum, int length, FILE *fp)
{
pdf_obj *stream;
MD5_CONTEXT md5;
- long nb_read;
+ int nb_read;
rewind(fp);
diff --git a/Build/source/texk/dvipdfm-x/pdfcolor.h b/Build/source/texk/dvipdfm-x/pdfcolor.h
index 5a9276cb582..71bfbd80607 100644
--- a/Build/source/texk/dvipdfm-x/pdfcolor.h
+++ b/Build/source/texk/dvipdfm-x/pdfcolor.h
@@ -74,13 +74,13 @@ extern int pdf_color_is_white (const pdf_color *color);
extern int pdf_color_is_valid (const pdf_color *color);
/* Not check size */
-extern pdf_obj *iccp_get_rendering_intent (const void *profile, long proflen);
+extern pdf_obj *iccp_get_rendering_intent (const void *profile, int proflen);
extern int iccp_check_colorspace (int colortype,
- const void *profile, long proflen);
+ const void *profile, int proflen);
/* returns colorspace ID */
extern int iccp_load_profile (const char *ident,
- const void *profile, long proflen);
+ const void *profile, int proflen);
extern void pdf_init_colors (void);
extern void pdf_close_colors (void);
diff --git a/Build/source/texk/dvipdfm-x/pdfdev.h b/Build/source/texk/dvipdfm-x/pdfdev.h
index 38a59095939..c0b68fb2d1b 100644
--- a/Build/source/texk/dvipdfm-x/pdfdev.h
+++ b/Build/source/texk/dvipdfm-x/pdfdev.h
@@ -27,7 +27,7 @@
#include "pdfobj.h"
#include "pdfcolor.h"
-typedef signed long spt_t;
+typedef int spt_t;
typedef struct pdf_tmatrix
{
diff --git a/Build/source/texk/dvipdfm-x/pdfdoc.c b/Build/source/texk/dvipdfm-x/pdfdoc.c
index b7852f02dba..d0c8479762c 100644
--- a/Build/source/texk/dvipdfm-x/pdfdoc.c
+++ b/Build/source/texk/dvipdfm-x/pdfdoc.c
@@ -1628,7 +1628,7 @@ pdf_doc_add_goto (pdf_obj *annot_dict)
/* We use hexadecimal notation for our numeric destinations.
* Other bases (e.g., 10+26 or 10+2*26) would be more efficient.
*/
- sprintf(buf, "%lx", ht_table_size(&pdoc.gotos));
+ sprintf(buf, "%x", ht_table_size(&pdoc.gotos));
D_new = pdf_new_string(buf, strlen(buf));
ht_append_table(&pdoc.gotos, dest, strlen(dest), D_new);
}
@@ -1694,7 +1694,7 @@ pdf_doc_close_names (pdf_doc *p)
if (p->names[i].data) {
struct ht_table *data = p->names[i].data;
pdf_obj *name_tree;
- long count;
+ int count;
if (!pdoc.check_gotos || strcmp(p->names[i].category, "Dests"))
name_tree = pdf_names_create_tree(data, &count, NULL);
diff --git a/Build/source/texk/dvipdfm-x/pdfencoding.c b/Build/source/texk/dvipdfm-x/pdfencoding.c
index d8fb0537114..dc57d710146 100644
--- a/Build/source/texk/dvipdfm-x/pdfencoding.c
+++ b/Build/source/texk/dvipdfm-x/pdfencoding.c
@@ -670,7 +670,7 @@ pdf_create_ToUnicode_CMap (const char *enc_name,
continue;
if (enc_vec[code]) {
- long len;
+ int32_t len;
int fail_count = 0;
agl_name *agln = agl_lookup_list(enc_vec[code]);
/* Adobe glyph naming conventions are not used by viewers,
diff --git a/Build/source/texk/dvipdfm-x/pdfencrypt.c b/Build/source/texk/dvipdfm-x/pdfencrypt.c
index c6257d3aff5..78dcfab8997 100644
--- a/Build/source/texk/dvipdfm-x/pdfencrypt.c
+++ b/Build/source/texk/dvipdfm-x/pdfencrypt.c
@@ -804,7 +804,7 @@ pdf_obj *pdf_enc_id_array (void)
return id;
}
-void pdf_enc_set_label (unsigned long label)
+void pdf_enc_set_label (unsigned label)
{
struct pdf_sec *p = &sec_data;
diff --git a/Build/source/texk/dvipdfm-x/pdfencrypt.h b/Build/source/texk/dvipdfm-x/pdfencrypt.h
index e6ad17737b5..077c0f2f975 100644
--- a/Build/source/texk/dvipdfm-x/pdfencrypt.h
+++ b/Build/source/texk/dvipdfm-x/pdfencrypt.h
@@ -30,7 +30,7 @@
extern void pdf_enc_set_verbose (void);
extern pdf_obj *pdf_enc_id_array (void);
extern void pdf_enc_compute_id_string (char *dviname, char *pdfname);
-extern void pdf_enc_set_label (unsigned long label);
+extern void pdf_enc_set_label (unsigned label);
extern void pdf_enc_set_generation (unsigned generation);
extern void pdf_enc_set_passwd (unsigned int size, unsigned int perm,
const char *owner, const char *user);
diff --git a/Build/source/texk/dvipdfm-x/pdfnames.c b/Build/source/texk/dvipdfm-x/pdfnames.c
index 3d5063576c3..5fdb6e19540 100644
--- a/Build/source/texk/dvipdfm-x/pdfnames.c
+++ b/Build/source/texk/dvipdfm-x/pdfnames.c
@@ -275,7 +275,7 @@ cmp_key (const void *d1, const void *d2)
#define NAME_CLUSTER 4
static pdf_obj *
-build_name_tree (struct named_object *first, long num_leaves, int is_root)
+build_name_tree (struct named_object *first, int num_leaves, int is_root)
{
pdf_obj *result;
int i;
@@ -351,12 +351,12 @@ build_name_tree (struct named_object *first, long num_leaves, int is_root)
}
static struct named_object *
-flat_table (struct ht_table *ht_tab, long *num_entries,
+flat_table (struct ht_table *ht_tab, int *num_entries,
struct ht_table *filter)
{
struct named_object *objects;
struct ht_iter iter;
- long count;
+ int count;
ASSERT(ht_tab);
@@ -405,7 +405,7 @@ flat_table (struct ht_table *ht_tab, long *num_entries,
}
pdf_obj *
-pdf_names_create_tree (struct ht_table *names, long *count,
+pdf_names_create_tree (struct ht_table *names, int *count,
struct ht_table *filter)
{
pdf_obj *name_tree;
diff --git a/Build/source/texk/dvipdfm-x/pdfnames.h b/Build/source/texk/dvipdfm-x/pdfnames.h
index 689167f07b0..341180ced3a 100644
--- a/Build/source/texk/dvipdfm-x/pdfnames.h
+++ b/Build/source/texk/dvipdfm-x/pdfnames.h
@@ -42,7 +42,7 @@ extern int pdf_names_close_object (struct ht_table *names,
/* Really create name tree... */
extern pdf_obj *pdf_names_create_tree (struct ht_table *names,
- long *count,
+ int *count,
struct ht_table *filter);
#endif /* _PDF_NAMES_H_ */
diff --git a/Build/source/texk/dvipdfm-x/pdfobj.c b/Build/source/texk/dvipdfm-x/pdfobj.c
index d9b46e01fc3..3e1982b21ed 100644
--- a/Build/source/texk/dvipdfm-x/pdfobj.c
+++ b/Build/source/texk/dvipdfm-x/pdfobj.c
@@ -59,7 +59,7 @@ struct pdf_obj
{
int type;
- unsigned long label; /* Only used for indirect objects
+ unsigned int label; /* Only used for indirect objects
all other "label" to zero */
unsigned short generation; /* Only used if "label" is used */
unsigned refcount; /* Number of links to this object */
@@ -1734,7 +1734,7 @@ pdf_stream_dataptr (pdf_obj *stream)
return (const void *) data->stream;
}
-long
+int
pdf_stream_length (pdf_obj *stream)
{
pdf_stream *data;
@@ -1743,7 +1743,7 @@ pdf_stream_length (pdf_obj *stream)
data = stream->data;
- return (long) data->stream_length;
+ return (int) data->stream_length;
}
static void
@@ -2280,7 +2280,7 @@ pdf_flush_obj (pdf_obj *object, FILE *file)
*/
add_xref_entry(object->label, 1,
pdf_output_file_position, object->generation);
- length = sprintf(format_buffer, "%lu %hu obj\n", object->label, object->generation);
+ length = sprintf(format_buffer, "%u %hu obj\n", object->label, object->generation);
enc_mode = doc_enc_mode && !(object->flags & OBJ_NO_ENCRYPT);
pdf_enc_set_label(object->label);
pdf_enc_set_generation(object->generation);
diff --git a/Build/source/texk/dvipdfm-x/pdfobj.h b/Build/source/texk/dvipdfm-x/pdfobj.h
index 0244c3b4692..763aab1a8a3 100644
--- a/Build/source/texk/dvipdfm-x/pdfobj.h
+++ b/Build/source/texk/dvipdfm-x/pdfobj.h
@@ -154,7 +154,7 @@ extern int pdf_add_stream_flate (pdf_obj *stream,
#endif
extern int pdf_concat_stream (pdf_obj *dst, pdf_obj *src);
extern pdf_obj *pdf_stream_dict (pdf_obj *stream);
-extern long pdf_stream_length (pdf_obj *stream);
+extern int pdf_stream_length (pdf_obj *stream);
#if 0
extern void pdf_stream_set_flags (pdf_obj *stream, int flags);
extern int pdf_stream_get_flags (pdf_obj *stream);
diff --git a/Build/source/texk/dvipdfm-x/sfnt.h b/Build/source/texk/dvipdfm-x/sfnt.h
index 69271a229cd..30911d0b83b 100644
--- a/Build/source/texk/dvipdfm-x/sfnt.h
+++ b/Build/source/texk/dvipdfm-x/sfnt.h
@@ -25,21 +25,21 @@
#include "numbers.h"
#include "pdfobj.h"
-/* Acoid conflict with CHAR from <winnt.h>. */
+/* Acoid conflict with CHAR ... from <winnt.h>. */
#define CHAR SFNT_CHAR
+#define ULONG SFNT_ULONG
+#define LONG SFNT_LONG
/* Data Types as described in Apple's TTRefMan */
typedef unsigned char BYTE;
typedef signed char CHAR;
typedef unsigned short USHORT;
typedef signed short SHORT;
-typedef unsigned long ULONG;
-typedef signed long LONG;
-typedef unsigned long Fixed; /* 16.16-bit signed fixed-point number */
+typedef uint32_t ULONG;
+typedef int32_t LONG;
+typedef uint32_t Fixed; /* 16.16-bit signed fixed-point number */
typedef short FWord;
typedef unsigned short uFWord;
-typedef short F2Dot14; /* 16-bit signed fixed number with the low
- 14 bits representing fraction. */
struct sfnt_table
{
diff --git a/Build/source/texk/dvipdfm-x/spc_pdfm.c b/Build/source/texk/dvipdfm-x/spc_pdfm.c
index 94e64b849e0..29dc171feff 100644
--- a/Build/source/texk/dvipdfm-x/spc_pdfm.c
+++ b/Build/source/texk/dvipdfm-x/spc_pdfm.c
@@ -1795,7 +1795,7 @@ spc_handler_pdfm_mapline (struct spc_env *spe, struct spc_arg *ap)
*q = '\0';
mrec = NEW(1, fontmap_rec);
pdf_init_fontmap_record(mrec);
- error = pdf_read_fontmap_line(mrec, buffer, (long) (ap->endptr - ap->curptr), is_pdfm_mapline(buffer));
+ error = pdf_read_fontmap_line(mrec, buffer, (int) (ap->endptr - ap->curptr), is_pdfm_mapline(buffer));
if (error)
spc_warn(spe, "Invalid fontmap line.");
else if (opchr == '+')
diff --git a/Build/source/texk/dvipdfm-x/spc_xtx.c b/Build/source/texk/dvipdfm-x/spc_xtx.c
index 6d22fb4880e..0358e84f2bd 100644
--- a/Build/source/texk/dvipdfm-x/spc_xtx.c
+++ b/Build/source/texk/dvipdfm-x/spc_xtx.c
@@ -236,7 +236,7 @@ spc_handler_xtx_fontmapline (struct spc_env *spe, struct spc_arg *ap)
*q = '\0';
mrec = NEW(1, fontmap_rec);
pdf_init_fontmap_record(mrec);
- error = pdf_read_fontmap_line(mrec, buffer, (long) (ap->endptr - ap->curptr), is_pdfm_mapline(buffer));
+ error = pdf_read_fontmap_line(mrec, buffer, (int) (ap->endptr - ap->curptr), is_pdfm_mapline(buffer));
if (error)
spc_warn(spe, "Invalid fontmap line.");
else if (opchr == '+')
diff --git a/Build/source/texk/dvipdfm-x/system.h b/Build/source/texk/dvipdfm-x/system.h
index b43625b1385..b2b931c6cc9 100644
--- a/Build/source/texk/dvipdfm-x/system.h
+++ b/Build/source/texk/dvipdfm-x/system.h
@@ -32,13 +32,6 @@
#endif
#ifdef WIN32
-# undef ERROR
-# undef NO_ERROR
-# undef RGB
-# undef CMYK
-# undef SETLINECAP
-# undef SETLINEJOIN
-# undef SETMITERLIMIT
# pragma warning(disable : 4101 4018)
#endif /* WIN32 */
diff --git a/Build/source/texk/dvipdfm-x/t1_char.c b/Build/source/texk/dvipdfm-x/t1_char.c
index 68723801cc1..9f67b510d09 100644
--- a/Build/source/texk/dvipdfm-x/t1_char.c
+++ b/Build/source/texk/dvipdfm-x/t1_char.c
@@ -1321,7 +1321,7 @@ do_postproc (t1_chardesc *cd)
} while (0)
int
-t1char_get_metrics (card8 *src, long srclen, cff_index *subrs, t1_ginfo *ginfo)
+t1char_get_metrics (card8 *src, int srclen, cff_index *subrs, t1_ginfo *ginfo)
{
t1_chardesc t1char, *cd;
@@ -1365,7 +1365,7 @@ t1char_get_metrics (card8 *src, long srclen, cff_index *subrs, t1_ginfo *ginfo)
/*
* Encode Charpath as a Type 2 Charstring
*/
-static long
+static int
t1char_encode_charpath (t1_chardesc *cd,
double default_width, double nominal_width,
card8 *dst, card8 *endptr)
@@ -1541,16 +1541,16 @@ t1char_encode_charpath (t1_chardesc *cd,
CHECK_BUFFER(1);
*dst++ = (card8) cs_endchar;
- return (long) (dst - save);
+ return (int) (dst - save);
}
-long
-t1char_convert_charstring (card8 *dst, long dstlen,
- card8 *src, long srclen, cff_index *subrs,
+int
+t1char_convert_charstring (card8 *dst, int dstlen,
+ card8 *src, int srclen, cff_index *subrs,
double default_width, double nominal_width,
t1_ginfo *ginfo)
{
- long length;
+ int length;
t1_chardesc t1char, *cd;
cd = &t1char;
diff --git a/Build/source/texk/dvipdfm-x/t1_char.h b/Build/source/texk/dvipdfm-x/t1_char.h
index 5240a3a39cc..74b2bfdd33f 100644
--- a/Build/source/texk/dvipdfm-x/t1_char.h
+++ b/Build/source/texk/dvipdfm-x/t1_char.h
@@ -15,10 +15,10 @@ typedef struct {
} seac;
} t1_ginfo;
-extern int t1char_get_metrics (card8 *src, long srclen,
+extern int t1char_get_metrics (card8 *src, int srclen,
cff_index *subrs, t1_ginfo *ginfo);
-extern long t1char_convert_charstring (card8 *dst, long dstlen,
- card8 *src, long srclen,
+extern int t1char_convert_charstring (card8 *dst, int dstlen,
+ card8 *src, int srclen,
cff_index *subrs,
double default_width, double nominal_width,
t1_ginfo *ginfo);
diff --git a/Build/source/texk/dvipdfm-x/truetype.c b/Build/source/texk/dvipdfm-x/truetype.c
index 911a5967710..9af7b6271ea 100644
--- a/Build/source/texk/dvipdfm-x/truetype.c
+++ b/Build/source/texk/dvipdfm-x/truetype.c
@@ -92,7 +92,7 @@ pdf_font_open_truetype (pdf_font *font)
}
if (sfont->type == SFNT_TYPE_TTC) {
- unsigned long offset;
+ ULONG offset;
offset = ttc_read_offset(sfont, index);
if (offset == 0) ERROR("Invalid TTC index in %s.", ident);
error = sfnt_read_table_directory(sfont, offset);
@@ -531,7 +531,7 @@ composeglyph (USHORT *glyphs, int n_glyphs,
/* This may be called by findparanoiac(). */
static int
-composeuchar (long *unicodes, int n_unicodes,
+composeuchar (int32_t *unicodes, int n_unicodes,
const char *feat, struct glyph_mapper *gm, USHORT *gid)
{
USHORT *gids;
@@ -663,9 +663,9 @@ findparanoiac (const char *glyphname, USHORT *gid, struct glyph_mapper *gm)
for (_p = _buf, _i = 0; _i < agln->n_components && _n < 245; _i++) {
_p[_n++] = _i == 0 ? '<' : ' ';
if (agln->unicodes[_i] >= 0x10000)
- _n += sprintf(_p+_n, "U+%06lX", agln->unicodes[_i]);
+ _n += sprintf(_p+_n, "U+%06X", agln->unicodes[_i]);
else
- _n += sprintf(_p+_n, "U+%04lX", agln->unicodes[_i]);
+ _n += sprintf(_p+_n, "U+%04X", agln->unicodes[_i]);
_p[_n++] = _i == agln->n_components - 1 ? '>' : ',';
}
_p[_n++] = '\0';
@@ -686,7 +686,7 @@ resolve_glyph (const char *glyphname, USHORT *gid, struct glyph_mapper *gm)
{
int error = 0;
char *name, *suffix = NULL;
- long ucv;
+ int32_t ucv;
ASSERT(glyphname);
@@ -916,7 +916,7 @@ pdf_font_load_truetype (pdf_font *font)
}
if (sfont->type == SFNT_TYPE_TTC) {
- unsigned long offset;
+ ULONG offset;
offset = ttc_read_offset(sfont, index);
if (offset == 0) ERROR("Invalid TTC index in %s.", ident);
error = sfnt_read_table_directory(sfont, offset);
diff --git a/Build/source/texk/dvipdfm-x/tt_cmap.c b/Build/source/texk/dvipdfm-x/tt_cmap.c
index e760a7c082a..c1aa14d913a 100644
--- a/Build/source/texk/dvipdfm-x/tt_cmap.c
+++ b/Build/source/texk/dvipdfm-x/tt_cmap.c
@@ -563,7 +563,7 @@ tt_cmap_release (tt_cmap *cmap)
USHORT
-tt_cmap_lookup (tt_cmap *cmap, long cc)
+tt_cmap_lookup (tt_cmap *cmap, ULONG cc)
{
USHORT gid = 0;
@@ -876,7 +876,8 @@ handle_subst_glyphs (CMap *cmap,
for (count = 0, i = 0; i < 8192; i++) {
int j;
- long len, inbytesleft, outbytesleft;
+ int32_t len;
+ long inbytesleft, outbytesleft;
const unsigned char *inbuf;
unsigned char *outbuf;
@@ -893,7 +894,7 @@ handle_subst_glyphs (CMap *cmap,
#define MAX_UNICODES 16
/* try to look up Unicode values from the glyph name... */
char* name;
- long unicodes[MAX_UNICODES];
+ int32_t unicodes[MAX_UNICODES];
int unicode_count = -1;
name = sfnt_get_glyphname(post, cffont, gid);
if (name) {
@@ -993,7 +994,7 @@ add_to_cmap_if_used (CMap *cmap,
wbuf[0] = (cid >> 8) & 0xff;
wbuf[1] = (cid & 0xff);
- len = UC_sput_UTF16BE((long) ch, &p, wbuf + WBUF_SIZE);
+ len = UC_sput_UTF16BE(ch, &p, wbuf + WBUF_SIZE);
CMap_add_bfchar(cmap, wbuf, 2, wbuf + 2, len);
/* Skip PUA characters and alphabetic presentation forms, allowing
@@ -1104,11 +1105,11 @@ create_ToUnicode_cmap (tt_cmap *ttcmap,
ch = CMap_reverse_decode(code_to_cid_cmap, cid);
if (ch >= 0) {
- long len;
+ int len;
unsigned char *p = wbuf + 2;
wbuf[0] = (cid >> 8) & 0xff;
wbuf[1] = cid & 0xff;
- len = UC_sput_UTF16BE((long)ch, &p, wbuf + WBUF_SIZE);
+ len = UC_sput_UTF16BE(ch, &p, wbuf + WBUF_SIZE);
CMap_add_bfchar(cmap, wbuf, 2, wbuf + 2, len);
count++;
}
@@ -1179,7 +1180,7 @@ otf_create_ToUnicode_stream (const char *font_name,
char *cmap_name;
FILE *fp = NULL;
sfnt *sfont;
- long offset = 0;
+ ULONG offset = 0;
int i, cmap_type;
/* replace slash in map name with dash to make the output cmap name valid,
@@ -1352,7 +1353,7 @@ create_cmaps (CMap *cmap, CMap *tounicode,
static void
add_glyph (struct ht_table *unencoded,
- USHORT gid, long ucv, int num_unicodes, long *unicodes)
+ USHORT gid, int32_t ucv, int num_unicodes, int32_t *unicodes)
{
struct gent *glyph;
int i;
@@ -1399,9 +1400,9 @@ handle_subst (pdf_obj *dst_obj, pdf_obj *src_obj, int flag,
struct ht_table *unencoded)
{
pdf_obj *tmp;
- long i, j, src_size, dst_size;
- long src, dst;
- long src_start, src_end, dst_start, dst_end;
+ int32_t i, j, src_size, dst_size;
+ int32_t src, dst;
+ int32_t src_start, src_end, dst_start, dst_end;
src_size = pdf_array_length(src_obj);
dst_size = pdf_array_length(dst_obj);
@@ -1416,10 +1417,10 @@ handle_subst (pdf_obj *dst_obj, pdf_obj *src_obj, int flag,
tmp = pdf_get_array(src_obj, i);
if (PDF_OBJ_ARRAYTYPE(tmp)) {
- src_start = (long) pdf_number_value(pdf_get_array(tmp, 0));
- src_end = (long) pdf_number_value(pdf_get_array(tmp, 1));
+ src_start = (int32_t) pdf_number_value(pdf_get_array(tmp, 0));
+ src_end = (int32_t) pdf_number_value(pdf_get_array(tmp, 1));
} else {
- src_start = src_end = (long) pdf_number_value(tmp);
+ src_start = src_end = (int32_t) pdf_number_value(tmp);
}
for (src = src_start; src <= src_end; src++) {
glyph = find_glyph(unencoded, src);
@@ -1432,10 +1433,10 @@ handle_subst (pdf_obj *dst_obj, pdf_obj *src_obj, int flag,
if (dst > dst_end) {
tmp = pdf_get_array(dst_obj, j++);
if (PDF_OBJ_ARRAYTYPE(tmp)) {
- dst_start = (long) pdf_number_value(pdf_get_array(tmp, 0));
- dst_end = (long) pdf_number_value(pdf_get_array(tmp, 1));
+ dst_start = (int32_t) pdf_number_value(pdf_get_array(tmp, 0));
+ dst_end = (int32_t) pdf_number_value(pdf_get_array(tmp, 1));
} else {
- dst_start = dst_end = (long) pdf_number_value(tmp);
+ dst_start = dst_end = (int32_t) pdf_number_value(tmp);
}
dst = dst_start;
}
@@ -1498,12 +1499,12 @@ handle_assign (pdf_obj *dst, pdf_obj *src, int flag,
otl_gsub *gsub_list, tt_cmap *ttcmap,
struct ht_table *unencoded)
{
- long unicodes[MAX_UNICODES], ucv;
+ int32_t unicodes[MAX_UNICODES], ucv;
int i, n_unicodes, rv;
USHORT gid_in[MAX_UNICODES], lig;
n_unicodes = pdf_array_length(src); /* FIXME */
- ucv = (long) pdf_number_value(pdf_get_array(dst, 0)); /* FIXME */
+ ucv = (int32_t) pdf_number_value(pdf_get_array(dst, 0)); /* FIXME */
if (!UC_is_valid(ucv)) {
if (flag == 'r' || flag == 'p') {
if (ucv < 0x10000) {
@@ -1513,7 +1514,7 @@ handle_assign (pdf_obj *dst, pdf_obj *src, int flag,
}
}
if (flag == 'r') {
- ERROR("Invalid Unicode code specified.", ucv);
+ ERROR("Invalid Unicode code specified.");
}
return;
}
@@ -1524,7 +1525,7 @@ handle_assign (pdf_obj *dst, pdf_obj *src, int flag,
for (i = 0; i < n_unicodes; i++) {
unicodes[i] =
- (long) pdf_number_value(pdf_get_array(src, i));
+ (int32_t) pdf_number_value(pdf_get_array(src, i));
gid_in[i] = tt_cmap_lookup(ttcmap, unicodes[i]);
if (verbose > VERBOSE_LEVEL_MIN) {
@@ -1756,7 +1757,7 @@ otf_load_Unicode_CMap (const char *map_name, int ttc_index, /* 0 for non-TTC fon
int cmap_id = -1;
int tounicode_id = -1, is_cidfont = 0;
sfnt *sfont;
- unsigned long offset = 0;
+ ULONG offset = 0;
char *base_name = NULL, *cmap_name = NULL;
char *tounicode_name = NULL;
FILE *fp = NULL;
diff --git a/Build/source/texk/dvipdfm-x/tt_cmap.h b/Build/source/texk/dvipdfm-x/tt_cmap.h
index 2e9bbbbbc17..99ad50f5f04 100644
--- a/Build/source/texk/dvipdfm-x/tt_cmap.h
+++ b/Build/source/texk/dvipdfm-x/tt_cmap.h
@@ -60,7 +60,7 @@ typedef struct
extern tt_cmap *tt_cmap_read (sfnt *sfont, USHORT platform, USHORT encoding);
-extern USHORT tt_cmap_lookup (tt_cmap *cmap, long cc);
+extern USHORT tt_cmap_lookup (tt_cmap *cmap, ULONG cc);
extern void tt_cmap_release (tt_cmap *cmap);
#include "pdfobj.h"
diff --git a/Build/source/texk/dvipdfm-x/unicode.c b/Build/source/texk/dvipdfm-x/unicode.c
index a1bb934db6c..90bcddf941f 100644
--- a/Build/source/texk/dvipdfm-x/unicode.c
+++ b/Build/source/texk/dvipdfm-x/unicode.c
@@ -59,7 +59,7 @@ UC_set_verbose (void)
#define UC_SUR_HIGH_START 0xD800UL
int
-UC_sput_UTF16BE (long ucv, unsigned char **pp, unsigned char *limptr)
+UC_sput_UTF16BE (int32_t ucv, unsigned char **pp, unsigned char *limptr)
{
int count = 0;
unsigned char *p = *pp;
@@ -96,7 +96,7 @@ UC_sput_UTF16BE (long ucv, unsigned char **pp, unsigned char *limptr)
}
int
-UC_is_valid (long ucv)
+UC_is_valid (int32_t ucv)
{
if (ucv < 0 || (ucv >= 0x0000D800L && ucv <= 0x0000DFFFL))
return 0;
diff --git a/Build/source/texk/dvipdfm-x/unicode.h b/Build/source/texk/dvipdfm-x/unicode.h
index 441624fe8c9..afb5ff67ace 100644
--- a/Build/source/texk/dvipdfm-x/unicode.h
+++ b/Build/source/texk/dvipdfm-x/unicode.h
@@ -25,7 +25,7 @@
extern void UC_set_verbose (void);
-extern int UC_sput_UTF16BE (long ucv, unsigned char **dstpp, unsigned char *endptr);
-extern int UC_is_valid (long ucv);
+extern int UC_sput_UTF16BE (int32_t ucv, unsigned char **dstpp, unsigned char *endptr);
+extern int UC_is_valid (int32_t ucv);
extern int32_t UC_UTF8_decode_char(const unsigned char **pp, const unsigned char *endptr);
#endif /* _UNICODE_H_ */