python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-26 01:46:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:python-imaging/Pillow

Browse Source
This commit is contained in:
Alex Clark 2013-10-24 06:02:29 -04:00
commit 46d33257ef
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PIL/WebPImagePlugin.py
View File

@ -48,6 +48,7 @@ def _save(im, fp, filename):
if im.mode not in _VALID_WEBP_MODES: if im.mode not in _VALID_WEBP_MODES:
raise IOError("cannot write mode %s as WEBP" % image_mode) raise IOError("cannot write mode %s as WEBP" % image_mode)
lossless = im.encoderinfo.get("lossless", False)
quality = im.encoderinfo.get("quality", 80) quality = im.encoderinfo.get("quality", 80)
icc_profile = im.encoderinfo.get("icc_profile", "") icc_profile = im.encoderinfo.get("icc_profile", "")
exif = im.encoderinfo.get("exif", "") exif = im.encoderinfo.get("exif", "")
@ -56,6 +57,7 @@ def _save(im, fp, filename):
im.tobytes(), im.tobytes(),
im.size[0], im.size[0],
im.size[1], im.size[1],
lossless,
float(quality), float(quality),
im.mode, im.mode,
icc_profile, icc_profile,

46
_webp.c
View File

@ -13,6 +13,7 @@ PyObject* WebPEncode_wrapper(PyObject* self, PyObject* args)
{ {
int width; int width;
int height; int height;
int lossless;
float quality_factor; float quality_factor;
uint8_t *rgb; uint8_t *rgb;
uint8_t *icc_bytes; uint8_t *icc_bytes;
@ -20,29 +21,36 @@ PyObject* WebPEncode_wrapper(PyObject* self, PyObject* args)
uint8_t *output; uint8_t *output;
char *mode; char *mode;
Py_ssize_t size; Py_ssize_t size;
Py_ssize_t icc_size; Py_ssize_t icc_size;
Py_ssize_t exif_size; Py_ssize_t exif_size;
size_t ret_size; size_t ret_size;
if (!PyArg_ParseTuple(args, "s#iifss#s#", if (!PyArg_ParseTuple(args, "s#iiOfss#s#",
(char**)&rgb, &size, &width, &height, &quality_factor, &mode, (char**)&rgb, &size, &width, &height, &lossless, &quality_factor, &mode,
&icc_bytes, &icc_size, &exif_bytes, &exif_size)) { &icc_bytes, &icc_size, &exif_bytes, &exif_size)) {
Py_RETURN_NONE; Py_RETURN_NONE;
} }
if (strcmp(mode, "RGBA")==0){
if (strcmp(mode, "RGBA")==0){ if (size < width * height * 4){
if (size < width * height * 4){ Py_RETURN_NONE;
Py_RETURN_NONE; }
} if (PyObject_IsTrue(lossless)) {
ret_size = WebPEncodeRGBA(rgb, width, height, 4* width, quality_factor, &output); ret_size = WebPEncodeLosslessRGBA(rgb, width, height, 4* width, &output);
} else if (strcmp(mode, "RGB")==0){ } else {
if (size < width * height * 3){ ret_size = WebPEncodeRGBA(rgb, width, height, 4* width, quality_factor, &output);
Py_RETURN_NONE; }
} } else if (strcmp(mode, "RGB")==0){
ret_size = WebPEncodeRGB(rgb, width, height, 3* width, quality_factor, &output); if (size < width * height * 3){
} else { Py_RETURN_NONE;
Py_RETURN_NONE; }
} if (PyObject_IsTrue(lossless)) {
ret_size = WebPEncodeLosslessRGB(rgb, width, height, 3* width, &output);
} else {
ret_size = WebPEncodeRGB(rgb, width, height, 3* width, quality_factor, &output);
}
} else {
Py_RETURN_NONE;
}
#ifndef HAVE_WEBPMUX #ifndef HAVE_WEBPMUX
if (ret_size > 0) { if (ret_size > 0) {
@ -53,10 +61,10 @@ PyObject* WebPEncode_wrapper(PyObject* self, PyObject* args)
#else #else
{ {
/* I want to truncate the *_size items that get passed into webp /* I want to truncate the *_size items that get passed into webp
data. Pypy2.1.0 had some issues where the Py_ssize_t items had data. Pypy2.1.0 had some issues where the Py_ssize_t items had
data in the upper byte. (Not sure why, it shouldn't have been there) data in the upper byte. (Not sure why, it shouldn't have been there)
*/ */
int i_icc_size = (int)icc_size; int i_icc_size = (int)icc_size;
int i_exif_size = (int)exif_size; int i_exif_size = (int)exif_size;
WebPData output_data = {0}; WebPData output_data = {0};
WebPData image = { output, ret_size }; WebPData image = { output, ret_size };