From 9a2903bf5b9287e9f999d45c3fa628f5df264362 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 15 Oct 2015 00:49:03 +1100 Subject: [PATCH] Changed 32 bit to 32-bit and 64 bit to 64-bit --- CHANGES.rst | 2 +- Tests/large_memory_numpy_test.py | 4 ++-- Tests/large_memory_test.py | 4 ++-- Tests/test_file_tiff.py | 2 +- libImaging/Resample.c | 2 +- setup.py | 2 +- winbuild/README.md | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 7bbbe1053..d86b14576 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1100,7 +1100,7 @@ Changelog (Pillow) - Backport PIL's PNG/Zip improvements. [olt] -- Various 64 bit and Windows fixes. +- Various 64-bit and Windows fixes. [cgohlke] - Add testing suite. diff --git a/Tests/large_memory_numpy_test.py b/Tests/large_memory_numpy_test.py index 5e5a58441..c642549aa 100644 --- a/Tests/large_memory_numpy_test.py +++ b/Tests/large_memory_numpy_test.py @@ -7,7 +7,7 @@ from helper import unittest, PillowTestCase # It requires > 2gb memory for the >2 gigapixel image generated in the # second test. Running this automatically would amount to a denial of # service on our testing infrastructure. I expect this test to fail -# on any 32 bit machine, as well as any smallish things (like +# on any 32-bit machine, as well as any smallish things (like # Raspberry Pis). from PIL import Image @@ -20,7 +20,7 @@ YDIM = 32769 XDIM = 48000 -@unittest.skipIf(sys.maxsize <= 2**32, "requires 64 bit system") +@unittest.skipIf(sys.maxsize <= 2**32, "requires 64-bit system") class LargeMemoryNumpyTest(PillowTestCase): def _write_png(self, xdim, ydim): diff --git a/Tests/large_memory_test.py b/Tests/large_memory_test.py index 3ee13091d..c7fe5d98c 100644 --- a/Tests/large_memory_test.py +++ b/Tests/large_memory_test.py @@ -7,7 +7,7 @@ from helper import unittest, PillowTestCase # It requires > 2gb memory for the >2 gigapixel image generated in the # second test. Running this automatically would amount to a denial of # service on our testing infrastructure. I expect this test to fail -# on any 32 bit machine, as well as any smallish things (like +# on any 32-bit machine, as well as any smallish things (like # Raspberry Pis). It does succeed on a 3gb Ubuntu 12.04x64 VM on Python # 2.7 an 3.2. @@ -16,7 +16,7 @@ YDIM = 32769 XDIM = 48000 -@unittest.skipIf(sys.maxsize <= 2**32, "requires 64 bit system") +@unittest.skipIf(sys.maxsize <= 2**32, "requires 64-bit system") class LargeMemoryTest(PillowTestCase): def _write_png(self, xdim, ydim): diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py index 4cf83534d..719888619 100644 --- a/Tests/test_file_tiff.py +++ b/Tests/test_file_tiff.py @@ -169,7 +169,7 @@ class TestFileTiff(PillowTestCase): self.assert_image_equal(im, im2) def test_32bit_float(self): - # Issue 614, specific 32 bit float format + # Issue 614, specific 32-bit float format path = 'Tests/images/10ct_32bit_128.tiff' im = Image.open(path) im.load() diff --git a/libImaging/Resample.c b/libImaging/Resample.c index 597fca3e9..103e07e4b 100644 --- a/libImaging/Resample.c +++ b/libImaging/Resample.c @@ -79,7 +79,7 @@ static inline UINT8 clip8(float in) } -/* This is work around bug in GCC prior 4.9 in 64 bit mode. +/* This is work around bug in GCC prior 4.9 in 64-bit mode. GCC generates code with partial dependency which 3 times slower. See: http://stackoverflow.com/a/26588074/253146 */ #if defined(__x86_64__) && defined(__SSE__) && ! defined(__NO_INLINE__) && \ diff --git a/setup.py b/setup.py index 0029eb5c1..101fecd5e 100644 --- a/setup.py +++ b/setup.py @@ -243,7 +243,7 @@ class pil_build_ext(build_ext): elif sys.platform.startswith("linux"): arch_tp = (plat.processor(), plat.architecture()[0]) if arch_tp == ("x86_64", "32bit"): - # 32 bit build on 64 bit machine. + # 32-bit build on 64-bit machine. _add_directory(library_dirs, "/usr/lib/i386-linux-gnu") else: for platform_ in arch_tp: diff --git a/winbuild/README.md b/winbuild/README.md index 39fab34d5..9777b1e6c 100644 --- a/winbuild/README.md +++ b/winbuild/README.md @@ -6,7 +6,7 @@ For more extensive info, see the windows build instructions `docs/build.rst`. * See https://github.com/python-pillow/Pillow/issues/553#issuecomment-37877416 and https://github.com/matplotlib/matplotlib/issues/1717#issuecomment-13343859 * Works best with Python 3.4, due to virtualenv and pip batteries included. Python3+ required for fetch command. -* Check config.py for virtual env paths, suffix for 64 bit releases. Defaults to `x64`, set `X64_EXT` to change. +* Check config.py for virtual env paths, suffix for 64-bit releases. Defaults to `x64`, set `X64_EXT` to change. * When running in CI with one Python per invocation, set the `PYTHON` env variable to the Python folder. (e.g. `PYTHON`=`c:\Python27\`) This overrides the matrix in config.py and will just build and test for the specific Python. * `python get_pythons.py` downloads all the Python releases, and their signatures. (Manually) Install in `c:\PythonXX[x64]\`. * `python build_dep.py` downloads and creates a build script for all the dependencies, in 32 and 64 bit versions, and with both compiler versions.