diff --git a/PIL/Image.py b/PIL/Image.py index 5e79e4bd8..226d0b41e 100644 --- a/PIL/Image.py +++ b/PIL/Image.py @@ -1865,9 +1865,6 @@ class Image(object): def __transformer(self, box, image, method, data, resample=NEAREST, fill=1): - - # FIXME: this should be turned into a lazy operation (?) - w = box[2] - box[0] h = box[3] - box[1] diff --git a/libImaging/Geometry.c b/libImaging/Geometry.c index 793cb9519..6d32aa271 100644 --- a/libImaging/Geometry.c +++ b/libImaging/Geometry.c @@ -606,7 +606,7 @@ getfilter(Imaging im, int filterid) /* transformation engines */ Imaging -ImagingTransform( +ImagingGenericTransform( Imaging imOut, Imaging imIn, int x0, int y0, int x1, int y1, ImagingTransformMap transform, void* transform_data, ImagingTransformFilter filter, void* filter_data, @@ -828,7 +828,7 @@ ImagingTransformAffine(Imaging imOut, Imaging imIn, ImagingTransformFilter filter = getfilter(imIn, filterid); if (!filter) return (Imaging) ImagingError_ValueError("unknown filter"); - return ImagingTransform( + return ImagingGenericTransform( imOut, imIn, x0, y0, x1, y1, affine_transform, a, @@ -915,7 +915,7 @@ ImagingTransformPerspective(Imaging imOut, Imaging imIn, if (!filter) return (Imaging) ImagingError_ValueError("bad filter number"); - return ImagingTransform( + return ImagingGenericTransform( imOut, imIn, x0, y0, x1, y1, perspective_transform, a, @@ -932,7 +932,7 @@ ImagingTransformQuad(Imaging imOut, Imaging imIn, if (!filter) return (Imaging) ImagingError_ValueError("bad filter number"); - return ImagingTransform( + return ImagingGenericTransform( imOut, imIn, x0, y0, x1, y1, quad_transform, a, diff --git a/libImaging/Imaging.h b/libImaging/Imaging.h index ebcafd548..9db7c5858 100644 --- a/libImaging/Imaging.h +++ b/libImaging/Imaging.h @@ -300,11 +300,6 @@ extern Imaging ImagingTransformAffine( extern Imaging ImagingTransformQuad( Imaging imOut, Imaging imIn, int x0, int y0, int x1, int y1, double a[8], int filter, int fill); -extern Imaging ImagingTransform( - Imaging imOut, Imaging imIn, int x0, int y0, int x1, int y1, - ImagingTransformMap transform, void* transform_data, - ImagingTransformFilter filter, void* filter_data, - int fill); extern Imaging ImagingUnsharpMask( Imaging imOut, Imaging im, float radius, int percent, int threshold); extern Imaging ImagingBoxBlur(Imaging imOut, Imaging imIn, float radius, int n);