ANSI-fication

Peter Schneider-Kamp · Peter Schneider-Kamp · commit fe74263cec2c · 2000-07-10T09:55:32.000Z
diff --git a/Modules/imageop.c b/Modules/imageop.c
@@ -35,9 +35,7 @@ typedef unsigned long Py_UInt32;
 static PyObject *ImageopError;
  
 static PyObject *
-imageop_crop(self, args)
-	PyObject *self;
-PyObject *args;
+imageop_crop(PyObject *self, PyObject *args)
 {
 	char *cp, *ncp;
 	short *nsp;
@@ -91,9 +89,7 @@ PyObject *args;
 }
  
 static PyObject *
-imageop_scale(self, args)
-	PyObject *self;
-PyObject *args;
+imageop_scale(PyObject *self, PyObject *args)
 {
 	char *cp, *ncp;
 	short *nsp;
@@ -140,9 +136,7 @@ PyObject *args;
 /* Note: this routine can use a bit of optimizing */
 
 static PyObject *
-imageop_tovideo(self, args)
-	PyObject *self;
-PyObject *args;
+imageop_tovideo(PyObject *self, PyObject *args)
 {
 	int maxx, maxy, x, y, len;
 	int i;
@@ -196,9 +190,7 @@ PyObject *args;
 }
 
 static PyObject *
-imageop_grey2mono(self, args)
-	PyObject *self;
-PyObject *args;
+imageop_grey2mono(PyObject *self, PyObject *args)
 {
 	int tres, x, y, len;
 	unsigned char *cp, *ncp;
@@ -238,9 +230,7 @@ PyObject *args;
 }
 
 static PyObject *
-imageop_grey2grey4(self, args)
-	PyObject *self;
-PyObject *args;
+imageop_grey2grey4(PyObject *self, PyObject *args)
 {
 	int x, y, len;
 	unsigned char *cp, *ncp;
@@ -279,9 +269,7 @@ PyObject *args;
 }
 
 static PyObject *
-imageop_grey2grey2(self, args)
-	PyObject *self;
-PyObject *args;
+imageop_grey2grey2(PyObject *self, PyObject *args)
 {
 	int x, y, len;
 	unsigned char *cp, *ncp;
@@ -320,9 +308,7 @@ PyObject *args;
 }
 
 static PyObject *
-imageop_dither2mono(self, args)
-	PyObject *self;
-PyObject *args;
+imageop_dither2mono(PyObject *self, PyObject *args)
 {
 	int sum, x, y, len;
 	unsigned char *cp, *ncp;
@@ -366,9 +352,7 @@ PyObject *args;
 }
 
 static PyObject *
-imageop_dither2grey2(self, args)
-	PyObject *self;
-PyObject *args;
+imageop_dither2grey2(PyObject *self, PyObject *args)
 {
 	int x, y, len;
 	unsigned char *cp, *ncp;
@@ -411,9 +395,7 @@ PyObject *args;
 }
 
 static PyObject *
-imageop_mono2grey(self, args)
-	PyObject *self;
-PyObject *args;
+imageop_mono2grey(PyObject *self, PyObject *args)
 {
 	int v0, v1, x, y, len, nlen;
 	unsigned char *cp, *ncp;
@@ -450,9 +432,7 @@ PyObject *args;
 }
 
 static PyObject *
-imageop_grey22grey(self, args)
-	PyObject *self;
-PyObject *args;
+imageop_grey22grey(PyObject *self, PyObject *args)
 {
 	int x, y, len, nlen;
 	unsigned char *cp, *ncp;
@@ -488,9 +468,7 @@ PyObject *args;
 }
 
 static PyObject *
-imageop_grey42grey(self, args)
-	PyObject *self;
-PyObject *args;
+imageop_grey42grey(PyObject *self, PyObject *args)
 {
 	int x, y, len, nlen;
 	unsigned char *cp, *ncp;
@@ -525,9 +503,7 @@ PyObject *args;
 }
 
 static PyObject *
-imageop_rgb2rgb8(self, args)
-	PyObject *self;
-PyObject *args;
+imageop_rgb2rgb8(PyObject *self, PyObject *args)
 {
 	int x, y, len, nlen;
 	Py_UInt32 *cp;
@@ -569,9 +545,7 @@ PyObject *args;
 }
 
 static PyObject *
-imageop_rgb82rgb(self, args)
-	PyObject *self;
-PyObject *args;
+imageop_rgb82rgb(PyObject *self, PyObject *args)
 {
 	int x, y, len, nlen;
 	unsigned char *cp;
@@ -612,9 +586,7 @@ PyObject *args;
 }
 
 static PyObject *
-imageop_rgb2grey(self, args)
-	PyObject *self;
-PyObject *args;
+imageop_rgb2grey(PyObject *self, PyObject *args)
 {
 	int x, y, len, nlen;
 	Py_UInt32 *cp;
@@ -650,9 +622,7 @@ PyObject *args;
 }
 
 static PyObject *
-imageop_grey2rgb(self, args)
-	PyObject *self;
-PyObject *args;
+imageop_grey2rgb(PyObject *self, PyObject *args)
 {
 	int x, y, len, nlen;
 	unsigned char *cp;
@@ -684,9 +654,7 @@ PyObject *args;
 
 /*
 static object *
-imageop_mul(self, args)
-	object *self;
-object *args;
+imageop_mul(object *self, object *args)
 {
 	char *cp, *ncp;
 	int len, size, x, y;

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,7 @@ typedef unsigned long Py_UInt32;`
`35`	`35`	`static PyObject *ImageopError;`
`36`	`36`
`37`	`37`	`static PyObject *`
`38`		`-imageop_crop(self, args)`
`39`		`- PyObject *self;`
`40`		`-PyObject *args;`
	`38`	`+imageop_crop(PyObject self, PyObject args)`
`41`	`39`	`{`
`42`	`40`	`char cp, ncp;`
`43`	`41`	`short *nsp;`
`@@ -91,9 +89,7 @@ PyObject *args;`
`91`	`89`	`}`
`92`	`90`
`93`	`91`	`static PyObject *`
`94`		`-imageop_scale(self, args)`
`95`		`- PyObject *self;`
`96`		`-PyObject *args;`
	`92`	`+imageop_scale(PyObject self, PyObject args)`
`97`	`93`	`{`
`98`	`94`	`char cp, ncp;`
`99`	`95`	`short *nsp;`
`@@ -140,9 +136,7 @@ PyObject *args;`
`140`	`136`	`/* Note: this routine can use a bit of optimizing */`
`141`	`137`
`142`	`138`	`static PyObject *`
`143`		`-imageop_tovideo(self, args)`
`144`		`- PyObject *self;`
`145`		`-PyObject *args;`
	`139`	`+imageop_tovideo(PyObject self, PyObject args)`
`146`	`140`	`{`
`147`	`141`	`int maxx, maxy, x, y, len;`
`148`	`142`	`int i;`
`@@ -196,9 +190,7 @@ PyObject *args;`
`196`	`190`	`}`
`197`	`191`
`198`	`192`	`static PyObject *`
`199`		`-imageop_grey2mono(self, args)`
`200`		`- PyObject *self;`
`201`		`-PyObject *args;`
	`193`	`+imageop_grey2mono(PyObject self, PyObject args)`
`202`	`194`	`{`
`203`	`195`	`int tres, x, y, len;`
`204`	`196`	`unsigned char cp, ncp;`
`@@ -238,9 +230,7 @@ PyObject *args;`
`238`	`230`	`}`
`239`	`231`
`240`	`232`	`static PyObject *`
`241`		`-imageop_grey2grey4(self, args)`
`242`		`- PyObject *self;`
`243`		`-PyObject *args;`
	`233`	`+imageop_grey2grey4(PyObject self, PyObject args)`
`244`	`234`	`{`
`245`	`235`	`int x, y, len;`
`246`	`236`	`unsigned char cp, ncp;`
`@@ -279,9 +269,7 @@ PyObject *args;`
`279`	`269`	`}`
`280`	`270`
`281`	`271`	`static PyObject *`
`282`		`-imageop_grey2grey2(self, args)`
`283`		`- PyObject *self;`
`284`		`-PyObject *args;`
	`272`	`+imageop_grey2grey2(PyObject self, PyObject args)`
`285`	`273`	`{`
`286`	`274`	`int x, y, len;`
`287`	`275`	`unsigned char cp, ncp;`
`@@ -320,9 +308,7 @@ PyObject *args;`
`320`	`308`	`}`
`321`	`309`
`322`	`310`	`static PyObject *`
`323`		`-imageop_dither2mono(self, args)`
`324`		`- PyObject *self;`
`325`		`-PyObject *args;`
	`311`	`+imageop_dither2mono(PyObject self, PyObject args)`
`326`	`312`	`{`
`327`	`313`	`int sum, x, y, len;`
`328`	`314`	`unsigned char cp, ncp;`
`@@ -366,9 +352,7 @@ PyObject *args;`
`366`	`352`	`}`
`367`	`353`
`368`	`354`	`static PyObject *`
`369`		`-imageop_dither2grey2(self, args)`
`370`		`- PyObject *self;`
`371`		`-PyObject *args;`
	`355`	`+imageop_dither2grey2(PyObject self, PyObject args)`
`372`	`356`	`{`
`373`	`357`	`int x, y, len;`
`374`	`358`	`unsigned char cp, ncp;`
`@@ -411,9 +395,7 @@ PyObject *args;`
`411`	`395`	`}`
`412`	`396`
`413`	`397`	`static PyObject *`
`414`		`-imageop_mono2grey(self, args)`
`415`		`- PyObject *self;`
`416`		`-PyObject *args;`
	`398`	`+imageop_mono2grey(PyObject self, PyObject args)`
`417`	`399`	`{`
`418`	`400`	`int v0, v1, x, y, len, nlen;`
`419`	`401`	`unsigned char cp, ncp;`
`@@ -450,9 +432,7 @@ PyObject *args;`
`450`	`432`	`}`
`451`	`433`
`452`	`434`	`static PyObject *`
`453`		`-imageop_grey22grey(self, args)`
`454`		`- PyObject *self;`
`455`		`-PyObject *args;`
	`435`	`+imageop_grey22grey(PyObject self, PyObject args)`
`456`	`436`	`{`
`457`	`437`	`int x, y, len, nlen;`
`458`	`438`	`unsigned char cp, ncp;`
`@@ -488,9 +468,7 @@ PyObject *args;`
`488`	`468`	`}`
`489`	`469`
`490`	`470`	`static PyObject *`
`491`		`-imageop_grey42grey(self, args)`
`492`		`- PyObject *self;`
`493`		`-PyObject *args;`
	`471`	`+imageop_grey42grey(PyObject self, PyObject args)`
`494`	`472`	`{`
`495`	`473`	`int x, y, len, nlen;`
`496`	`474`	`unsigned char cp, ncp;`
`@@ -525,9 +503,7 @@ PyObject *args;`
`525`	`503`	`}`
`526`	`504`
`527`	`505`	`static PyObject *`
`528`		`-imageop_rgb2rgb8(self, args)`
`529`		`- PyObject *self;`
`530`		`-PyObject *args;`
	`506`	`+imageop_rgb2rgb8(PyObject self, PyObject args)`
`531`	`507`	`{`
`532`	`508`	`int x, y, len, nlen;`
`533`	`509`	`Py_UInt32 *cp;`
`@@ -569,9 +545,7 @@ PyObject *args;`
`569`	`545`	`}`
`570`	`546`
`571`	`547`	`static PyObject *`
`572`		`-imageop_rgb82rgb(self, args)`
`573`		`- PyObject *self;`
`574`		`-PyObject *args;`
	`548`	`+imageop_rgb82rgb(PyObject self, PyObject args)`
`575`	`549`	`{`
`576`	`550`	`int x, y, len, nlen;`
`577`	`551`	`unsigned char *cp;`
`@@ -612,9 +586,7 @@ PyObject *args;`
`612`	`586`	`}`
`613`	`587`
`614`	`588`	`static PyObject *`
`615`		`-imageop_rgb2grey(self, args)`
`616`		`- PyObject *self;`
`617`		`-PyObject *args;`
	`589`	`+imageop_rgb2grey(PyObject self, PyObject args)`
`618`	`590`	`{`
`619`	`591`	`int x, y, len, nlen;`
`620`	`592`	`Py_UInt32 *cp;`
`@@ -650,9 +622,7 @@ PyObject *args;`
`650`	`622`	`}`
`651`	`623`
`652`	`624`	`static PyObject *`
`653`		`-imageop_grey2rgb(self, args)`
`654`		`- PyObject *self;`
`655`		`-PyObject *args;`
	`625`	`+imageop_grey2rgb(PyObject self, PyObject args)`
`656`	`626`	`{`
`657`	`627`	`int x, y, len, nlen;`
`658`	`628`	`unsigned char *cp;`
`@@ -684,9 +654,7 @@ PyObject *args;`
`684`	`654`
`685`	`655`	`/*`
`686`	`656`	`static object *`
`687`		`-imageop_mul(self, args)`
`688`		`- object *self;`
`689`		`-object *args;`
	`657`	`+imageop_mul(object self, object args)`
`690`	`658`	`{`
`691`	`659`	`char cp, ncp;`
`692`	`660`	`int len, size, x, y;`