[Python-checkins] CVS: python/dist/src/Modules rgbimgmodule.c,2.19,2.20

2000年7月10日 03:49:33 -0700

Update of /cvsroot/python/python/dist/src/Modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv20482
Modified Files:
	rgbimgmodule.c 
Log Message:
ANSI-fication
Index: rgbimgmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/rgbimgmodule.c,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -r2.19 -r2.20
*** rgbimgmodule.c	2000年07月09日 03:09:55	2.19
--- rgbimgmodule.c	2000年07月10日 10:49:30	2.20
***************
*** 120,126 ****
 */
 static void 
! addlongimgtag(dptr, xsize, ysize)
! 	Py_UInt32 *dptr;
! 	int xsize, ysize;
 {
 	dptr = dptr + (xsize * ysize);
--- 120,124 ----
 */
 static void 
! addlongimgtag(Py_UInt32 *dptr, int xsize, int ysize)
 {
 	dptr = dptr + (xsize * ysize);
***************
*** 138,143 ****
 */
 static unsigned short
! getshort(inf)
! 	FILE *inf;
 {
 	unsigned char buf[2];
--- 136,140 ----
 */
 static unsigned short
! getshort(FILE *inf)
 {
 	unsigned char buf[2];
***************
*** 148,153 ****

 static Py_UInt32
! getlong(inf)
! 	FILE *inf;
 {
 	unsigned char buf[4];
--- 145,149 ----

 static Py_UInt32
! getlong(FILE *inf)
 {
 	unsigned char buf[4];
***************
*** 158,164 ****

 static void
! putshort(outf, val)
! 	FILE *outf;
! 	unsigned short val;
 {
 	unsigned char buf[2];
--- 154,158 ----

 static void
! putshort(FILE *outf, unsigned short val)
 {
 	unsigned char buf[2];
***************
*** 170,176 ****

 static int
! putlong(outf, val)
! 	FILE *outf;
! 	Py_UInt32 val;
 {
 	unsigned char buf[4];
--- 164,168 ----

 static int
! putlong(FILE *outf, Py_UInt32 val)
 {
 	unsigned char buf[4];
***************
*** 184,190 ****

 static void
! readheader(inf, image)
! 	FILE *inf;
! 	IMAGE *image;
 {
 	memset(image ,0, sizeof(IMAGE));
--- 176,180 ----

 static void
! readheader(FILE *inf, IMAGE *image)
 {
 	memset(image ,0, sizeof(IMAGE));
***************
*** 198,204 ****

 static int
! writeheader(outf, image)
! 	FILE *outf;
! 	IMAGE *image;
 {
 	IMAGE t;
--- 188,192 ----

 static int
! writeheader(FILE *outf, IMAGE *image)
 {
 	IMAGE t;
***************
*** 220,227 ****

 static int
! writetab(outf, tab, len)
! 	FILE *outf;
! 	/*unsigned*/ Py_Int32 *tab;
! 	int len;
 {
 	int r = 0;
--- 208,212 ----

 static int
! writetab(FILE *outf, /*unsigned*/ Py_Int32 *tab, int len)
 {
 	int r = 0;
***************
*** 235,242 ****

 static void
! readtab(inf, tab, len)
! 	FILE *inf;
! 	/*unsigned*/ Py_Int32 *tab;
! 	int len;
 {
 	while(len) {
--- 220,224 ----

 static void
! readtab(FILE *inf, /*unsigned*/ Py_Int32 *tab, int len)
 {
 	while(len) {
***************
*** 252,257 ****
 */
 static PyObject *
! sizeofimage(self, args)
! 	PyObject *self, *args;
 {
 	char *name;
--- 234,238 ----
 */
 static PyObject *
! sizeofimage(PyObject *self, PyObject *args)
 {
 	char *name;
***************
*** 284,289 ****
 */
 static PyObject *
! longimagedata(self, args)
! 	PyObject *self, *args;
 {
 	char *name;
--- 265,269 ----
 */
 static PyObject *
! longimagedata(PyObject *self, PyObject *args)
 {
 	char *name;
***************
*** 466,472 ****

 static void
! interleaverow(lptr, cptr, z, n)
! 	unsigned char *lptr, *cptr;
! 	int z, n;
 {
 	lptr += z;
--- 446,450 ----

 static void
! interleaverow(unsigned char *lptr, unsigned char *cptr, int z, int n)
 {
 	lptr += z;
***************
*** 478,484 ****

 static void
! copybw(lptr, n)
! 	Py_Int32 *lptr;
! 	int n;
 {
 	while (n >= 8) {
--- 456,460 ----

 static void
! copybw(Py_Int32 *lptr, int n)
 {
 	while (n >= 8) {
***************
*** 501,506 ****

 static void
! setalpha(lptr, n)
! 	unsigned char *lptr;
 {
 	while (n >= 8) {
--- 477,481 ----

 static void
! setalpha(unsigned char *lptr, int n)
 {
 	while (n >= 8) {
***************
*** 523,529 ****

 static void
! expandrow(optr, iptr, z)
! 	unsigned char *optr, *iptr;
! 	int z;
 {
 	unsigned char pixel, count;
--- 498,502 ----

 static void
! expandrow(unsigned char *optr, unsigned char *iptr, int z)
 {
 	unsigned char pixel, count;
***************
*** 587,592 ****
 */
 static PyObject *
! longstoimage(self, args)
! 	PyObject *self, *args;
 {
 	unsigned char *lptr;
--- 560,564 ----
 */
 static PyObject *
! longstoimage(PyObject *self, PyObject *args)
 {
 	unsigned char *lptr;
***************
*** 688,694 ****

 static void
! lumrow(rgbptr, lumptr, n)
! 	unsigned char *rgbptr, *lumptr;
! 	int n;
 {
 	lumptr += CHANOFFSET(0);
--- 660,664 ----

 static void
! lumrow(unsigned char *rgbptr, unsigned char *lumptr, int n)
 {
 	lumptr += CHANOFFSET(0);
***************
*** 703,709 ****

 static int
! compressrow(lbuf, rlebuf, z, cnt)
! 	unsigned char *lbuf, *rlebuf;
! 	int z, cnt;
 {
 	unsigned char *iptr, *ibufend, *sptr, *optr;
--- 673,677 ----

 static int
! compressrow(unsigned char *lbuf, unsigned char *rlebuf, int z, int cnt)
 {
 	unsigned char *iptr, *ibufend, *sptr, *optr;
***************
*** 766,772 ****

 static PyObject *
! ttob(self, args)
! 	PyObject *self;
! 	PyObject *args;
 {
 	int order, oldorder;
--- 734,738 ----

 static PyObject *
! ttob(PyObject *self, PyObject *args)
 {
 	int order, oldorder;