diff options
author | Koen Kooi <koen@openembedded.org> | 2008-10-22 17:57:15 +0200 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2008-10-22 17:57:15 +0200 |
commit | 6fe9490eac7366d9da691d4129b8d2d23f19a139 (patch) | |
tree | 46a8cdc9a72a8c414a7824225bd76ec8c241fbdb /packages/lesstif/files/020_unsigned_int.diff | |
parent | 3836ac00385216dd47d89ec3cebc12e5446feef9 (diff) | |
parent | ca7e39e27802da8aecf68d74166ec0d2117c8c70 (diff) |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/lesstif/files/020_unsigned_int.diff')
-rw-r--r-- | packages/lesstif/files/020_unsigned_int.diff | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/packages/lesstif/files/020_unsigned_int.diff b/packages/lesstif/files/020_unsigned_int.diff new file mode 100644 index 0000000000..a682d9704c --- /dev/null +++ b/packages/lesstif/files/020_unsigned_int.diff @@ -0,0 +1,38 @@ +--- lesstif2-0.94.4.orig/lib/Xm-2.1/Xpmcreate.c ++++ lesstif2-0.94.4/lib/Xm-2.1/Xpmcreate.c +@@ -1265,10 +1265,10 @@ + register char *src; + register char *dst; + register unsigned int *iptr; +- register unsigned int x, y, i; ++ register unsigned int x, y; + register char *data; + Pixel pixel, px; +- int nbytes, depth, ibu, ibpp; ++ int nbytes, depth, ibu, ibpp, i; + + data = image->data; + iptr = pixelindex; +--- lesstif2-0.94.4.orig/lib/Xm-2.1/Xpmscan.c ++++ lesstif2-0.94.4/lib/Xm-2.1/Xpmscan.c +@@ -672,8 +672,8 @@ + char *dst; + unsigned int *iptr; + char *data; +- unsigned int x, y, i; +- int bits, depth, ibu, ibpp, offset; ++ unsigned int x, y; ++ int bits, depth, ibu, ibpp, offset, i; + unsigned long lbt; + Pixel pixel, px; + +@@ -684,6 +684,9 @@ + ibpp = image->bits_per_pixel; + offset = image->xoffset; + ++ if (image->bitmap_unit < 0) ++ return (XpmNoMemory); ++ + if ((image->bits_per_pixel | image->depth) == 1) { + ibu = image->bitmap_unit; + for (y = 0; y < height; y++) |