python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-27 17:54:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Changed 32 bit to 32-bit and 64 bit to 64-bit

Browse Source
This commit is contained in:
Andrew Murray 2015-10-15 00:49:03 +11:00
parent 149e947e62
commit 9a2903bf5b
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.rst
View File

@ -1100,7 +1100,7 @@ Changelog (Pillow)
- Backport PIL's PNG/Zip improvements. - Backport PIL's PNG/Zip improvements.
[olt] [olt]
- Various 64 bit and Windows fixes. - Various 64-bit and Windows fixes.
[cgohlke] [cgohlke]
- Add testing suite. - Add testing suite.

4
Tests/large_memory_numpy_test.py
View File

@ -7,7 +7,7 @@ from helper import unittest, PillowTestCase
# It requires > 2gb memory for the >2 gigapixel image generated in the # It requires > 2gb memory for the >2 gigapixel image generated in the
# second test. Running this automatically would amount to a denial of # second test. Running this automatically would amount to a denial of
# service on our testing infrastructure. I expect this test to fail # 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). # Raspberry Pis).
from PIL import Image from PIL import Image
@ -20,7 +20,7 @@ YDIM = 32769
XDIM = 48000 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): class LargeMemoryNumpyTest(PillowTestCase):
def _write_png(self, xdim, ydim): def _write_png(self, xdim, ydim):

4
Tests/large_memory_test.py
View File

@ -7,7 +7,7 @@ from helper import unittest, PillowTestCase
# It requires > 2gb memory for the >2 gigapixel image generated in the # It requires > 2gb memory for the >2 gigapixel image generated in the
# second test. Running this automatically would amount to a denial of # second test. Running this automatically would amount to a denial of
# service on our testing infrastructure. I expect this test to fail # 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 # Raspberry Pis). It does succeed on a 3gb Ubuntu 12.04x64 VM on Python
# 2.7 an 3.2. # 2.7 an 3.2.
@ -16,7 +16,7 @@ YDIM = 32769
XDIM = 48000 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): class LargeMemoryTest(PillowTestCase):
def _write_png(self, xdim, ydim): def _write_png(self, xdim, ydim):

2
Tests/test_file_tiff.py
View File

@ -169,7 +169,7 @@ class TestFileTiff(PillowTestCase):
self.assert_image_equal(im, im2) self.assert_image_equal(im, im2)
def test_32bit_float(self): 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' path = 'Tests/images/10ct_32bit_128.tiff'
im = Image.open(path) im = Image.open(path)
im.load() im.load()

2
libImaging/Resample.c
View File

@ -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. GCC generates code with partial dependency which 3 times slower.
See: http://stackoverflow.com/a/26588074/253146 */ See: http://stackoverflow.com/a/26588074/253146 */
#if defined(__x86_64__) && defined(__SSE__) && ! defined(__NO_INLINE__) && \ #if defined(__x86_64__) && defined(__SSE__) && ! defined(__NO_INLINE__) && \

2
setup.py
View File

@ -243,7 +243,7 @@ class pil_build_ext(build_ext):
elif sys.platform.startswith("linux"): elif sys.platform.startswith("linux"):
arch_tp = (plat.processor(), plat.architecture()[0]) arch_tp = (plat.processor(), plat.architecture()[0])
if arch_tp == ("x86_64", "32bit"): 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") _add_directory(library_dirs, "/usr/lib/i386-linux-gnu")
else: else:
for platform_ in arch_tp: for platform_ in arch_tp:

2
winbuild/README.md
View File

@ -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 * 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. * 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. * 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 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. * `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.