From 75f2cf8fc89ac8cc1c123ab07fcb8c7d9981d17f Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Wed, 7 Jan 2015 01:12:24 +0000 Subject: Avoid compiler warnings git-svn-id: svn://tug.org/texlive/trunk@35975 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/ChangeLog | 4 ++++ Build/source/texk/dvipdfm-x/bmpimage.c | 2 +- Build/source/texk/dvipdfm-x/dpxcrypt.c | 16 ++++++++-------- Build/source/texk/dvipdfm-x/dvi.c | 4 ++-- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index 84e3c95bd09..28537cec960 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,7 @@ +2015-01-07 Akira Kakuto + + * bmpimage.c, dpxcrypt.c, dvi.c: Avoid compiler warnings. + 2015-01-07 Khaled Hosny * pdfdev.c (pdf_dev_reset_fonts): don't reset text_state.bold_param diff --git a/Build/source/texk/dvipdfm-x/bmpimage.c b/Build/source/texk/dvipdfm-x/bmpimage.c index fd83af0842c..c1e0d1a3f6e 100644 --- a/Build/source/texk/dvipdfm-x/bmpimage.c +++ b/Build/source/texk/dvipdfm-x/bmpimage.c @@ -55,7 +55,7 @@ struct hdr_info { unsigned int offset; unsigned int hsize; unsigned int width; - unsigned int height; + int height; int compression; unsigned short bit_count; /* Bits per pix */ int psize; /* Bytes per palette color: 3 for OS2, 4 for Win */ diff --git a/Build/source/texk/dvipdfm-x/dpxcrypt.c b/Build/source/texk/dvipdfm-x/dpxcrypt.c index 03364e15155..75b3f6bea47 100644 --- a/Build/source/texk/dvipdfm-x/dpxcrypt.c +++ b/Build/source/texk/dvipdfm-x/dpxcrypt.c @@ -265,14 +265,14 @@ void MD5_final (unsigned char *outbuf, MD5_CONTEXT *hd) memset(hd->buf, 0, 56); /* fill next block with zeroes */ } /* append the 64 bit count */ - hd->buf[56] = lsb; - hd->buf[57] = lsb >> 8; - hd->buf[58] = lsb >> 16; - hd->buf[59] = lsb >> 24; - hd->buf[60] = msb; - hd->buf[61] = msb >> 8; - hd->buf[62] = msb >> 16; - hd->buf[63] = msb >> 24; + hd->buf[56] = lsb & 0xff; + hd->buf[57] = (lsb >> 8) & 0xff; + hd->buf[58] = (lsb >> 16) & 0xff; + hd->buf[59] = (lsb >> 24) & 0xff; + hd->buf[60] = msb & 0xff; + hd->buf[61] = (msb >> 8) & 0xff; + hd->buf[62] = (msb >> 16) & 0xff; + hd->buf[63] = (msb >> 24) & 0xff; transform(hd, hd->buf); _gcry_burn_stack(80+6*sizeof(void*)); diff --git a/Build/source/texk/dvipdfm-x/dvi.c b/Build/source/texk/dvipdfm-x/dvi.c index 4350a1c1102..5d983b12084 100644 --- a/Build/source/texk/dvipdfm-x/dvi.c +++ b/Build/source/texk/dvipdfm-x/dvi.c @@ -1474,13 +1474,13 @@ dvi_end_reflect (void) current_font = lr_state.font; dvi_page_buf_index = lr_state.buf_index; lr_mode = REVERSE(lr_state.state); /* must precede dvi_right */ - dvi_right(-lr_width); + dvi_right(-(int32_t)lr_width); lr_width_push(); break; case LTYPESETTING: case RTYPESETTING: lr_width_pop(); - dvi_right(-lr_width); + dvi_right(-(int32_t)lr_width); lr_mode = REVERSE(lr_mode); break; default: /* lr_mode > SKIMMING */ -- cgit v1.2.3