mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-01-12 02:06:18 +03:00
parent
d2dfe3b137
commit
1c4dc75fab
|
@ -4,6 +4,9 @@ Changelog (Pillow)
|
||||||
2.4.0 (unreleased)
|
2.4.0 (unreleased)
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
|
- Avoid conflicting _expand functions in PIL & MINGW, fixes #538
|
||||||
|
[aclark]
|
||||||
|
|
||||||
- Merge from Philippe Lagadec’s OleFileIO_PL fork
|
- Merge from Philippe Lagadec’s OleFileIO_PL fork
|
||||||
[vadmium]
|
[vadmium]
|
||||||
|
|
||||||
|
|
|
@ -846,7 +846,7 @@ _crop(ImagingObject* self, PyObject* args)
|
||||||
}
|
}
|
||||||
|
|
||||||
static PyObject*
|
static PyObject*
|
||||||
_expand(ImagingObject* self, PyObject* args)
|
_expand_image(ImagingObject* self, PyObject* args)
|
||||||
{
|
{
|
||||||
int x, y;
|
int x, y;
|
||||||
int mode = 0;
|
int mode = 0;
|
||||||
|
@ -2996,7 +2996,7 @@ static struct PyMethodDef methods[] = {
|
||||||
{"crackcode", (PyCFunction)_crackcode, 1},
|
{"crackcode", (PyCFunction)_crackcode, 1},
|
||||||
#endif
|
#endif
|
||||||
{"crop", (PyCFunction)_crop, 1},
|
{"crop", (PyCFunction)_crop, 1},
|
||||||
{"expand", (PyCFunction)_expand, 1},
|
{"expand", (PyCFunction)_expand_image, 1},
|
||||||
{"filter", (PyCFunction)_filter, 1},
|
{"filter", (PyCFunction)_filter, 1},
|
||||||
{"histogram", (PyCFunction)_histogram, 1},
|
{"histogram", (PyCFunction)_histogram, 1},
|
||||||
#ifdef WITH_MODEFILTER
|
#ifdef WITH_MODEFILTER
|
||||||
|
|
Loading…
Reference in New Issue
Block a user