summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/legacy/i810/i810_memory.c2
-rw-r--r--src/sna/sna_accel.c2
-rw-r--r--src/sna/sna_trapezoids.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/legacy/i810/i810_memory.c b/src/legacy/i810/i810_memory.c
index bd7c8db1..c3de2777 100644
--- a/src/legacy/i810/i810_memory.c
+++ b/src/legacy/i810/i810_memory.c
@@ -73,7 +73,7 @@ I810AllocHigh(I810MemRange * result, I810MemRange * pool, int size)
int
I810AllocateGARTMemory(ScrnInfoPtr pScrn)
{
- unsigned long size = pScrn->videoRam * 1024;
+ unsigned long size = pScrn->videoRam * 1024UL;
I810Ptr pI810 = I810PTR(pScrn);
int key;
long tom = 0;
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index a68e5fb7..8abdf840 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -2113,7 +2113,7 @@ skip_inplace_map:
pixmap->drawable.bitsPerPixel == 8 ||
priv->clear_color == (1 << pixmap->drawable.depth) - 1) {
memset(pixmap->devPrivate.ptr, priv->clear_color,
- pixmap->devKind * pixmap->drawable.height);
+ (size_t)pixmap->devKind * pixmap->drawable.height);
} else {
pixman_fill(pixmap->devPrivate.ptr,
pixmap->devKind/sizeof(uint32_t),
diff --git a/src/sna/sna_trapezoids.c b/src/sna/sna_trapezoids.c
index a0a8b5b2..7d133d8f 100644
--- a/src/sna/sna_trapezoids.c
+++ b/src/sna/sna_trapezoids.c
@@ -902,7 +902,7 @@ triangles_fallback(CARD8 op,
if (!scratch)
return;
- memset(scratch->devPrivate.ptr, 0, scratch->devKind*height);
+ memset(scratch->devPrivate.ptr, 0, (size_t)scratch->devKind*height);
image = pixman_image_create_bits(format, width, height,
scratch->devPrivate.ptr,
scratch->devKind);