Mercurial > pygame

diff src/pixelarray.c @ 997:46a786465642

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added weight support to PixelArray.extract() and PixelArray.replace().
author marcus
date Tue, 08 Apr 2008 18:57:29 +0000
parents b678d5e99f33
children 509ba60a0f2b
line wrap: on
line diff
--- a/src/pixelarray.c	Tue Apr 08 08:47:39 2008 +0000
+++ b/src/pixelarray.c	Tue Apr 08 18:57:29 2008 +0000
@@ -368,13 +368,13 @@
                 /* Construct the columns */
                 pixel = (Uint32) *((Uint8 *) pixels + x + y * array->padding);
                 PyString_ConcatAndDel (&string, PyString_FromFormat
-                    ("%ld, ", pixel));
+                    ("%ld, ", (long)pixel));
                 x += array->xstep;
                 posx += absxstep;
             }
             pixel = (Uint32) *((Uint8 *) pixels + x + y * array->padding);
             PyString_ConcatAndDel (&string,
-                PyString_FromFormat ("%ld]", pixel));
+                PyString_FromFormat ("%ld]", (long)pixel));
             y += array->ystep;
             posy += absystep;
         }
@@ -392,13 +392,13 @@
                 pixel = (Uint32)
                     *((Uint16 *) (pixels + y * array->padding) + x);
                 PyString_ConcatAndDel (&string, PyString_FromFormat
-                    ("%ld, ", pixel));
+                    ("%ld, ", (long)pixel));
                 x += array->xstep;
                 posx += absxstep;
             }
             pixel = (Uint32) *((Uint16 *) (pixels + y * array->padding) + x);
             PyString_ConcatAndDel (&string,
-                PyString_FromFormat ("%ld]", pixel));
+                PyString_FromFormat ("%ld]", (long)pixel));
             y += array->ystep;
             posy += absystep;
         }
@@ -420,7 +420,7 @@
                 pixel = (px24[2]) + (px24[1] << 8) + (px24[0] << 16);
 #endif
                 PyString_ConcatAndDel (&string, PyString_FromFormat
-                    ("%ld, ", pixel));
+                    ("%ld, ", (long)pixel));
                 x += array->xstep;
                 posx += absxstep;
             }
@@ -431,7 +431,7 @@
             pixel = (px24[2]) + (px24[1] << 8) + (px24[0] << 16);
 #endif
             PyString_ConcatAndDel (&string,
-                PyString_FromFormat ("%ld]", pixel));
+                PyString_FromFormat ("%ld]", (long)pixel));
             y += array->ystep;
             posy += absystep;
         }
@@ -448,13 +448,13 @@
                 /* Construct the columns */
                 pixel = *((Uint32 *) (pixels + y * array->padding) + x);
                 PyString_ConcatAndDel (&string, PyString_FromFormat
-                    ("%ld, ", pixel));
+                    ("%ld, ", (long)pixel));
                 x += array->xstep;
                 posx += absxstep;
             }
             pixel = *((Uint32 *) (pixels + y * array->padding) + x);
             PyString_ConcatAndDel (&string,
-                PyString_FromFormat ("%ld]", pixel));
+                PyString_FromFormat ("%ld]", (long)pixel));
             y += array->ystep;
             posy += absystep;
         }