using the Py_RETURN_NONE macro

This commit is contained in:
wiredfool 2013-05-13 21:46:50 -07:00
parent a7488d287e
commit 9ac38c1a3a

35
_webp.c
View File

@ -15,8 +15,7 @@ PyObject* WebPGetFeatures_wrapper(PyObject* self, PyObject* args)
if (!PyArg_ParseTuple(args, "S", &webp_string)) { if (!PyArg_ParseTuple(args, "S", &webp_string)) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
PyBytes_AsStringAndSize((PyObject *) webp_string, (char**)&webp, &size); PyBytes_AsStringAndSize((PyObject *) webp_string, (char**)&webp, &size);
@ -29,8 +28,7 @@ PyObject* WebPGetFeatures_wrapper(PyObject* self, PyObject* args)
} else { } else {
// TODO: raise some sort of error // TODO: raise some sort of error
printf("Error occured checking webp file with code: %d\n", vp8_status_code); printf("Error occured checking webp file with code: %d\n", vp8_status_code);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
return Py_BuildValue("b", features.has_alpha); return Py_BuildValue("b", features.has_alpha);
@ -50,15 +48,13 @@ PyObject* WebPEncodeRGB_wrapper(PyObject* self, PyObject* args)
size_t ret_size; size_t ret_size;
if (!PyArg_ParseTuple(args, "Siiif", &rgb_string, &width, &height, &stride, &quality_factor)) { if (!PyArg_ParseTuple(args, "Siiif", &rgb_string, &width, &height, &stride, &quality_factor)) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
PyBytes_AsStringAndSize((PyObject *) rgb_string, (char**)&rgb, &size); PyBytes_AsStringAndSize((PyObject *) rgb_string, (char**)&rgb, &size);
if (stride * height > size) { if (stride * height > size) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
ret_size = WebPEncodeRGB(rgb, width, height, stride, quality_factor, &output); ret_size = WebPEncodeRGB(rgb, width, height, stride, quality_factor, &output);
@ -67,9 +63,7 @@ PyObject* WebPEncodeRGB_wrapper(PyObject* self, PyObject* args)
free(output); free(output);
return ret; return ret;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
@ -86,15 +80,13 @@ PyObject* WebPEncodeRGBA_wrapper(PyObject* self, PyObject* args)
size_t ret_size; size_t ret_size;
if (!PyArg_ParseTuple(args, "Siiif", &rgba_string, &width, &height, &stride, &quality_factor)) { if (!PyArg_ParseTuple(args, "Siiif", &rgba_string, &width, &height, &stride, &quality_factor)) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
PyBytes_AsStringAndSize((PyObject *) rgba_string, (char**)&rgba, &size); PyBytes_AsStringAndSize((PyObject *) rgba_string, (char**)&rgba, &size);
if (stride * height > size) { if (stride * height > size) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
ret_size = WebPEncodeRGBA(rgba, width, height, stride, quality_factor, &output); ret_size = WebPEncodeRGBA(rgba, width, height, stride, quality_factor, &output);
@ -103,9 +95,7 @@ PyObject* WebPEncodeRGBA_wrapper(PyObject* self, PyObject* args)
free(output); free(output);
return ret; return ret;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
@ -120,13 +110,11 @@ PyObject* WebPDecode_wrapper(PyObject* self, PyObject* args)
char* mode = "RGB"; char* mode = "RGB";
if (!PyArg_ParseTuple(args, "S", &webp_string)) { if (!PyArg_ParseTuple(args, "S", &webp_string)) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
if (!WebPInitDecoderConfig(&config)) { if (!WebPInitDecoderConfig(&config)) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
PyBytes_AsStringAndSize((PyObject *) webp_string, (char**)&webp, &size); PyBytes_AsStringAndSize((PyObject *) webp_string, (char**)&webp, &size);
@ -143,8 +131,7 @@ PyObject* WebPDecode_wrapper(PyObject* self, PyObject* args)
} }
if (vp8_status_code != VP8_STATUS_OK) { if (vp8_status_code != VP8_STATUS_OK) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
if (config.output.colorspace < MODE_YUV) { if (config.output.colorspace < MODE_YUV) {