Attachment #132763 for bug #194932




	PyObject *surfobj, *string=NULL;
	char *format, *data, *pixels;
	SDL_Surface *surf, *temp=NULL;
	int w, h, color, flipped=0;
	Py_ssize_t len;
	int Rmask, Gmask, Bmask, Amask, Rshift, Gshift, Bshift, Ashift, Rloss, Gloss, Bloss, Aloss;
	int hascolorkey, colorkey;


	}
	else if(!strcmp(format, "RGB"))
	{
		string = PyString_FromStringAndSize(NULL, (Py_ssize_t)surf->w*surf->h*3);
		if(!string)
			return NULL;
		PyString_AsStringAndSize(string, &data, &len);

		if(strcmp(format, "RGBA"))
			hascolorkey = 0;

		string = PyString_FromStringAndSize(NULL, (Py_ssize_t)surf->w*surf->h*4);
		if(!string)
			return NULL;
		PyString_AsStringAndSize(string, &data, &len);

	PyObject *string;
	char *format, *data;
	SDL_Surface *surf = NULL;
	int w, h, flipped=0;
	Py_ssize_t len;
	int loopw, looph;

	if(!PyArg_ParseTuple(arg, "O!(ii)s|i", &PyString_Type, &string, &w, &h, &format, &flipped))

	PyObject *buffer;
	char *format, *data;
	SDL_Surface *surf = NULL;
	int w, h;
	Py_ssize_t len;
        PyObject *surfobj;

	if(!PyArg_ParseTuple(arg, "O(ii)s|i", &buffer, &w, &h, &format))

Return to bug 194932

Lines 291-297 Link Here

(-)src/image.c.old (-5 / +8 lines)
291	PyObject surfobj, string=NULL;	291	PyObject surfobj, string=NULL;
292	char format, data, *pixels;	292	char format, data, *pixels;
293	SDL_Surface surf, temp=NULL;	293	SDL_Surface surf, temp=NULL;
294	int w, h, color, len, flipped=0;	294	int w, h, color, flipped=0;
		295	Py_ssize_t len;
295	int Rmask, Gmask, Bmask, Amask, Rshift, Gshift, Bshift, Ashift, Rloss, Gloss, Bloss, Aloss;	296	int Rmask, Gmask, Bmask, Amask, Rshift, Gshift, Bshift, Ashift, Rloss, Gloss, Bloss, Aloss;
296	int hascolorkey, colorkey;	297	int hascolorkey, colorkey;
297		298
Lines 331-337 Link Here
331	}	332	}
332	else if(!strcmp(format, "RGB"))	333	else if(!strcmp(format, "RGB"))
333	{	334	{
334	string = PyString_FromStringAndSize(NULL, surf->wsurf->h3);	335	string = PyString_FromStringAndSize(NULL, (Py_ssize_t)surf->wsurf->h3);
335	if(!string)	336	if(!string)
336	return NULL;	337	return NULL;
337	PyString_AsStringAndSize(string, &data, &len);	338	PyString_AsStringAndSize(string, &data, &len);
Lines 407-413 Link Here
407	if(strcmp(format, "RGBA"))	408	if(strcmp(format, "RGBA"))
408	hascolorkey = 0;	409	hascolorkey = 0;
409		410
410	string = PyString_FromStringAndSize(NULL, surf->wsurf->h4);	411	string = PyString_FromStringAndSize(NULL, (Py_ssize_t)surf->wsurf->h4);
411	if(!string)	412	if(!string)
412	return NULL;	413	return NULL;
413	PyString_AsStringAndSize(string, &data, &len);	414	PyString_AsStringAndSize(string, &data, &len);
Lines 605-611 Link Here
605	PyObject *string;	606	PyObject *string;
606	char format, data;	607	char format, data;
607	SDL_Surface *surf = NULL;	608	SDL_Surface *surf = NULL;
608	int w, h, len, flipped=0;	609	int w, h, flipped=0;
		610	Py_ssize_t len;
609	int loopw, looph;	611	int loopw, looph;
610		612
611	if(!PyArg_ParseTuple(arg, "O!(ii)s\|i", &PyString_Type, &string, &w, &h, &format, &flipped))	613	if(!PyArg_ParseTuple(arg, "O!(ii)s\|i", &PyString_Type, &string, &w, &h, &format, &flipped))
Lines 729-735 Link Here
729	PyObject *buffer;	731	PyObject *buffer;
730	char format, data;	732	char format, data;
731	SDL_Surface *surf = NULL;	733	SDL_Surface *surf = NULL;
732	int w, h, len;	734	int w, h;
		735	Py_ssize_t len;
733	PyObject *surfobj;	736	PyObject *surfobj;
734		737
735	if(!PyArg_ParseTuple(arg, "O(ii)s\|i", &buffer, &w, &h, &format))	738	if(!PyArg_ParseTuple(arg, "O(ii)s\|i", &buffer, &w, &h, &format))