python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-02 02:43:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1499 from hugovk/remove_imagingtiff

Browse Source 
Remove old _imagingtiff.c and pilplus stuff
This commit is contained in:
wiredfool 2015-10-24 09:44:29 -07:00
commit 0cf0e948c7
3 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PIL/ImageGrab.py
View File

@ -22,13 +22,7 @@ if sys.platform not in ["win32", "darwin"]:
raise ImportError("ImageGrab is OS X and Windows only") raise ImportError("ImageGrab is OS X and Windows only")
if sys.platform == "win32": if sys.platform == "win32":
try:
# built-in driver (1.1.3 and later)
grabber = Image.core.grabscreen grabber = Image.core.grabscreen
except AttributeError:
# stand-alone driver (pil plus)
import _grabscreen
grabber = _grabscreen.grab
elif sys.platform == "darwin": elif sys.platform == "darwin":
import os import os
import tempfile import tempfile

6
_imaging.c
View File

@ -98,9 +98,6 @@
#define WITH_DEBUG /* extra debugging interfaces */ #define WITH_DEBUG /* extra debugging interfaces */
/* PIL Plus extensions */
#undef WITH_CRACKCODE /* pil plus */
#undef VERBOSE #undef VERBOSE
#define CLIP(x) ((x) <= 0 ? 0 : (x) < 256 ? (x) : 255) #define CLIP(x) ((x) <= 0 ? 0 : (x) < 256 ? (x) : 255)
@ -3030,9 +3027,6 @@ static struct PyMethodDef methods[] = {
{"convert_transparent", (PyCFunction)_convert_transparent, 1}, {"convert_transparent", (PyCFunction)_convert_transparent, 1},
{"copy", (PyCFunction)_copy, 1}, {"copy", (PyCFunction)_copy, 1},
{"copy2", (PyCFunction)_copy2, 1}, {"copy2", (PyCFunction)_copy2, 1},
#ifdef WITH_CRACKCODE
{"crackcode", (PyCFunction)_crackcode, 1},
#endif
{"crop", (PyCFunction)_crop, 1}, {"crop", (PyCFunction)_crop, 1},
{"expand", (PyCFunction)_expand_image, 1}, {"expand", (PyCFunction)_expand_image, 1},
{"filter", (PyCFunction)_filter, 1}, {"filter", (PyCFunction)_filter, 1},

4
setup.py
View File

@ -554,10 +554,6 @@ class pil_build_ext(build_ext):
exts.append(Extension( exts.append(Extension(
"PIL._imagingft", ["_imagingft.c"], libraries=["freetype"])) "PIL._imagingft", ["_imagingft.c"], libraries=["freetype"]))
if os.path.isfile("_imagingtiff.c") and feature.tiff:
exts.append(Extension(
"PIL._imagingtiff", ["_imagingtiff.c"], libraries=["tiff"]))
if os.path.isfile("_imagingcms.c") and feature.lcms: if os.path.isfile("_imagingcms.c") and feature.lcms:
extra = [] extra = []
if sys.platform == "win32": if sys.platform == "win32":