summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorRobin Watts <robin.watts@artifex.com>2016-01-06 17:43:59 +0000
committerRobin Watts <robin.watts@artifex.com>2016-01-06 17:44:47 +0000
commit1db0393d21a9083586d5c055718807ec3d25f8fe (patch)
tree34615241816ce31e7fb91c4a5e28cb48f890c552 /source
parentde8dadb3fb9c1b30900eda880220659c93fb988d (diff)
downloadmupdf-1db0393d21a9083586d5c055718807ec3d25f8fe.tar.xz
Squash some warnings
Diffstat (limited to 'source')
-rw-r--r--source/fitz/ftoa.c2
-rw-r--r--source/pdf/pdf-appearance.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/source/fitz/ftoa.c b/source/fitz/ftoa.c
index d58cfce9..db2b87bb 100644
--- a/source/fitz/ftoa.c
+++ b/source/fitz/ftoa.c
@@ -83,7 +83,7 @@ multiply(diy_fp_t x, diy_fp_t y)
c = y.f >> half; d = y.f & mask;
ac = a * c; bc = b * c; ad = a * d; bd = b * d;
tmp = (bd >> half) + (ad & mask) + (bc & mask);
- tmp += 1U << (half - 1); /* Round. */
+ tmp += ((uint64_t)1U) << (half - 1); /* Round. */
r.f = ac + (ad >> half) + (bc >> half) + (tmp >> half);
r.e = x.e + y.e + half * 2;
return r;
diff --git a/source/pdf/pdf-appearance.c b/source/pdf/pdf-appearance.c
index 055c0f5f..ec40dfd8 100644
--- a/source/pdf/pdf-appearance.c
+++ b/source/pdf/pdf-appearance.c
@@ -1337,9 +1337,9 @@ void pdf_update_listbox_appearance(fz_context *ctx, pdf_document *doc, pdf_obj *
/* Add the selection rects */
if (num_sel > 0)
{
- color[0] = LIST_SEL_COLOR_R;
- color[1] = LIST_SEL_COLOR_G;
- color[2] = LIST_SEL_COLOR_B;
+ color[0] = (float)LIST_SEL_COLOR_R;
+ color[1] = (float)LIST_SEL_COLOR_G;
+ color[2] = (float)LIST_SEL_COLOR_B;
fill_rect.x0 = 0.0;
fill_rect.x1 = width;
for (i = 0; i < num_sel; i++)