X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/21e5527b592198bf3433969313e1c376d12c1305..6ba636000f13b4bf7d3e7dcfad429713085f6700:/src/xpm/scan.c diff --git a/src/xpm/scan.c b/src/xpm/scan.c index bf94091ce1..8660ff99ed 100644 --- a/src/xpm/scan.c +++ b/src/xpm/scan.c @@ -318,8 +318,10 @@ XpmCreateXpmImageFromImage(display, image, shapeimage, # endif /* AMIGA */ #else +#ifndef __VISAGECPP30__ ErrorStatus = MSWGetImagePixels(display, image, width, height, &pmap, storePixel); +#endif #endif @@ -504,7 +506,7 @@ ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes) return (XpmNoMemory); for (i = 0, i2 = mask, color = colors, xcolor = xcolors; - i < ncolors; i++, i2++, color++, xcolor++, pixels++) { + i < (unsigned)ncolors; i++, i2++, color++, xcolor++, pixels++) { if (!(s = color->string = (char *) XpmMalloc(cpp + 1))) { XpmFree(xcolors); @@ -547,7 +549,7 @@ ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes) } /* end 3.2 bc */ - for (i = 0, color = colors, xcolor = xcolors; i < ncolors; + for (i = 0, color = colors, xcolor = xcolors; i < (unsigned)ncolors; i++, color++, xcolor++) { /* look for related info from the attributes if any */