python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-11-04 01:47:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Correct types of _imaging methods

Browse Source 
Move new_block method to _imaging
remove _imaging.convert method
This commit is contained in:
Aleksandr Karpinskii 2024-09-17 23:30:52 +02:00 committed by Александр Карпинский
parent 8ba076ae86
commit 50dd94664b
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PIL/ImageTk.py
View File

@ -181,7 +181,7 @@ class PhotoImage:
image = im.im image = im.im
if not image.isblock() or im.mode != self.__mode: if not image.isblock() or im.mode != self.__mode:
block = Image.core.new_block(self.__mode, im.size) block = Image.core.new_block(self.__mode, im.size)
image.convert2(block, image) # convert directly between buffers image.convert2(block) # convert directly between buffers
ptr = block.ptr ptr = block.ptr
_pyimagingtkcall("PyImagingPhoto", self.__photo, ptr) _pyimagingtkcall("PyImagingPhoto", self.__photo, ptr)

26
src/_imaging.c
View File

@ -92,7 +92,7 @@
#define S16(v) ((v) < 32768 ? (v) : ((v) - 65536)) #define S16(v) ((v) < 32768 ? (v) : ((v) - 65536))
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* OBJECT ADMINISTRATION */ /* OBJECT ADMINISTRATION */
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
typedef struct { typedef struct {
@ -256,7 +256,7 @@ ImagingError_Clear(void) {
} }
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* HELPERS */ /* HELPERS */
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
static int static int
@ -605,7 +605,7 @@ getink(PyObject *color, Imaging im, char *ink) {
} }
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* FACTORIES */ /* FACTORIES */
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
static PyObject * static PyObject *
@ -688,7 +688,7 @@ _radial_gradient(PyObject *self, PyObject *args) {
} }
static PyObject * static PyObject *
_alpha_composite(ImagingObject *self, PyObject *args) { _alpha_composite(PyObject *self, PyObject *args) {
ImagingObject *imagep1; ImagingObject *imagep1;
ImagingObject *imagep2; ImagingObject *imagep2;
@ -702,7 +702,7 @@ _alpha_composite(ImagingObject *self, PyObject *args) {
} }
static PyObject * static PyObject *
_blend(ImagingObject *self, PyObject *args) { _blend(PyObject *self, PyObject *args) {
ImagingObject *imagep1; ImagingObject *imagep1;
ImagingObject *imagep2; ImagingObject *imagep2;
double alpha; double alpha;
@ -920,15 +920,12 @@ _convert(ImagingObject *self, PyObject *args) {
static PyObject * static PyObject *
_convert2(ImagingObject *self, PyObject *args) { _convert2(ImagingObject *self, PyObject *args) {
ImagingObject *imagep1; ImagingObject *imagep;
ImagingObject *imagep2; if (!PyArg_ParseTuple(args, "O!", &Imaging_Type, &imagep)) {
if (!PyArg_ParseTuple(
args, "O!O!", &Imaging_Type, &imagep1, &Imaging_Type, &imagep2
)) {
return NULL; return NULL;
} }
if (!ImagingConvert2(imagep1->image, imagep2->image)) { if (!ImagingConvert2(imagep->image, self->image)) {
return NULL; return NULL;
} }
@ -3487,7 +3484,7 @@ _effect_spread(ImagingObject *self, PyObject *args) {
} }
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* UTILITIES */ /* UTILITIES */
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
static PyObject * static PyObject *
@ -3523,7 +3520,7 @@ _getcodecstatus(PyObject *self, PyObject *args) {
} }
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* DEBUGGING HELPERS */ /* DEBUGGING HELPERS */
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
static PyObject * static PyObject *
@ -4162,9 +4159,6 @@ static PyMethodDef functions[] = {
{"new_block", (PyCFunction)_new_block, METH_VARARGS}, {"new_block", (PyCFunction)_new_block, METH_VARARGS},
{"merge", (PyCFunction)_merge, METH_VARARGS}, {"merge", (PyCFunction)_merge, METH_VARARGS},
/* Functions */
{"convert", (PyCFunction)_convert2, METH_VARARGS},
/* Codecs */ /* Codecs */
{"bcn_decoder", (PyCFunction)PyImaging_BcnDecoderNew, METH_VARARGS}, {"bcn_decoder", (PyCFunction)PyImaging_BcnDecoderNew, METH_VARARGS},
{"bit_decoder", (PyCFunction)PyImaging_BitDecoderNew, METH_VARARGS}, {"bit_decoder", (PyCFunction)PyImaging_BitDecoderNew, METH_VARARGS},