cosmetic fixes to font encoding names

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

diff --git a/src/xpm/scan.c b/src/xpm/scan.c
index 8ff2e47c952c8976fdb6793381778c1ebd9e1d6a..8660ff99ed596e0b9b46c2fdec96ba375ceaba99 100644 (file)
--- a/src/xpm/scan.c
+++ b/src/xpm/scan.c
@@ -261,7 +261,7 @@ XpmCreateXpmImageFromImage(display, image, shapeimage,
     /*
      * scan shape mask if any
      */
-    if (shapeimage) 
+    if (shapeimage)
     {
 #ifndef FOR_MSW
 # ifndef AMIGA
@@ -293,7 +293,7 @@ XpmCreateXpmImageFromImage(display, image, shapeimage,
      *
      */
 
-    if (image) 
+    if (image)
     {
 #ifndef FOR_MSW
 # ifndef AMIGA
@@ -301,7 +301,7 @@ XpmCreateXpmImageFromImage(display, image, shapeimage,
                (image->byte_order == image->bitmap_bit_order))
            ErrorStatus = GetImagePixels1(image, width, height, &pmap,
                                          storePixel);
-           else if (image->format == ZPixmap) 
+           else if (image->format == ZPixmap)
        {
                if (image->bits_per_pixel == 8)
                    ErrorStatus = GetImagePixels8(image, width, height, &pmap);
@@ -309,20 +309,18 @@ XpmCreateXpmImageFromImage(display, image, shapeimage,
                        ErrorStatus = GetImagePixels16(image, width, height, &pmap);
            else if (image->bits_per_pixel == 32)
                        ErrorStatus = GetImagePixels32(image, width, height, &pmap);
-       } 
+       }
            else
                ErrorStatus = GetImagePixels(image, width, height, &pmap);
 # else
            ErrorStatus = AGetImagePixels(image, width, height, &pmap,
                                      storePixel);
 # endif /* AMIGA */
-
 #else
 
-#ifndef __OS2__
+#ifndef __VISAGECPP30__
            ErrorStatus = MSWGetImagePixels(display, image, width, height, &pmap,
                                        storePixel);
-/* calling convention all messed up OS/2 -- figure out later */
 #endif
 
 #endif
@@ -508,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);
@@ -551,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 */
@@ -991,9 +989,18 @@ AGetImagePixels (
 #else  /* ndef FOR_MSW */
 
 #ifdef __OS2__
-/* Visual Age cannot deal with old, non-ansi, code */
-static int
-MSWGetImagePixels(
+
+#ifdef __VISAGECPP30__
+static int MSWGetImagePixels(
+  Display*     display
+, XImage*      image
+, unsigned int width
+, unsigned int height
+, PixelsMap*   pmap
+, int          (*storeFunc) (Pixel, PixelsMap*, unsigned int*)
+)
+#else
+static int MSWGetImagePixels(
   Display*     display
 , XImage*      image
 , unsigned int width
@@ -1001,6 +1008,8 @@ MSWGetImagePixels(
 , PixelsMap*   pmap
 , int          (*storeFunc) ()
 )
+#endif
+
 #else
 static int
 MSWGetImagePixels(display, image, width, height, pmap, storeFunc)
@@ -1042,11 +1051,8 @@ MSWGetImagePixels(display, image, width, height, pmap, storeFunc)
            pixel = GetPixel(*display, x, y);
 #endif
 
-#ifndef __OS2__
-/* calling convention all messed up under OS/2 */
            if ((*storeFunc) (pixel, pmap, iptr))
                return (XpmNoMemory);
-#endif
        }
     }
     return (XpmSuccess);