wxHTML src code indentation now conforms (more) to wxWin coding style

[wxWidgets.git] / src / xpm / scan.c

diff --git a/src/xpm/scan.c b/src/xpm/scan.c
index f3c7f49d8d838fa24b794dbfceeb16a0326ef084..8660ff99ed596e0b9b46c2fdec96ba375ceaba99 100644 (file)
--- a/src/xpm/scan.c
+++ b/src/xpm/scan.c
@@ -316,9 +316,12 @@ XpmCreateXpmImageFromImage(display, image, shapeimage,
            ErrorStatus = AGetImagePixels(image, width, height, &pmap,
                                      storePixel);
 # endif /* AMIGA */
            ErrorStatus = AGetImagePixels(image, width, height, &pmap,
                                      storePixel);
 # endif /* AMIGA */

+#else

 
 

+#ifndef __VISAGECPP30__

            ErrorStatus = MSWGetImagePixels(display, image, width, height, &pmap,
                                        storePixel);
            ErrorStatus = MSWGetImagePixels(display, image, width, height, &pmap,
                                        storePixel);

+#endif

 
 #endif
 
 
 #endif
 


@@ -503,7 +506,7 @@ ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes)
        return (XpmNoMemory);
 
     for (i = 0, i2 = mask, color = colors, xcolor = xcolors;
        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);
 
        if (!(s = color->string = (char *) XpmMalloc(cpp + 1))) {
            XpmFree(xcolors);


@@ -546,7 +549,7 @@ ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes)
     }
 /* end 3.2 bc */
 
     }
 /* 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 */
                                                  i++, color++, xcolor++) {
 
        /* look for related info from the attributes if any */