diff options
| author | Keith Packard <keithp@keithp.com> | 2011-04-27 12:01:56 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-04-27 12:01:56 -0700 |
| commit | ec9ea4017885cefe5519a4e890b0ff1a5518235a (patch) | |
| tree | 7cc36fe3998133adf8417a2479c0853e1a0f08ac /fb | |
| parent | c6cb70be1ed7cf73bd3411b8d66ec05a9efcfeb9 (diff) | |
| parent | 6f29dbf5e36bef5ecb08f02d367988dee0f9f1cd (diff) | |
Merge remote-tracking branch 'jeremyhu/master'
Diffstat (limited to 'fb')
| -rw-r--r-- | fb/fbbltone.c | 5 | ||||
| -rw-r--r-- | fb/fbpict.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/fb/fbbltone.c b/fb/fbbltone.c index 629b13a0e..0a91575a7 100644 --- a/fb/fbbltone.c +++ b/fb/fbbltone.c @@ -26,6 +26,11 @@ #include "fb.h" +#ifdef __clang__ +/* shift overflow is intentional */ +#pragma clang diagnostic ignored "-Wshift-overflow" +#endif + /* * Example: srcX = 13 dstX = 8 (FB unit 32 dstBpp 8) * diff --git a/fb/fbpict.c b/fb/fbpict.c index 133f4226c..d1fd0cbbd 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c @@ -160,7 +160,7 @@ create_bits_picture (PicturePtr pict, fbGetPixmapBitsData(pixmap, bits, stride, bpp); image = pixman_image_create_bits ( - pict->format, + (pixman_format_code_t)pict->format, pixmap->drawable.width, pixmap->drawable.height, (uint32_t *)bits, stride * sizeof (FbStride)); |