[Python-checkins] CVS: python/dist/src/Modules almodule.c,1.27,1.28 cdmodule.c,1.21,1.22 cgensupport.c,2.13,2.14 flmodule.c,1.39,1.40 fmmodule.c,1.13,1.14 glmodule.c,2.6,2.7 imgfile.c,1.24,1.25
Peter Schneider-Kamp
python-dev@python.org
2000年7月10日 10:04:37 -0700
Update of /cvsroot/python/python/dist/src/Modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv7533
Modified Files:
almodule.c cdmodule.c cgensupport.c flmodule.c fmmodule.c
glmodule.c imgfile.c
Log Message:
ANSI-fication of the SGI modules (note that svmodule.c and sgimodule.c
have already been checked in)
UNTESTED!
Index: almodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/almodule.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** almodule.c 2000年07月06日 19:38:49 1.27
--- almodule.c 2000年07月10日 17:04:33 1.28
***************
*** 254,261 ****
static PyObject *
! SetConfig(self, args, func)
! alcobject *self;
! PyObject *args;
! int (*func)(ALconfig, int);
{
int par;
--- 254,258 ----
[...1103 lines suppressed...]
--- 1970,1974 ----
static PyObject *
! al_getdefault(PyObject *self, PyObject *args)
{
long device, descriptor, value;
***************
*** 2128,2133 ****
static PyObject *
! al_getminmax(self, args)
! PyObject *self, *args;
{
long device, descriptor, min, max;
--- 1982,1986 ----
static PyObject *
! al_getminmax(PyObject *self, PyObject *args)
{
long device, descriptor, min, max;
Index: cdmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/cdmodule.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** cdmodule.c 2000年06月30日 23:58:05 1.21
--- cdmodule.c 2000年07月10日 17:04:33 1.22
***************
*** 26,32 ****
static PyObject *
! CD_allowremoval(self, args)
! cdplayerobject *self;
! PyObject *args;
{
if (!PyArg_ParseTuple(args, ":allowremoval"))
--- 26,30 ----
static PyObject *
! CD_allowremoval(cdplayerobject *self, PyObject *args)
{
if (!PyArg_ParseTuple(args, ":allowremoval"))
***************
*** 40,46 ****
static PyObject *
! CD_preventremoval(self, args)
! cdplayerobject *self;
! PyObject *args;
{
if (!PyArg_ParseTuple(args, ":preventremoval"))
--- 38,42 ----
static PyObject *
! CD_preventremoval(cdplayerobject *self, PyObject *args)
{
if (!PyArg_ParseTuple(args, ":preventremoval"))
***************
*** 54,60 ****
static PyObject *
! CD_bestreadsize(self, args)
! cdplayerobject *self;
! PyObject *args;
{
if (!PyArg_ParseTuple(args, ":bestreadsize"))
--- 50,54 ----
static PyObject *
! CD_bestreadsize(cdplayerobject *self, PyObject *args)
{
if (!PyArg_ParseTuple(args, ":bestreadsize"))
***************
*** 65,71 ****
static PyObject *
! CD_close(self, args)
! cdplayerobject *self;
! PyObject *args;
{
if (!PyArg_ParseTuple(args, ":close"))
--- 59,63 ----
static PyObject *
! CD_close(cdplayerobject *self, PyObject *args)
{
if (!PyArg_ParseTuple(args, ":close"))
***************
*** 83,89 ****
static PyObject *
! CD_eject(self, args)
! cdplayerobject *self;
! PyObject *args;
{
CDSTATUS status;
--- 75,79 ----
static PyObject *
! CD_eject(cdplayerobject *self, PyObject *args)
{
CDSTATUS status;
***************
*** 106,112 ****
static PyObject *
! CD_getstatus(self, args)
! cdplayerobject *self;
! PyObject *args;
{
CDSTATUS status;
--- 96,100 ----
static PyObject *
! CD_getstatus(cdplayerobject *self, PyObject *args)
{
CDSTATUS status;
***************
*** 129,135 ****
static PyObject *
! CD_gettrackinfo(self, args)
! cdplayerobject *self;
! PyObject *args;
{
int track;
--- 117,121 ----
static PyObject *
! CD_gettrackinfo(cdplayerobject *self, PyObject *args)
{
int track;
***************
*** 155,161 ****
static PyObject *
! CD_msftoblock(self, args)
! cdplayerobject *self;
! PyObject *args;
{
int min, sec, frame;
--- 141,145 ----
static PyObject *
! CD_msftoblock(cdplayerobject *self, PyObject *args)
{
int min, sec, frame;
***************
*** 169,175 ****
static PyObject *
! CD_play(self, args)
! cdplayerobject *self;
! PyObject *args;
{
int start, play;
--- 153,157 ----
static PyObject *
! CD_play(cdplayerobject *self, PyObject *args)
{
int start, play;
***************
*** 193,199 ****
static PyObject *
! CD_playabs(self, args)
! cdplayerobject *self;
! PyObject *args;
{
int min, sec, frame, play;
--- 175,179 ----
static PyObject *
! CD_playabs(cdplayerobject *self, PyObject *args)
{
int min, sec, frame, play;
***************
*** 217,223 ****
static PyObject *
! CD_playtrack(self, args)
! cdplayerobject *self;
! PyObject *args;
{
int start, play;
--- 197,201 ----
static PyObject *
! CD_playtrack(cdplayerobject *self, PyObject *args)
{
int start, play;
***************
*** 241,247 ****
static PyObject *
! CD_playtrackabs(self, args)
! cdplayerobject *self;
! PyObject *args;
{
int track, min, sec, frame, play;
--- 219,223 ----
static PyObject *
! CD_playtrackabs(cdplayerobject *self, PyObject *args)
{
int track, min, sec, frame, play;
***************
*** 266,272 ****
static PyObject *
! CD_readda(self, args)
! cdplayerobject *self;
! PyObject *args;
{
int numframes, n;
--- 242,246 ----
static PyObject *
! CD_readda(cdplayerobject *self, PyObject *args)
{
int numframes, n;
***************
*** 295,301 ****
static PyObject *
! CD_seek(self, args)
! cdplayerobject *self;
! PyObject *args;
{
int min, sec, frame;
--- 269,273 ----
static PyObject *
! CD_seek(cdplayerobject *self, PyObject *args)
{
int min, sec, frame;
***************
*** 315,321 ****
static PyObject *
! CD_seektrack(self, args)
! cdplayerobject *self;
! PyObject *args;
{
int track;
--- 287,291 ----
static PyObject *
! CD_seektrack(cdplayerobject *self, PyObject *args)
{
int track;
***************
*** 335,341 ****
static PyObject *
! CD_seekblock(self, args)
! cdplayerobject *self;
! PyObject *args;
{
unsigned long PyTryBlock;
--- 305,309 ----
static PyObject *
! CD_seekblock(cdplayerobject *self, PyObject *args)
{
unsigned long PyTryBlock;
***************
*** 354,360 ****
static PyObject *
! CD_stop(self, args)
! cdplayerobject *self;
! PyObject *args;
{
CDSTATUS status;
--- 322,326 ----
static PyObject *
! CD_stop(cdplayerobject *self, PyObject *args)
{
CDSTATUS status;
***************
*** 377,383 ****
static PyObject *
! CD_togglepause(self, args)
! cdplayerobject *self;
! PyObject *args;
{
CDSTATUS status;
--- 343,347 ----
static PyObject *
! CD_togglepause(cdplayerobject *self, PyObject *args)
{
CDSTATUS status;
***************
*** 422,427 ****
static void
! cdplayer_dealloc(self)
! cdplayerobject *self;
{
if (self->ob_cdplayer != NULL)
--- 386,390 ----
static void
! cdplayer_dealloc(cdplayerobject *self)
{
if (self->ob_cdplayer != NULL)
***************
*** 431,437 ****
static PyObject *
! cdplayer_getattr(self, name)
! cdplayerobject *self;
! char *name;
{
if (self->ob_cdplayer == NULL) {
--- 394,398 ----
static PyObject *
! cdplayer_getattr(cdplayerobject *self, char *name)
{
if (self->ob_cdplayer == NULL) {
***************
*** 458,463 ****
static PyObject *
! newcdplayerobject(cdp)
! CDPLAYER *cdp;
{
cdplayerobject *p;
--- 419,423 ----
static PyObject *
! newcdplayerobject(CDPLAYER *cdp)
{
cdplayerobject *p;
***************
*** 471,476 ****
static PyObject *
! CD_open(self, args)
! PyObject *self, *args;
{
char *dev, *direction;
--- 431,435 ----
static PyObject *
! CD_open(PyObject *self, PyObject *args)
{
char *dev, *direction;
***************
*** 505,512 ****
static void
! CD_callback(arg, type, data)
! void *arg;
! CDDATATYPES type;
! void *data;
{
PyObject *result, *args, *v = NULL;
--- 464,468 ----
static void
! CD_callback(void *arg, CDDATATYPES type, void *data)
{
PyObject *result, *args, *v = NULL;
***************
*** 579,585 ****
static PyObject *
! CD_deleteparser(self, args)
! cdparserobject *self;
! PyObject *args;
{
int i;
--- 535,539 ----
static PyObject *
! CD_deleteparser(cdparserobject *self, PyObject *args)
{
int i;
***************
*** 604,610 ****
static PyObject *
! CD_parseframe(self, args)
! cdparserobject *self;
! PyObject *args;
{
char *cdfp;
--- 558,562 ----
static PyObject *
! CD_parseframe(cdparserobject *self, PyObject *args)
{
char *cdfp;
***************
*** 634,640 ****
static PyObject *
! CD_removecallback(self, args)
! cdparserobject *self;
! PyObject *args;
{
int type;
--- 586,590 ----
static PyObject *
! CD_removecallback(cdparserobject *self, PyObject *args)
{
int type;
***************
*** 661,667 ****
static PyObject *
! CD_resetparser(self, args)
! cdparserobject *self;
! PyObject *args;
{
if (!PyArg_ParseTuple(args, ":resetparser"))
--- 611,615 ----
static PyObject *
! CD_resetparser(cdparserobject *self, PyObject *args)
{
if (!PyArg_ParseTuple(args, ":resetparser"))
***************
*** 675,681 ****
static PyObject *
! CD_addcallback(self, args)
! cdparserobject *self;
! PyObject *args;
{
int type;
--- 623,627 ----
static PyObject *
! CD_addcallback(cdparserobject *self, PyObject *args)
{
int type;
***************
*** 729,734 ****
static void
! cdparser_dealloc(self)
! cdparserobject *self;
{
int i;
--- 675,679 ----
static void
! cdparser_dealloc(cdparserobject *self)
{
int i;
***************
*** 745,751 ****
static PyObject *
! cdparser_getattr(self, name)
! cdparserobject *self;
! char *name;
{
if (self->ob_cdparser == NULL) {
--- 690,694 ----
static PyObject *
! cdparser_getattr(cdparserobject *self, char *name)
{
if (self->ob_cdparser == NULL) {
***************
*** 773,778 ****
static PyObject *
! newcdparserobject(cdp)
! CDPARSER *cdp;
{
cdparserobject *p;
--- 716,720 ----
static PyObject *
! newcdparserobject(CDPARSER *cdp)
{
cdparserobject *p;
***************
*** 791,796 ****
static PyObject *
! CD_createparser(self, args)
! PyObject *self, *args;
{
CDPARSER *cdp;
--- 733,737 ----
static PyObject *
! CD_createparser(PyObject *self, PyObject *args)
{
CDPARSER *cdp;
***************
*** 808,813 ****
static PyObject *
! CD_msftoframe(self, args)
! PyObject *self, *args;
{
int min, sec, frame;
--- 749,753 ----
static PyObject *
! CD_msftoframe(PyObject *self, PyObject *args)
{
int min, sec, frame;
Index: cgensupport.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/cgensupport.c,v
retrieving revision 2.13
retrieving revision 2.14
diff -C2 -r2.13 -r2.14
*** cgensupport.c 2000年06月30日 23:58:05 2.13
--- cgensupport.c 2000年07月10日 17:04:33 2.14
***************
*** 21,28 ****
int
! PyArg_GetObject(args, nargs, i, p_arg)
! register PyObject *args;
! int nargs, i;
! PyObject **p_arg;
{
if (nargs != 1) {
--- 21,25 ----
int
! PyArg_GetObject(register PyObject *args, int nargs, int i, PyObject **p_arg)
{
if (nargs != 1) {
***************
*** 44,51 ****
int
! PyArg_GetLong(args, nargs, i, p_arg)
! register PyObject *args;
! int nargs, i;
! long *p_arg;
{
if (nargs != 1) {
--- 41,45 ----
int
! PyArg_GetLong(register PyObject *args, int nargs, int i, long *p_arg)
{
if (nargs != 1) {
***************
*** 65,72 ****
int
! PyArg_GetShort(args, nargs, i, p_arg)
! register PyObject *args;
! int nargs, i;
! short *p_arg;
{
long x;
--- 59,63 ----
int
! PyArg_GetShort(register PyObject *args, int nargs, int i, short *p_arg)
{
long x;
***************
*** 78,84 ****
static int
! extractdouble(v, p_arg)
! register PyObject *v;
! double *p_arg;
{
if (v == NULL) {
--- 69,73 ----
static int
! extractdouble(register PyObject *v, double *p_arg)
{
if (v == NULL) {
***************
*** 101,107 ****
static int
! extractfloat(v, p_arg)
! register PyObject *v;
! float *p_arg;
{
if (v == NULL) {
--- 90,94 ----
static int
! extractfloat(register PyObject *v, float *p_arg)
{
if (v == NULL) {
***************
*** 124,131 ****
int
! PyArg_GetFloat(args, nargs, i, p_arg)
! register PyObject *args;
! int nargs, i;
! float *p_arg;
{
PyObject *v;
--- 111,115 ----
int
! PyArg_GetFloat(register PyObject *args, int nargs, int i, float *p_arg)
{
PyObject *v;
***************
*** 140,147 ****
int
! PyArg_GetString(args, nargs, i, p_arg)
! PyObject *args;
! int nargs, i;
! string *p_arg;
{
PyObject *v;
--- 124,128 ----
int
! PyArg_GetString(PyObject *args, int nargs, int i, string *p_arg)
{
PyObject *v;
***************
*** 156,163 ****
int
! PyArg_GetChar(args, nargs, i, p_arg)
! PyObject *args;
! int nargs, i;
! char *p_arg;
{
string x;
--- 137,141 ----
int
! PyArg_GetChar(PyObject *args, int nargs, int i, char *p_arg)
{
string x;
***************
*** 173,180 ****
int
! PyArg_GetLongArraySize(args, nargs, i, p_arg)
! PyObject *args;
! int nargs, i;
! long *p_arg;
{
PyObject *v;
--- 151,155 ----
int
! PyArg_GetLongArraySize(PyObject *args, int nargs, int i, long *p_arg)
{
PyObject *v;
***************
*** 193,200 ****
int
! PyArg_GetShortArraySize(args, nargs, i, p_arg)
! PyObject *args;
! int nargs, i;
! short *p_arg;
{
long x;
--- 168,172 ----
int
! PyArg_GetShortArraySize(PyObject *args, int nargs, int i, short *p_arg)
{
long x;
***************
*** 208,216 ****
int
! PyArg_GetLongArray(args, nargs, i, n, p_arg)
! PyObject *args;
! int nargs, i;
! int n;
! long *p_arg; /* [n] */
{
PyObject *v, *w;
--- 180,184 ----
int
! PyArg_GetLongArray(PyObject *args, int nargs, int i, int n, long *p_arg)
{
PyObject *v, *w;
***************
*** 249,257 ****
int
! PyArg_GetShortArray(args, nargs, i, n, p_arg)
! PyObject *args;
! int nargs, i;
! int n;
! short *p_arg; /* [n] */
{
PyObject *v, *w;
--- 217,221 ----
int
! PyArg_GetShortArray(PyObject *args, int nargs, int i, int n, short *p_arg)
{
PyObject *v, *w;
***************
*** 290,298 ****
int
! PyArg_GetDoubleArray(args, nargs, i, n, p_arg)
! PyObject *args;
! int nargs, i;
! int n;
! double *p_arg; /* [n] */
{
PyObject *v, *w;
--- 254,258 ----
int
! PyArg_GetDoubleArray(PyObject *args, int nargs, int i, int n, double *p_arg)
{
PyObject *v, *w;
***************
*** 327,335 ****
int
! PyArg_GetFloatArray(args, nargs, i, n, p_arg)
! PyObject *args;
! int nargs, i;
! int n;
! float *p_arg; /* [n] */
{
PyObject *v, *w;
--- 287,291 ----
int
! PyArg_GetFloatArray(PyObject *args, int nargs, int i, int n, float *p_arg)
{
PyObject *v, *w;
Index: flmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/flmodule.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** flmodule.c 2000年06月30日 23:58:05 1.39
--- flmodule.c 2000年07月10日 17:04:33 1.40
***************
*** 52,57 ****
static void
! knowgeneric(g)
! genericobject *g;
{
int i, n;
--- 52,56 ----
static void
! knowgeneric(genericobject *g)
[...2636 lines suppressed...]
static PyObject *
! forms_get_pattern(PyObject *f, PyObject *args)
{
return forms_file_selector_func(args, fl_get_pattern);
***************
*** 2450,2456 ****
static PyObject *
! forms_get_filename(f, args)
! PyObject *f;
! PyObject *args;
{
return forms_file_selector_func(args, fl_get_filename);
--- 2085,2089 ----
static PyObject *
! forms_get_filename(PyObject *f, PyObject *args)
{
return forms_file_selector_func(args, fl_get_filename);
Index: fmmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/fmmodule.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** fmmodule.c 2000年06月30日 23:58:05 1.13
--- fmmodule.c 2000年07月10日 17:04:33 1.14
***************
*** 30,35 ****
static PyObject *
! newfhobject(fh)
! fmfonthandle fh;
{
fhobject *fhp;
--- 30,34 ----
static PyObject *
! newfhobject(fmfonthandle fh)
{
fhobject *fhp;
***************
*** 49,55 ****
static PyObject *
! fh_scalefont(self, args)
! fhobject *self;
! PyObject *args;
{
double size;
--- 48,52 ----
static PyObject *
! fh_scalefont(fhobject *self, PyObject *args)
{
double size;
***************
*** 62,68 ****
static PyObject *
! fh_setfont(self, args)
! fhobject *self;
! PyObject *args;
{
if (!PyArg_NoArgs(args))
--- 59,63 ----
static PyObject *
! fh_setfont(fhobject *self, PyObject *args)
{
if (!PyArg_NoArgs(args))
***************
*** 74,80 ****
static PyObject *
! fh_getfontname(self, args)
! fhobject *self;
! PyObject *args;
{
char fontname[256];
--- 69,73 ----
static PyObject *
! fh_getfontname(fhobject *self, PyObject *args)
{
char fontname[256];
***************
*** 91,97 ****
static PyObject *
! fh_getcomment(self, args)
! fhobject *self;
! PyObject *args;
{
char comment[256];
--- 84,88 ----
static PyObject *
! fh_getcomment(fhobject *self, PyObject *args)
{
char comment[256];
***************
*** 108,114 ****
static PyObject *
! fh_getfontinfo(self, args)
! fhobject *self;
! PyObject *args;
{
fmfontinfo info;
--- 99,103 ----
static PyObject *
! fh_getfontinfo(fhobject *self, PyObject *args)
{
fmfontinfo info;
***************
*** 132,138 ****
#if 0
static PyObject *
! fh_getwholemetrics(self, args)
! fhobject *self;
! PyObject *args;
{
}
--- 121,125 ----
#if 0
static PyObject *
! fh_getwholemetrics(fhobject *self, PyObject *args)
{
}
***************
*** 140,146 ****
static PyObject *
! fh_getstrwidth(self, args)
! fhobject *self;
! PyObject *args;
{
char *str;
--- 127,131 ----
static PyObject *
! fh_getstrwidth(fhobject *self, PyObject *args)
{
char *str;
***************
*** 164,170 ****
static PyObject *
! fh_getattr(fhp, name)
! fhobject *fhp;
! char *name;
{
return Py_FindMethod(fh_methods, (PyObject *)fhp, name);
--- 149,153 ----
static PyObject *
! fh_getattr(fhobject *fhp, char *name)
{
return Py_FindMethod(fh_methods, (PyObject *)fhp, name);
***************
*** 172,177 ****
static void
! fh_dealloc(fhp)
! fhobject *fhp;
{
fmfreefont(fhp->fh_fh);
--- 155,159 ----
static void
! fh_dealloc(fhobject *fhp)
{
fmfreefont(fhp->fh_fh);
***************
*** 198,203 ****
static PyObject *
! fm_init(self, args)
! PyObject *self, *args;
{
if (!PyArg_NoArgs(args))
--- 180,184 ----
static PyObject *
! fm_init(PyObject *self, *args)
{
if (!PyArg_NoArgs(args))
***************
*** 209,214 ****
static PyObject *
! fm_findfont(self, args)
! PyObject *self, *args;
{
char *str;
--- 190,194 ----
static PyObject *
! fm_findfont(PyObject *self, *args)
{
char *str;
***************
*** 219,224 ****
static PyObject *
! fm_prstr(self, args)
! PyObject *self, *args;
{
char *str;
--- 199,203 ----
static PyObject *
! fm_prstr(PyObject *self, *args)
{
char *str;
***************
*** 235,240 ****
static void
! clientproc(fontname)
! char *fontname;
{
int err;
--- 214,218 ----
static void
! clientproc(char *fontname)
{
int err;
***************
*** 256,261 ****
static PyObject *
! fm_enumerate(self, args)
! PyObject *self, *args;
{
PyObject *res;
--- 234,238 ----
static PyObject *
! fm_enumerate(PyObject *self, PyObject *args)
{
PyObject *res;
***************
*** 272,277 ****
static PyObject *
! fm_setpath(self, args)
! PyObject *self, *args;
{
char *str;
--- 249,253 ----
static PyObject *
! fm_setpath(PyObject *self, PyObject *args)
{
char *str;
***************
*** 284,289 ****
static PyObject *
! fm_fontpath(self, args)
! PyObject *self, *args;
{
if (!PyArg_NoArgs(args))
--- 260,264 ----
static PyObject *
! fm_fontpath(PyObject *self, *args)
{
if (!PyArg_NoArgs(args))
Index: glmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/glmodule.c,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -r2.6 -r2.7
*** glmodule.c 2000年07月09日 03:09:55 2.6
--- glmodule.c 2000年07月10日 17:04:33 2.7
***************
*** 70,76 ****
static PyObject *
! gl_qread(self, args)
! PyObject *self;
! PyObject *args;
{
long retval;
--- 70,74 ----
static PyObject *
[...6474 lines suppressed...]
static PyObject *
! gl_qgetfd(PyObject *self, PyObject *args)
{
long retval;
***************
*** 8043,8049 ****
static PyObject *
! gl_dither(self, args)
! PyObject *self;
! PyObject *args;
{
long arg1 ;
--- 7187,7191 ----
static PyObject *
! gl_dither(PyObject *self, PyObject *args)
{
long arg1 ;
Index: imgfile.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/imgfile.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** imgfile.c 2000年06月30日 23:58:05 1.24
--- imgfile.c 2000年07月10日 17:04:33 1.25
***************
*** 47,52 ****
static void
! imgfile_error(str)
! char *str;
{
PyErr_SetString(ImgfileError, str);
--- 47,51 ----
static void
! imgfile_error(char *str)
{
PyErr_SetString(ImgfileError, str);
***************
*** 60,65 ****
static IMAGE *
! imgfile_open(fname)
! char *fname;
{
IMAGE *image;
--- 59,63 ----
static IMAGE *
! imgfile_open(char *fname)
{
IMAGE *image;
***************
*** 82,88 ****
static PyObject *
! imgfile_ttob(self, args)
! PyObject *self;
! PyObject *args;
{
int newval;
--- 80,84 ----
static PyObject *
! imgfile_ttob(PyObject *self, PyObject *args)
{
int newval;
***************
*** 97,103 ****
static PyObject *
! imgfile_read(self, args)
! PyObject *self;
! PyObject *args;
{
char *fname;
--- 93,97 ----
static PyObject *
! imgfile_read(PyObject *self, PyObject *args)
{
char *fname;
***************
*** 191,197 ****
static void
! xs_get(buf, y)
! short *buf;
! int y;
{
if (top_to_bottom)
--- 185,189 ----
static void
! xs_get(short *buf, int y)
{
if (top_to_bottom)
***************
*** 202,208 ****
static void
! xs_put_c(buf, y)
! short *buf;
! int y;
{
char *datap = (char *)glob_datap + y*glob_width;
--- 194,198 ----
static void
! xs_put_c(short *buf, int y)
{
char *datap = (char *)glob_datap + y*glob_width;
***************
*** 214,220 ****
static void
! xs_put_0(buf, y)
! short *buf;
! int y;
{
long *datap = glob_datap + y*glob_width;
--- 204,208 ----
static void
! xs_put_0(short *buf, int y)
{
long *datap = glob_datap + y*glob_width;
***************
*** 225,231 ****
}
static void
! xs_put_12(buf, y)
! short *buf;
! int y;
{
long *datap = glob_datap + y*glob_width;
--- 213,217 ----
}
static void
! xs_put_12(short *buf, int y)
{
long *datap = glob_datap + y*glob_width;
***************
*** 237,247 ****
static void
! xscale(image, xsize, ysize, zsize, datap, xnew, ynew, fmode, blur)
! IMAGE *image;
! int xsize, ysize, zsize;
! long *datap;
! int xnew, ynew;
! int fmode;
! double blur;
{
glob_image = image;
--- 223,228 ----
static void
! xscale(IMAGE *image, int xsize, int ysize, int zsize,
! long *datap, int xnew, int ynew, int fmode, double blur)
{
glob_image = image;
***************
*** 268,274 ****
static PyObject *
! imgfile_readscaled(self, args)
! PyObject *self;
! PyObject *args;
{
char *fname;
--- 249,253 ----
static PyObject *
! imgfile_readscaled(PyObject *self, PyObject *args)
{
char *fname;
***************
*** 416,422 ****
static PyObject *
! imgfile_getsizes(self, args)
! PyObject *self;
! PyObject *args;
{
char *fname;
--- 395,399 ----
static PyObject *
! imgfile_getsizes(PyObject *self, PyObject *args)
{
char *fname;
***************
*** 435,441 ****
static PyObject *
! imgfile_write(self, args)
! PyObject *self;
! PyObject *args;
{
IMAGE *image;
--- 412,416 ----
static PyObject *
! imgfile_write(PyObject *self, PyObject *args)
{
IMAGE *image;