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

buildable, selftest registers properly

Browse Source
This commit is contained in:
wiredfool 2013-10-01 23:05:56 -07:00
parent 88c584c5de
commit e9e5599412
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
selftest.py
View File

@ -195,7 +195,7 @@ if __name__ == "__main__":
check_codec("ZLIB (PNG/ZIP)", "zip") check_codec("ZLIB (PNG/ZIP)", "zip")
check_codec("G4 TIFF", "group4") check_codec("G4 TIFF", "group4")
check_module("FREETYPE2", "PIL._imagingft") check_module("FREETYPE2", "PIL._imagingft")
check_module("LITTLECMS", "PIL._imagingcms") check_module("LITTLECMS2", "PIL._imagingcms")
check_module("WEBP", "PIL._webp") check_module("WEBP", "PIL._webp")
try: try:
from PIL import _webp from PIL import _webp

8
setup.py
View File

@ -331,8 +331,8 @@ class pil_build_ext(build_ext):
_add_directory(self.compiler.include_dirs, dir, 0) _add_directory(self.compiler.include_dirs, dir, 0)
if feature.want('lcms'): if feature.want('lcms'):
if _find_include_file(self, "lcms.h"): if _find_include_file(self, "lcms2.h"):
if _find_library_file(self, "lcms"): if _find_library_file(self, "lcms2"):
feature.lcms = "lcms" feature.lcms = "lcms"
if _tkinter and _find_include_file(self, "tk.h"): if _tkinter and _find_include_file(self, "tk.h"):
@ -415,7 +415,7 @@ class pil_build_ext(build_ext):
if sys.platform == "win32": if sys.platform == "win32":
extra.extend(["user32", "gdi32"]) extra.extend(["user32", "gdi32"])
exts.append(Extension( exts.append(Extension(
"PIL._imagingcms", ["_imagingcms.c"], libraries=["lcms"] + extra)) "PIL._imagingcms", ["_imagingcms.c"], libraries=["lcms2"] + extra))
if os.path.isfile("_webp.c") and feature.webp: if os.path.isfile("_webp.c") and feature.webp:
libs = ["webp"] libs = ["webp"]
@ -491,7 +491,7 @@ class pil_build_ext(build_ext):
(feature.zlib, "ZLIB (PNG/ZIP)"), (feature.zlib, "ZLIB (PNG/ZIP)"),
(feature.tiff, "TIFF G3/G4 (experimental)"), (feature.tiff, "TIFF G3/G4 (experimental)"),
(feature.freetype, "FREETYPE2"), (feature.freetype, "FREETYPE2"),
(feature.lcms, "LITTLECMS"), (feature.lcms, "LITTLECMS2"),
(feature.webp, "WEBP"), (feature.webp, "WEBP"),
(feature.webpmux, "WEBPMUX"), ] (feature.webpmux, "WEBPMUX"), ]