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

flake8 on morphology changes

Browse Source
This commit is contained in:
hugovk 2014-06-24 09:34:05 +03:00
parent a8cfe52a0b
commit fd97d30831
3 changed files with 151 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
PIL/ImageMorph.py
View File

@ -10,8 +10,10 @@ from PIL import _imagingmorph
import re import re
LUT_SIZE = 1 << 9 LUT_SIZE = 1 << 9
class LutBuilder: class LutBuilder:
"""A class for building MorphLut's from a descriptive language """A class for building a MorphLut from a descriptive language
The input patterns is a list of a strings sequences like these: The input patterns is a list of a strings sequences like these:
@ -20,8 +22,8 @@ class LutBuilder:
111)->1 111)->1
(whitespaces including linebreaks are ignored). The option 4 (whitespaces including linebreaks are ignored). The option 4
descibes a series of symmetry operations (in this case a describes a series of symmetry operations (in this case a
4-rotation), the pattern is decribed by: 4-rotation), the pattern is described by:
. or X - Ignore . or X - Ignore
1 - Pixel is on 1 - Pixel is on
@ -64,7 +66,7 @@ class LutBuilder:
'4:(.0. .1. ...)->1', '4:(.0. .1. ...)->1',
'4:(01. .1. ...)->1'] '4:(01. .1. ...)->1']
} }
if not op_name in known_patterns: if op_name not in known_patterns:
raise Exception('Unknown pattern '+op_name+'!') raise Exception('Unknown pattern '+op_name+'!')
self.patterns = known_patterns[op_name] self.patterns = known_patterns[op_name]
@ -82,14 +84,14 @@ class LutBuilder:
def _string_permute(self, pattern, permutation): def _string_permute(self, pattern, permutation):
"""string_permute takes a pattern and a permutation and returns the """string_permute takes a pattern and a permutation and returns the
string permuted accordinging to the permutation list. string permuted according to the permutation list.
""" """
assert(len(permutation) == 9) assert(len(permutation) == 9)
return ''.join([pattern[p] for p in permutation]) return ''.join([pattern[p] for p in permutation])
def _pattern_permute(self, basic_pattern, options, basic_result): def _pattern_permute(self, basic_pattern, options, basic_result):
"""pattern_permute takes a basic pattern and its result and clones """pattern_permute takes a basic pattern and its result and clones
the mattern according to the modifications described in the $options the pattern according to the modifications described in the $options
parameter. It returns a list of all cloned patterns.""" parameter. It returns a list of all cloned patterns."""
patterns = [(basic_pattern, basic_result)] patterns = [(basic_pattern, basic_result)]
@ -98,8 +100,7 @@ class LutBuilder:
res = patterns[-1][1] res = patterns[-1][1]
for i in range(4): for i in range(4):
patterns.append( patterns.append(
(self._string_permute(patterns[-1][0], (self._string_permute(patterns[-1][0], [6, 3, 0,
[6,3,0,
7, 4, 1, 7, 4, 1,
8, 5, 2]), res)) 8, 5, 2]), res))
# mirror # mirror
@ -135,7 +136,8 @@ class LutBuilder:
# Parse and create symmetries of the patterns strings # Parse and create symmetries of the patterns strings
for p in self.patterns: for p in self.patterns:
m = re.search(r'(\w*):?\s*\((.+?)\)\s*->\s*(\d)', p.replace('\n','')) m = re.search(
r'(\w*):?\s*\((.+?)\)\s*->\s*(\d)', p.replace('\n', ''))
if not m: if not m:
raise Exception('Syntax error in pattern "'+p+'"') raise Exception('Syntax error in pattern "'+p+'"')
options = m.group(1) options = m.group(1)
@ -172,6 +174,7 @@ class LutBuilder:
return self.lut return self.lut
class MorphOp: class MorphOp:
"""A class for binary morphological operators""" """A class for binary morphological operators"""
@ -195,13 +198,16 @@ class MorphOp:
raise Exception('No operator loaded') raise Exception('No operator loaded')
outimage = Image.new(image.mode, image.size, None) outimage = Image.new(image.mode, image.size, None)
count = _imagingmorph.apply(bytes(self.lut), image.im.id, outimage.im.id) count = _imagingmorph.apply(
bytes(self.lut), image.im.id, outimage.im.id)
return count, outimage return count, outimage
def match(self, image): def match(self, image):
"""Get a list of coordinates matching the morphological operation on an image """Get a list of coordinates matching the morphological operation on
an image.
Returns a list of tuples of (x,y) coordinates of all matching pixels.""" Returns a list of tuples of (x,y) coordinates
of all matching pixels."""
if self.lut is None: if self.lut is None:
raise Exception('No operator loaded') raise Exception('No operator loaded')
@ -209,7 +215,9 @@ class MorphOp:
def get_on_pixels(self, image): def get_on_pixels(self, image):
"""Get a list of all turned on pixels in a binary image """Get a list of all turned on pixels in a binary image
Returns a list of tuples of (x,y) coordinates of all matching pixels."""
Returns a list of tuples of (x,y) coordinates
of all matching pixels."""
return _imagingmorph.get_on_pixels(image.im.id) return _imagingmorph.get_on_pixels(image.im.id)
@ -233,4 +241,4 @@ class MorphOp:
"""Set the lut from an external source""" """Set the lut from an external source"""
self.lut = lut self.lut = lut
# End of file

