mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-01-27 01:34:24 +03:00
merge to master
This commit is contained in:
commit
d98abd877b
|
@ -37,7 +37,7 @@ include = [x for x in sys.argv[1:] if x[:2] != "--"]
|
||||||
skipped = []
|
skipped = []
|
||||||
|
|
||||||
# XXX Skip test, is there a better way?
|
# XXX Skip test, is there a better way?
|
||||||
files.remove('Tests/test_file_tiff.py')
|
files.remove(os.path.join('Tests', 'test_file_tiff.py'))
|
||||||
skipped.append('test_file_tiff')
|
skipped.append('test_file_tiff')
|
||||||
|
|
||||||
python_options = " ".join(python_options)
|
python_options = " ".join(python_options)
|
||||||
|
|
|
@ -123,7 +123,6 @@ def test_g4_eq_png():
|
||||||
|
|
||||||
def test_g4_write():
|
def test_g4_write():
|
||||||
"""Checking to see that the saved image is the same as what we wrote"""
|
"""Checking to see that the saved image is the same as what we wrote"""
|
||||||
|
|
||||||
file = "Tests/images/lena_g4_500.tif"
|
file = "Tests/images/lena_g4_500.tif"
|
||||||
orig = Image.open(file)
|
orig = Image.open(file)
|
||||||
|
|
||||||
|
|
|
@ -49,12 +49,13 @@ extern int ImagingLibTiffSetField(ImagingCodecState state, ttag_t tag, ...);
|
||||||
#else
|
#else
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
#define VA_ARGS(...) __VA_ARGS__
|
#define VA_ARGS(...) __VA_ARGS__
|
||||||
#define TRACE(args) fprintf(stderr, VA_ARGS args)
|
#define TRACE(args) fprintf(stderr, VA_ARGS args)
|
||||||
|
|
||||||
/*
|
|
||||||
#define TRACE(args)
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#define TRACE(args)
|
||||||
|
|
||||||
#endif /* _MSC_VER */
|
#endif /* _MSC_VER */
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -157,7 +157,7 @@ def testimage():
|
||||||
|
|
||||||
def check_module(feature, module):
|
def check_module(feature, module):
|
||||||
try:
|
try:
|
||||||
__import__("PIL." + module)
|
__import__(module)
|
||||||
except ImportError:
|
except ImportError:
|
||||||
print("***", feature, "support not installed")
|
print("***", feature, "support not installed")
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user