Fixes for building wxOS2 shared with OpenWatcom.

[wxWidgets.git] / src / tiff / tif_thunder.c

diff --git a/src/tiff/tif_thunder.c b/src/tiff/tif_thunder.c
index e77e7be71fd8190a323bddaa4971fa4f5ba25746..08807959805872c3b5ee16b1115125de77c405d6 100644 (file)
--- a/src/tiff/tif_thunder.c
+++ b/src/tiff/tif_thunder.c
@@ -60,7 +60,7 @@ static const int threebitdeltas[8] = { 0, 1, 2, 3, 0, -3, -2, -1 };
        if (npixels++ & 1) \
            *op++ |= lastpixel; \
        else \
        if (npixels++ & 1) \
            *op++ |= lastpixel; \
        else \

-           op[0] = lastpixel << 4; \
+           op[0] = (tidataval_t) (lastpixel << 4); \

 }
 
 static int
 }
 
 static int


@@ -91,8 +91,10 @@ ThunderDecode(TIFF* tif, tidata_t op, tsize_t maxpixels)
                        } else
                                lastpixel |= lastpixel << 4;
                        npixels += n;
                        } else
                                lastpixel |= lastpixel << 4;
                        npixels += n;

-                       for (; n > 0; n -= 2)
-                               *op++ = lastpixel;
+                       if (npixels < maxpixels) {
+                               for (; n > 0; n -= 2)
+                                       *op++ = (tidataval_t) lastpixel;
+                       }

                        if (n == -1)
                                *--op &= 0xf0;
                        lastpixel &= 0xf;
                        if (n == -1)
                                *--op &= 0xf0;
                        lastpixel &= 0xf;