Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/openmotif/patches/CAN-2005-0605.patch

    Contents of /trunk/openmotif/patches/CAN-2005-0605.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 153 - (show annotations) (download)
    Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
    File size: 1118 byte(s) 
    -import
    1 --- lib/Xm/Xpmscan.c.orig 2005-03-02 17:00:16.415070960 +0100
    2 +++ lib/Xm/Xpmscan.c 2005-03-02 17:01:38.949709879 +0100
    3 @@ -672,8 +672,8 @@
    4 char *dst;
    5 unsigned int *iptr;
    6 char *data;
    7 - unsigned int x, y, i;
    8 - int bits, depth, ibu, ibpp, offset;
    9 + unsigned int x, y;
    10 + int bits, depth, ibu, ibpp, offset, i;
    11 unsigned long lbt;
    12 Pixel pixel, px;
    13
    14 @@ -684,6 +684,9 @@
    15 ibpp = image->bits_per_pixel;
    16 offset = image->xoffset;
    17
    18 + if (image->bitmap_unit < 0)
    19 + return (XpmNoMemory);
    20 +
    21 if ((image->bits_per_pixel | image->depth) == 1) {
    22 ibu = image->bitmap_unit;
    23 for (y = 0; y < height; y++)
    24 --- lib/Xm/Xpmcreate.c.orig 2005-03-02 17:02:00.626412844 +0100
    25 +++ lib/Xm/Xpmcreate.c 2005-03-02 17:02:35.183562480 +0100
    26 @@ -1265,10 +1265,10 @@
    27 register char *src;
    28 register char *dst;
    29 register unsigned int *iptr;
    30 - register unsigned int x, y, i;
    31 + register unsigned int x, y;
    32 register char *data;
    33 Pixel pixel, px;
    34 - int nbytes, depth, ibu, ibpp;
    35 + int nbytes, depth, ibu, ibpp, i;
    36
    37 data = image->data;
    38 iptr = pixelindex;