diff options
author | Ross Burton <ross.burton@intel.com> | 2012-12-11 21:54:29 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-13 15:18:45 +0000 |
commit | d7bca38b11f537405341c890526adf4891f23df4 (patch) | |
tree | d4ab57e23ee6360a309f1c3079a6f3fd79a01275 /meta/recipes-graphics/libmatchbox/files/16bppfixes.patch | |
parent | ebd508d88164da6ddb0bb978374fddaf321f0c65 (diff) | |
download | poky-d7bca38b11f537405341c890526adf4891f23df4.tar.gz |
libmatchbox: upgrade to 1.10, drop git
All patches have been upstreamed so drop them, and as upstream isn't heavily
developed drop the git recipe.
(From OE-Core rev: 3465570601480d2e476e82b8b7254e94f87d2682)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/libmatchbox/files/16bppfixes.patch')
-rw-r--r-- | meta/recipes-graphics/libmatchbox/files/16bppfixes.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch b/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch deleted file mode 100644 index ac22b9995f..0000000000 --- a/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | Upstream-Status: Accepted | ||
2 | |||
3 | Index: libmb/mbpixbuf.c | ||
4 | =================================================================== | ||
5 | --- libmatchbox/libmb.orig/mbpixbuf.c 2006-02-01 12:45:55.000000000 +0000 | ||
6 | +++ libmatchbox/libmb/mbpixbuf.c 2006-03-11 15:20:47.000000000 +0000 | ||
7 | @@ -716,7 +716,13 @@ | ||
8 | case 15: | ||
9 | return ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3); | ||
10 | case 16: | ||
11 | - return ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3); | ||
12 | + switch (pb->byte_order) | ||
13 | + { | ||
14 | + case BYTE_ORD_24_RGB: | ||
15 | + return ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3); | ||
16 | + case BYTE_ORD_24_BGR: | ||
17 | + return ((b & 0xf8) << 8) | ((g & 0xfc) << 3) | ((r & 0xf8) >> 3); | ||
18 | + } | ||
19 | case 24: | ||
20 | case 32: | ||
21 | switch (pb->byte_order) | ||
22 | @@ -1880,12 +1886,11 @@ | ||
23 | for(y=0; y<img->height; y++) | ||
24 | for(x=0; x<img->width; x++) | ||
25 | { | ||
26 | - /* Below is potentially dangerous. | ||
27 | - */ | ||
28 | - pixel = ( *p | (*(p+1) << 8)); | ||
29 | + internal_16bpp_pixel_to_rgb(p, r, g, b); | ||
30 | + internal_16bpp_pixel_next(p); | ||
31 | + a = ((img->has_alpha) ? *p++ : 0xff); | ||
32 | |||
33 | - p += ((img->has_alpha) ? 3 : 2); | ||
34 | - | ||
35 | + pixel = mb_pixbuf_get_pixel(pb, r, g, b, a); | ||
36 | XPutPixel(img->ximg, x, y, pixel); | ||
37 | } | ||
38 | } | ||