24
Tests/test_imagemorph.py
View File

@ -20,7 +20,6 @@ class MorphTests(PillowTestCase):
""" """
) )
def img_to_string(self, im): def img_to_string(self, im):
"""Turn a (small) binary image into a string representation""" """Turn a (small) binary image into a string representation"""
chars = '.1' chars = '.1'
@ -51,14 +50,18 @@ class MorphTests(PillowTestCase):
self.assertEqual(self.img_to_string(A), self.img_to_string(B)) self.assertEqual(self.img_to_string(A), self.img_to_string(B))
def assert_img_equal_img_string(self, A, Bstring): def assert_img_equal_img_string(self, A, Bstring):
self.assertEqual(self.img_to_string(A), self.img_string_normalize(Bstring)) self.assertEqual(
self.img_to_string(A),
self.img_string_normalize(Bstring))
def test_str_to_img(self): def test_str_to_img(self):
im = Image.open('Tests/images/morph_a.png') im = Image.open('Tests/images/morph_a.png')
self.assert_image_equal(self.A, im) self.assert_image_equal(self.A, im)
def create_lut(self): def create_lut(self):
for op in ('corner', 'dilation4', 'dilation8', 'erosion4', 'erosion8', 'edge'): for op in (
'corner', 'dilation4', 'dilation8',
'erosion4', 'erosion8', 'edge'):
lb = ImageMorph.LutBuilder(op_name=op) lb = ImageMorph.LutBuilder(op_name=op)
lut = lb.build_lut(self) lut = lb.build_lut(self)
with open('Tests/images/%s.lut' % op, 'wb') as f: with open('Tests/images/%s.lut' % op, 'wb') as f:
@ -66,13 +69,14 @@ class MorphTests(PillowTestCase):
# create_lut() # create_lut()
def test_lut(self): def test_lut(self):
for op in ('corner', 'dilation4', 'dilation8', 'erosion4', 'erosion8', 'edge'): for op in (
'corner', 'dilation4', 'dilation8',
'erosion4', 'erosion8', 'edge'):
lb = ImageMorph.LutBuilder(op_name=op) lb = ImageMorph.LutBuilder(op_name=op)
lut = lb.build_lut() lut = lb.build_lut()
with open('Tests/images/%s.lut' % op, 'rb') as f: with open('Tests/images/%s.lut' % op, 'rb') as f:
self.assertEqual(lut, bytearray(f.read())) self.assertEqual(lut, bytearray(f.read()))
# Test the named patterns # Test the named patterns
def test_erosion8(self): def test_erosion8(self):
# erosion8 # erosion8
@ -138,7 +142,6 @@ class MorphTests(PillowTestCase):
....... .......
""") """)
def test_corner(self): def test_corner(self):
# Create a corner detector pattern # Create a corner detector pattern
mop = ImageMorph.MorphOp(patterns=['1:(... ... ...)->0', mop = ImageMorph.MorphOp(patterns=['1:(... ... ...)->0',
@ -156,14 +159,13 @@ class MorphTests(PillowTestCase):
....... .......
""") """)
# Test the coordinate counting with the same operator # Test the coordinate counting with the same operator
coords = mop.match(self.A) coords = mop.match(self.A)
self.assertEqual(len(coords), 4) self.assertEqual(len(coords), 4)
self.assertEqual(tuple(coords), self.assertEqual(tuple(coords), ((2, 2), (4, 2), (2, 4), (4, 4)))
((2,2),(4,2),(2,4),(4,4)))
coords = mop.get_on_pixels(Aout) coords = mop.get_on_pixels(Aout)
self.assertEqual(len(coords), 4) self.assertEqual(len(coords), 4)
self.assertEqual(tuple(coords), self.assertEqual(tuple(coords), ((2, 2), (4, 2), (2, 4), (4, 4)))
((2,2),(4,2),(2,4),(4,4)))
# End of file

57
setup.py
View File

@ -106,6 +106,7 @@ class pil_build_ext(build_ext):
def require(self, feat): def require(self, feat):
return feat in self.required return feat in self.required
def want(self, feat): def want(self, feat):
return getattr(self, feat) is None return getattr(self, feat) is None
@ -225,9 +226,11 @@ class pil_build_ext(build_ext):
if ft_prefix and os.path.isdir(ft_prefix): if ft_prefix and os.path.isdir(ft_prefix):
# freetype might not be linked into Homebrew's prefix # freetype might not be linked into Homebrew's prefix
_add_directory(library_dirs, os.path.join(ft_prefix, 'lib')) _add_directory(library_dirs, os.path.join(ft_prefix, 'lib'))
_add_directory(include_dirs, os.path.join(ft_prefix, 'include')) _add_directory(
include_dirs, os.path.join(ft_prefix, 'include'))
else: else:
# fall back to freetype from XQuartz if Homebrew's freetype is missing # fall back to freetype from XQuartz if
# Homebrew's freetype is missing
_add_directory(library_dirs, "/usr/X11/lib") _add_directory(library_dirs, "/usr/X11/lib")
_add_directory(include_dirs, "/usr/X11/include") _add_directory(include_dirs, "/usr/X11/include")
@ -245,30 +248,38 @@ class pil_build_ext(build_ext):
if platform_ in ["x86_64", "64bit"]: if platform_ in ["x86_64", "64bit"]:
_add_directory(library_dirs, "/lib64") _add_directory(library_dirs, "/lib64")
_add_directory(library_dirs, "/usr/lib64") _add_directory(library_dirs, "/usr/lib64")
_add_directory(library_dirs, "/usr/lib/x86_64-linux-gnu") _add_directory(
library_dirs, "/usr/lib/x86_64-linux-gnu")
break break
elif platform_ in ["i386", "i686", "32bit"]: elif platform_ in ["i386", "i686", "32bit"]:
_add_directory(library_dirs, "/usr/lib/i386-linux-gnu") _add_directory(
library_dirs, "/usr/lib/i386-linux-gnu")
break break
elif platform_ in ["aarch64"]: elif platform_ in ["aarch64"]:
_add_directory(library_dirs, "/usr/lib64") _add_directory(library_dirs, "/usr/lib64")
_add_directory(library_dirs, "/usr/lib/aarch64-linux-gnu") _add_directory(
library_dirs, "/usr/lib/aarch64-linux-gnu")
break break
elif platform_ in ["arm", "armv7l"]: elif platform_ in ["arm", "armv7l"]:
_add_directory(library_dirs, "/usr/lib/arm-linux-gnueabi") _add_directory(
library_dirs, "/usr/lib/arm-linux-gnueabi")
break break
elif platform_ in ["ppc64"]: elif platform_ in ["ppc64"]:
_add_directory(library_dirs, "/usr/lib64") _add_directory(library_dirs, "/usr/lib64")
_add_directory(library_dirs, "/usr/lib/ppc64-linux-gnu") _add_directory(
_add_directory(library_dirs, "/usr/lib/powerpc64-linux-gnu") library_dirs, "/usr/lib/ppc64-linux-gnu")
_add_directory(
library_dirs, "/usr/lib/powerpc64-linux-gnu")
break break
elif platform_ in ["ppc"]: elif platform_ in ["ppc"]:
_add_directory(library_dirs, "/usr/lib/ppc-linux-gnu") _add_directory(library_dirs, "/usr/lib/ppc-linux-gnu")
_add_directory(library_dirs, "/usr/lib/powerpc-linux-gnu") _add_directory(
library_dirs, "/usr/lib/powerpc-linux-gnu")
break break
elif platform_ in ["s390x"]: elif platform_ in ["s390x"]:
_add_directory(library_dirs, "/usr/lib64") _add_directory(library_dirs, "/usr/lib64")
_add_directory(library_dirs, "/usr/lib/s390x-linux-gnu") _add_directory(
library_dirs, "/usr/lib/s390x-linux-gnu")
break break
elif platform_ in ["s390"]: elif platform_ in ["s390"]:
_add_directory(library_dirs, "/usr/lib/s390-linux-gnu") _add_directory(library_dirs, "/usr/lib/s390-linux-gnu")
@ -344,7 +355,8 @@ class pil_build_ext(build_ext):
best_path = None best_path = None
for name in os.listdir(program_files): for name in os.listdir(program_files):
if name.startswith('OpenJPEG '): if name.startswith('OpenJPEG '):
version = tuple([int(x) for x in name[9:].strip().split('.')]) version = tuple(
[int(x) for x in name[9:].strip().split('.')])
if version > best_version: if version > best_version:
best_version = version best_version = version
best_path = os.path.join(program_files, name) best_path = os.path.join(program_files, name)
@ -371,7 +383,8 @@ class pil_build_ext(build_ext):
if _find_include_file(self, "zlib.h"): if _find_include_file(self, "zlib.h"):
if _find_library_file(self, "z"): if _find_library_file(self, "z"):
feature.zlib = "z" feature.zlib = "z"
elif sys.platform == "win32" and _find_library_file(self, "zlib"): elif (sys.platform == "win32" and
_find_library_file(self, "zlib")):
feature.zlib = "zlib" # alternative name feature.zlib = "zlib" # alternative name
if feature.want('jpeg'): if feature.want('jpeg'):
@ -405,14 +418,16 @@ class pil_build_ext(build_ext):
# include path # include path
_add_directory(self.compiler.include_dirs, best_path, 0) _add_directory(self.compiler.include_dirs, best_path, 0)
feature.jpeg2000 = 'openjp2' feature.jpeg2000 = 'openjp2'
feature.openjpeg_version = '.'.join([str(x) for x in best_version]) feature.openjpeg_version = '.'.join(
[str(x) for x in best_version])
if feature.want('tiff'): if feature.want('tiff'):
if _find_library_file(self, "tiff"): if _find_library_file(self, "tiff"):
feature.tiff = "tiff" feature.tiff = "tiff"
if sys.platform == "win32" and _find_library_file(self, "libtiff"): if sys.platform == "win32" and _find_library_file(self, "libtiff"):
feature.tiff = "libtiff" feature.tiff = "libtiff"
if sys.platform == "darwin" and _find_library_file(self, "libtiff"): if (sys.platform == "darwin" and
_find_library_file(self, "libtiff")):
feature.tiff = "libtiff" feature.tiff = "libtiff"
if feature.want('freetype'): if feature.want('freetype'):
@ -459,13 +474,15 @@ class pil_build_ext(build_ext):
if feature.want('webp'): if feature.want('webp'):
if (_find_include_file(self, "webp/encode.h") and if (_find_include_file(self, "webp/encode.h") and
_find_include_file(self, "webp/decode.h")): _find_include_file(self, "webp/decode.h")):
if _find_library_file(self, "webp"): # in googles precompiled zip it is call "libwebp" # In Google's precompiled zip it is call "libwebp":
if _find_library_file(self, "webp"):
feature.webp = "webp" feature.webp = "webp"
if feature.want('webpmux'): if feature.want('webpmux'):
if (_find_include_file(self, "webp/mux.h") and if (_find_include_file(self, "webp/mux.h") and
_find_include_file(self, "webp/demux.h")): _find_include_file(self, "webp/demux.h")):
if _find_library_file(self, "webpmux") and _find_library_file(self, "webpdemux"): if (_find_library_file(self, "webpmux") and
_find_library_file(self, "webpdemux")):
feature.webpmux = "webpmux" feature.webpmux = "webpmux"
for f in feature: for f in feature:
@ -527,7 +544,9 @@ 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=["lcms2"] + 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"]
@ -603,7 +622,8 @@ class pil_build_ext(build_ext):
options = [ options = [
(feature.tcl and feature.tk, "TKINTER"), (feature.tcl and feature.tk, "TKINTER"),
(feature.jpeg, "JPEG"), (feature.jpeg, "JPEG"),
(feature.jpeg2000, "OPENJPEG (JPEG2000)", feature.openjpeg_version), (feature.jpeg2000, "OPENJPEG (JPEG2000)",
feature.openjpeg_version),
(feature.zlib, "ZLIB (PNG/ZIP)"), (feature.zlib, "ZLIB (PNG/ZIP)"),
(feature.tiff, "LIBTIFF"), (feature.tiff, "LIBTIFF"),
(feature.freetype, "FREETYPE2"), (feature.freetype, "FREETYPE2"),
@ -720,3 +740,4 @@ setup(
zip_safe=True, zip_safe=True,
) )
# End of file