Merge pull request #7205 from radarhere/unused

hugovk · web-flow · commit e2fccfe1aa38 · 2023-06-10T10:54:25.000+03:00
Removed unused variables
diff --git a/src/PIL/Image.py b/src/PIL/Image.py
@@ -1254,7 +1254,7 @@ def _expand(self, xmargin, ymargin=None):
         if ymargin is None:
             ymargin = xmargin
         self.load()
-        return self._new(self.im.expand(xmargin, ymargin, 0))
+        return self._new(self.im.expand(xmargin, ymargin))
 
     def filter(self, filter):
         """
diff --git a/src/_imaging.c b/src/_imaging.c
@@ -1027,12 +1027,11 @@ _crop(ImagingObject *self, PyObject *args) {
 static PyObject *
 _expand_image(ImagingObject *self, PyObject *args) {
     int x, y;
-    int mode = 0;
-    if (!PyArg_ParseTuple(args, "ii|i", &x, &y, &mode)) {
+    if (!PyArg_ParseTuple(args, "ii", &x, &y)) {
         return NULL;
     }
 
-    return PyImagingNew(ImagingExpand(self->image, x, y, mode));
+    return PyImagingNew(ImagingExpand(self->image, x, y));
 }
 
 static PyObject *
diff --git a/src/libImaging/Filter.c b/src/libImaging/Filter.c
@@ -49,7 +49,7 @@ clip32(float in) {
 }
 
 Imaging
-ImagingExpand(Imaging imIn, int xmargin, int ymargin, int mode) {
+ImagingExpand(Imaging imIn, int xmargin, int ymargin) {
     Imaging imOut;
     int x, y;
     ImagingSectionCookie cookie;
diff --git a/src/libImaging/Imaging.h b/src/libImaging/Imaging.h
@@ -290,7 +290,7 @@ ImagingConvertTransparent(Imaging im, const char *mode, int r, int g, int b);
 extern Imaging
 ImagingCrop(Imaging im, int x0, int y0, int x1, int y1);
 extern Imaging
-ImagingExpand(Imaging im, int x, int y, int mode);
+ImagingExpand(Imaging im, int x, int y);
 extern Imaging
 ImagingFill(Imaging im, const void *ink);
 extern int
diff --git a/src/libImaging/Storage.c b/src/libImaging/Storage.c
@@ -37,8 +37,6 @@
 #include "Imaging.h"
 #include <string.h>
 
-int ImagingNewCount = 0;
-
 /* --------------------------------------------------------------------
  * Standard image object.
  */

Original file line number	Diff line number	Diff line change
`@@ -1027,12 +1027,11 @@ _crop(ImagingObject self, PyObject args) {`
`1027`	`1027`	`static PyObject *`
`1028`	`1028`	`_expand_image(ImagingObject self, PyObject args) {`
`1029`	`1029`	`int x, y;`
`1030`		`- int mode = 0;`
`1031`		`- if (!PyArg_ParseTuple(args, "ii\|i", &x, &y, &mode)) {`
	`1030`	`+ if (!PyArg_ParseTuple(args, "ii", &x, &y)) {`
`1032`	`1031`	`return NULL;`
`1033`	`1032`	`}`
`1034`	`1033`
`1035`		`- return PyImagingNew(ImagingExpand(self->image, x, y, mode));`
	`1034`	`+ return PyImagingNew(ImagingExpand(self->image, x, y));`
`1036`	`1035`	`}`
`1037`	`1036`
`1038`	`1037`	`static PyObject *`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ clip32(float in) {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`Imaging`
`52`		`-ImagingExpand(Imaging imIn, int xmargin, int ymargin, int mode) {`
	`52`	`+ImagingExpand(Imaging imIn, int xmargin, int ymargin) {`
`53`	`53`	`Imaging imOut;`
`54`	`54`	`int x, y;`
`55`	`55`	`ImagingSectionCookie cookie;`