Compare commits
No commits in common. "main" and "10.3.0" have entirely different histories.
100
.appveyor.yml
Normal file
|
@ -0,0 +1,100 @@
|
||||||
|
skip_commits:
|
||||||
|
files:
|
||||||
|
- ".github/**"
|
||||||
|
- ".gitmodules"
|
||||||
|
- "docs/**"
|
||||||
|
- "wheels/**"
|
||||||
|
|
||||||
|
version: '{build}'
|
||||||
|
clone_folder: c:\pillow
|
||||||
|
init:
|
||||||
|
- ECHO %PYTHON%
|
||||||
|
#- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
|
||||||
|
# Uncomment previous line to get RDP access during the build.
|
||||||
|
|
||||||
|
environment:
|
||||||
|
COVERAGE_CORE: sysmon
|
||||||
|
EXECUTABLE: python.exe
|
||||||
|
TEST_OPTIONS:
|
||||||
|
DEPLOY: YES
|
||||||
|
matrix:
|
||||||
|
- PYTHON: C:/Python312
|
||||||
|
ARCHITECTURE: x86
|
||||||
|
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
|
||||||
|
- PYTHON: C:/Python38-x64
|
||||||
|
ARCHITECTURE: AMD64
|
||||||
|
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
|
||||||
|
|
||||||
|
|
||||||
|
install:
|
||||||
|
- '%PYTHON%\%EXECUTABLE% --version'
|
||||||
|
- '%PYTHON%\%EXECUTABLE% -m pip install --upgrade pip'
|
||||||
|
- curl -fsSL -o pillow-test-images.zip https://github.com/python-pillow/test-images/archive/main.zip
|
||||||
|
- 7z x pillow-test-images.zip -oc:\
|
||||||
|
- xcopy /S /Y c:\test-images-main\* c:\pillow\tests\images
|
||||||
|
- curl -fsSL -o nasm-win64.zip https://raw.githubusercontent.com/python-pillow/pillow-depends/main/nasm-2.16.01-win64.zip
|
||||||
|
- 7z x nasm-win64.zip -oc:\
|
||||||
|
- choco install ghostscript --version=10.3.0
|
||||||
|
- path c:\nasm-2.16.01;C:\Program Files\gs\gs10.00.0\bin;%PATH%
|
||||||
|
- cd c:\pillow\winbuild\
|
||||||
|
- ps: |
|
||||||
|
c:\python38\python.exe c:\pillow\winbuild\build_prepare.py -v --depends=C:\pillow-depends\
|
||||||
|
c:\pillow\winbuild\build\build_dep_all.cmd
|
||||||
|
$host.SetShouldExit(0)
|
||||||
|
- path C:\pillow\winbuild\build\bin;%PATH%
|
||||||
|
|
||||||
|
build_script:
|
||||||
|
- cd c:\pillow
|
||||||
|
- winbuild\build\build_env.cmd
|
||||||
|
- '%PYTHON%\%EXECUTABLE% -m pip install -v -C raqm=vendor -C fribidi=vendor .'
|
||||||
|
- '%PYTHON%\%EXECUTABLE% selftest.py --installed'
|
||||||
|
|
||||||
|
test_script:
|
||||||
|
- cd c:\pillow
|
||||||
|
- '%PYTHON%\%EXECUTABLE% -m pip install pytest pytest-cov pytest-timeout defusedxml numpy olefile pyroma'
|
||||||
|
- c:\"Program Files (x86)"\"Windows Kits"\10\Debuggers\x86\gflags.exe /p /enable %PYTHON%\%EXECUTABLE%
|
||||||
|
- '%PYTHON%\%EXECUTABLE% -c "from PIL import Image"'
|
||||||
|
- '%PYTHON%\%EXECUTABLE% -m pytest -vx --cov PIL --cov Tests --cov-report term --cov-report xml Tests'
|
||||||
|
#- '%PYTHON%\%EXECUTABLE% test-installed.py -v -s %TEST_OPTIONS%' TODO TEST_OPTIONS with pytest?
|
||||||
|
|
||||||
|
after_test:
|
||||||
|
- curl -Os https://uploader.codecov.io/latest/windows/codecov.exe
|
||||||
|
- .\codecov.exe --file coverage.xml --name %PYTHON% --flags AppVeyor
|
||||||
|
|
||||||
|
matrix:
|
||||||
|
fast_finish: true
|
||||||
|
|
||||||
|
cache:
|
||||||
|
- '%LOCALAPPDATA%\pip\Cache'
|
||||||
|
|
||||||
|
artifacts:
|
||||||
|
- path: pillow\*.egg
|
||||||
|
name: egg
|
||||||
|
- path: pillow\*.whl
|
||||||
|
name: wheel
|
||||||
|
|
||||||
|
before_deploy:
|
||||||
|
- cd c:\pillow
|
||||||
|
- '%PYTHON%\%EXECUTABLE% -m pip wheel -v -C raqm=vendor -C fribidi=vendor .'
|
||||||
|
- ps: Get-ChildItem .\*.whl | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
|
||||||
|
|
||||||
|
deploy:
|
||||||
|
provider: S3
|
||||||
|
region: us-west-2
|
||||||
|
access_key_id: AKIAIRAXC62ZNTVQJMOQ
|
||||||
|
secret_access_key:
|
||||||
|
secure: Hwb6klTqtBeMgxAjRoDltiiqpuH8xbwD4UooDzBSiCWXjuFj1lyl4kHgHwTCCGqi
|
||||||
|
bucket: pillow-nightly
|
||||||
|
folder: win/$(APPVEYOR_BUILD_NUMBER)/
|
||||||
|
artifact: /.*egg|wheel/
|
||||||
|
on:
|
||||||
|
APPVEYOR_REPO_NAME: python-pillow/Pillow
|
||||||
|
branch: main
|
||||||
|
deploy: YES
|
||||||
|
|
||||||
|
|
||||||
|
# Uncomment the following lines to get RDP access after the build/test and block for
|
||||||
|
# up to the timeout limit (~1hr)
|
||||||
|
#
|
||||||
|
#on_finish:
|
||||||
|
#- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
|
|
@ -2,4 +2,8 @@
|
||||||
|
|
||||||
# gather the coverage data
|
# gather the coverage data
|
||||||
python3 -m pip install coverage
|
python3 -m pip install coverage
|
||||||
python3 -m coverage xml
|
if [[ $MATRIX_DOCKER ]]; then
|
||||||
|
python3 -m coverage xml --ignore-errors
|
||||||
|
else
|
||||||
|
python3 -m coverage xml
|
||||||
|
fi
|
||||||
|
|
|
@ -3,5 +3,8 @@
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
python3 -m coverage erase
|
python3 -m coverage erase
|
||||||
|
if [ $(uname) == "Darwin" ]; then
|
||||||
|
export CPPFLAGS="-I/usr/local/miniconda/include";
|
||||||
|
fi
|
||||||
make clean
|
make clean
|
||||||
make install-coverage
|
make install-coverage
|
||||||
|
|
|
@ -2,59 +2,73 @@
|
||||||
|
|
||||||
aptget_update()
|
aptget_update()
|
||||||
{
|
{
|
||||||
if [ -n "$1" ]; then
|
if [ ! -z $1 ]; then
|
||||||
echo ""
|
echo ""
|
||||||
echo "Retrying apt-get update..."
|
echo "Retrying apt-get update..."
|
||||||
echo ""
|
echo ""
|
||||||
fi
|
fi
|
||||||
output=$(sudo apt-get update 2>&1)
|
output=`sudo apt-get update 2>&1`
|
||||||
echo "$output"
|
echo "$output"
|
||||||
if [[ $output == *[WE]:\ * ]]; then
|
if [[ $output == *[WE]:\ * ]]; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
aptget_update || aptget_update retry || aptget_update retry
|
if [[ $(uname) != CYGWIN* ]]; then
|
||||||
|
aptget_update || aptget_update retry || aptget_update retry
|
||||||
|
fi
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
sudo apt-get -qq install libfreetype6-dev liblcms2-dev libtiff-dev python3-tk\
|
if [[ $(uname) != CYGWIN* ]]; then
|
||||||
ghostscript libjpeg-turbo8-dev libopenjp2-7-dev\
|
sudo apt-get -qq install libfreetype6-dev liblcms2-dev python3-tk\
|
||||||
cmake meson imagemagick libharfbuzz-dev libfribidi-dev\
|
ghostscript libffi-dev libjpeg-turbo-progs libopenjp2-7-dev\
|
||||||
sway wl-clipboard libopenblas-dev nasm
|
cmake meson imagemagick libharfbuzz-dev libfribidi-dev\
|
||||||
|
sway wl-clipboard libopenblas-dev
|
||||||
|
fi
|
||||||
|
|
||||||
python3 -m pip install --upgrade pip
|
python3 -m pip install --upgrade pip
|
||||||
python3 -m pip install --upgrade wheel
|
python3 -m pip install --upgrade wheel
|
||||||
|
# TODO Update condition when cffi supports 3.13
|
||||||
|
if ! [[ "$GHA_PYTHON_VERSION" == "3.13" ]]; then PYTHONOPTIMIZE=0 python3 -m pip install cffi ; fi
|
||||||
python3 -m pip install coverage
|
python3 -m pip install coverage
|
||||||
python3 -m pip install defusedxml
|
python3 -m pip install defusedxml
|
||||||
python3 -m pip install ipython
|
|
||||||
python3 -m pip install numpy
|
|
||||||
python3 -m pip install olefile
|
python3 -m pip install olefile
|
||||||
python3 -m pip install -U pytest
|
python3 -m pip install -U pytest
|
||||||
python3 -m pip install -U pytest-cov
|
python3 -m pip install -U pytest-cov
|
||||||
python3 -m pip install -U pytest-timeout
|
python3 -m pip install -U pytest-timeout
|
||||||
python3 -m pip install pyroma
|
python3 -m pip install pyroma
|
||||||
# optional test dependency, only install if there's a binary package.
|
|
||||||
# fails on beta 3.14 and PyPy
|
|
||||||
python3 -m pip install --only-binary=:all: pyarrow || true
|
|
||||||
|
|
||||||
# PyQt6 doesn't support PyPy3
|
if [[ $(uname) != CYGWIN* ]]; then
|
||||||
if [[ $GHA_PYTHON_VERSION == 3.* ]]; then
|
# TODO Update condition when NumPy supports 3.13
|
||||||
sudo apt-get -qq install libegl1 libxcb-cursor0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-shape0 libxkbcommon-x11-0
|
if ! [[ "$GHA_PYTHON_VERSION" == "3.13" ]]; then python3 -m pip install numpy ; fi
|
||||||
# TODO Update condition when pyqt6 supports free-threading
|
|
||||||
if ! [[ "$PYTHON_GIL" == "0" ]]; then python3 -m pip install pyqt6 ; fi
|
# PyQt6 doesn't support PyPy3
|
||||||
|
if [[ $GHA_PYTHON_VERSION == 3.* ]]; then
|
||||||
|
sudo apt-get -qq install libegl1 libxcb-cursor0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-shape0 libxkbcommon-x11-0
|
||||||
|
python3 -m pip install pyqt6
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Pyroma uses non-isolated build and fails with old setuptools
|
||||||
|
if [[
|
||||||
|
$GHA_PYTHON_VERSION == pypy3.9
|
||||||
|
|| $GHA_PYTHON_VERSION == 3.8
|
||||||
|
|| $GHA_PYTHON_VERSION == 3.9
|
||||||
|
]]; then
|
||||||
|
# To match pyproject.toml
|
||||||
|
python3 -m pip install "setuptools>=67.8"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# webp
|
||||||
|
pushd depends && ./install_webp.sh && popd
|
||||||
|
|
||||||
|
# libimagequant
|
||||||
|
pushd depends && ./install_imagequant.sh && popd
|
||||||
|
|
||||||
|
# raqm
|
||||||
|
pushd depends && ./install_raqm.sh && popd
|
||||||
|
|
||||||
|
# extra test images
|
||||||
|
pushd depends && ./install_extra_test_images.sh && popd
|
||||||
|
else
|
||||||
|
cd depends && ./install_extra_test_images.sh && cd ..
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# webp
|
|
||||||
pushd depends && ./install_webp.sh && popd
|
|
||||||
|
|
||||||
# libimagequant
|
|
||||||
pushd depends && ./install_imagequant.sh && popd
|
|
||||||
|
|
||||||
# raqm
|
|
||||||
pushd depends && ./install_raqm.sh && popd
|
|
||||||
|
|
||||||
# libavif
|
|
||||||
pushd depends && ./install_libavif.sh && popd
|
|
||||||
|
|
||||||
# extra test images
|
|
||||||
pushd depends && ./install_extra_test_images.sh && popd
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
cibuildwheel==3.1.2
|
cibuildwheel==2.17.0
|
||||||
|
|
|
@ -1,14 +1 @@
|
||||||
mypy==1.17.0
|
mypy==1.9.0
|
||||||
IceSpringPySideStubs-PyQt6
|
|
||||||
IceSpringPySideStubs-PySide6
|
|
||||||
ipython
|
|
||||||
numpy
|
|
||||||
packaging
|
|
||||||
pyarrow-stubs
|
|
||||||
pybind11
|
|
||||||
pytest
|
|
||||||
sphinx
|
|
||||||
types-atheris
|
|
||||||
types-defusedxml
|
|
||||||
types-olefile
|
|
||||||
types-setuptools
|
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
python.exe -c "from PIL import Image"
|
|
||||||
IF ERRORLEVEL 1 EXIT /B
|
|
||||||
python.exe -bb -m pytest -vv -x -W always --cov PIL --cov Tests --cov-report term --cov-report xml Tests
|
|
|
@ -4,4 +4,4 @@ set -e
|
||||||
|
|
||||||
python3 -c "from PIL import Image"
|
python3 -c "from PIL import Image"
|
||||||
|
|
||||||
python3 -bb -m pytest -vv -x -W always --cov PIL --cov Tests --cov-report term --cov-report xml Tests $REVERSE
|
python3 -bb -m pytest -v -x -W always --cov PIL --cov Tests --cov-report term Tests $REVERSE
|
||||||
|
|
|
@ -1,37 +1,16 @@
|
||||||
# A clang-format style that approximates Python's PEP 7
|
# A clang-format style that approximates Python's PEP 7
|
||||||
# Useful for IDE integration
|
# Useful for IDE integration
|
||||||
Language: C
|
|
||||||
BasedOnStyle: Google
|
BasedOnStyle: Google
|
||||||
AlwaysBreakAfterReturnType: All
|
AlwaysBreakAfterReturnType: All
|
||||||
AllowShortIfStatementsOnASingleLine: false
|
AllowShortIfStatementsOnASingleLine: false
|
||||||
AlignAfterOpenBracket: BlockIndent
|
AlignAfterOpenBracket: AlwaysBreak
|
||||||
BinPackArguments: false
|
BinPackArguments: false
|
||||||
BinPackParameters: false
|
BinPackParameters: false
|
||||||
BreakBeforeBraces: Attach
|
BreakBeforeBraces: Attach
|
||||||
ColumnLimit: 88
|
ColumnLimit: 88
|
||||||
DerivePointerAlignment: false
|
DerivePointerAlignment: false
|
||||||
IndentGotoLabels: false
|
|
||||||
IndentWidth: 4
|
IndentWidth: 4
|
||||||
PointerAlignment: Right
|
|
||||||
ReflowComments: true
|
|
||||||
SortIncludes: false
|
|
||||||
SpaceBeforeParens: ControlStatements
|
|
||||||
SpacesInParentheses: false
|
|
||||||
TabWidth: 4
|
|
||||||
UseTab: Never
|
|
||||||
---
|
|
||||||
Language: Cpp
|
Language: Cpp
|
||||||
BasedOnStyle: Google
|
|
||||||
AlwaysBreakAfterReturnType: All
|
|
||||||
AllowShortIfStatementsOnASingleLine: false
|
|
||||||
AlignAfterOpenBracket: BlockIndent
|
|
||||||
BinPackArguments: false
|
|
||||||
BinPackParameters: false
|
|
||||||
BreakBeforeBraces: Attach
|
|
||||||
ColumnLimit: 88
|
|
||||||
DerivePointerAlignment: false
|
|
||||||
IndentGotoLabels: false
|
|
||||||
IndentWidth: 4
|
|
||||||
PointerAlignment: Right
|
PointerAlignment: Right
|
||||||
ReflowComments: true
|
ReflowComments: true
|
||||||
SortIncludes: false
|
SortIncludes: false
|
||||||
|
|
|
@ -18,5 +18,7 @@ exclude_also =
|
||||||
|
|
||||||
[run]
|
[run]
|
||||||
omit =
|
omit =
|
||||||
checks/*.py
|
Tests/32bit_segfault_check.py
|
||||||
|
Tests/bench_cffi_access.py
|
||||||
|
Tests/check_*.py
|
||||||
Tests/createfontdatachunk.py
|
Tests/createfontdatachunk.py
|
||||||
|
|
5
.github/CONTRIBUTING.md
vendored
|
@ -9,7 +9,7 @@ Please send a pull request to the `main` branch. Please include [documentation](
|
||||||
- Fork the Pillow repository.
|
- Fork the Pillow repository.
|
||||||
- Create a branch from `main`.
|
- Create a branch from `main`.
|
||||||
- Develop bug fixes, features, tests, etc.
|
- Develop bug fixes, features, tests, etc.
|
||||||
- Run the test suite. You can enable GitHub Actions (https://github.com/MY-USERNAME/Pillow/actions) on your repo to catch test failures prior to the pull request, and [Codecov](https://codecov.io/gh) to see if the changed code is covered by tests.
|
- Run the test suite. You can enable GitHub Actions (https://github.com/MY-USERNAME/Pillow/actions) and [AppVeyor](https://ci.appveyor.com/projects/new) on your repo to catch test failures prior to the pull request, and [Codecov](https://codecov.io/gh) to see if the changed code is covered by tests.
|
||||||
- Create a pull request to pull the changes from your branch to the Pillow `main`.
|
- Create a pull request to pull the changes from your branch to the Pillow `main`.
|
||||||
|
|
||||||
### Guidelines
|
### Guidelines
|
||||||
|
@ -17,8 +17,9 @@ Please send a pull request to the `main` branch. Please include [documentation](
|
||||||
- Separate code commits from reformatting commits.
|
- Separate code commits from reformatting commits.
|
||||||
- Provide tests for any newly added code.
|
- Provide tests for any newly added code.
|
||||||
- Follow PEP 8.
|
- Follow PEP 8.
|
||||||
- When committing only documentation changes please include `[ci skip]` in the commit message to avoid running extra tests.
|
- When committing only documentation changes please include `[ci skip]` in the commit message to avoid running tests on AppVeyor.
|
||||||
- Include [release notes](https://github.com/python-pillow/Pillow/tree/main/docs/releasenotes) as needed or appropriate with your bug fixes, feature additions and tests.
|
- Include [release notes](https://github.com/python-pillow/Pillow/tree/main/docs/releasenotes) as needed or appropriate with your bug fixes, feature additions and tests.
|
||||||
|
- Do not add to the [changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) for proposed changes, as that is updated after changes are merged.
|
||||||
|
|
||||||
## Reporting Issues
|
## Reporting Issues
|
||||||
|
|
||||||
|
|
46
.github/ISSUE_TEMPLATE/RELEASE.md
vendored
|
@ -1,46 +0,0 @@
|
||||||
---
|
|
||||||
name: "Maintainers only: Release"
|
|
||||||
about: For maintainers to schedule a quarterly release
|
|
||||||
labels: Release
|
|
||||||
---
|
|
||||||
|
|
||||||
## Main release
|
|
||||||
|
|
||||||
Released quarterly on January 2nd, April 1st, July 1st and October 15th.
|
|
||||||
|
|
||||||
* [ ] Open a release ticket e.g. https://github.com/python-pillow/Pillow/issues/3154
|
|
||||||
* [ ] Develop and prepare release in `main` branch.
|
|
||||||
* [ ] Add release notes e.g. https://github.com/python-pillow/Pillow/pull/8885
|
|
||||||
* [ ] Check [GitHub Actions](https://github.com/python-pillow/Pillow/actions) to confirm passing tests in `main` branch.
|
|
||||||
* [ ] Check that all the wheel builds pass the tests in the [GitHub Actions "Wheels" workflow](https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml) jobs by manually triggering them.
|
|
||||||
* [ ] In compliance with [PEP 440](https://peps.python.org/pep-0440/), update version identifier in `src/PIL/_version.py`
|
|
||||||
* [ ] Run pre-release check via `make release-test` in a freshly cloned repo.
|
|
||||||
* [ ] Create branch and tag for release e.g.:
|
|
||||||
```bash
|
|
||||||
git branch [[MAJOR.MINOR]].x
|
|
||||||
git tag [[MAJOR.MINOR]].0
|
|
||||||
git push --tags
|
|
||||||
```
|
|
||||||
* [ ] Check the [GitHub Actions "Wheels" workflow](https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml) has passed, including the "Upload release to PyPI" job. This will have been triggered by the new tag.
|
|
||||||
* [ ] Publish the [release on GitHub](https://github.com/python-pillow/Pillow/releases).
|
|
||||||
* [ ] In compliance with [PEP 440](https://peps.python.org/pep-0440/), increment and append `.dev0` to version identifier in `src/PIL/_version.py` and then:
|
|
||||||
```bash
|
|
||||||
git push --all
|
|
||||||
```
|
|
||||||
|
|
||||||
## Publicize release
|
|
||||||
|
|
||||||
* [ ] Announce release availability via [Mastodon](https://fosstodon.org/@pillow) e.g. https://fosstodon.org/@pillow/110639450470725321
|
|
||||||
|
|
||||||
## Documentation
|
|
||||||
|
|
||||||
* [ ] Make sure the [default version for Read the Docs](https://pillow.readthedocs.io/en/stable/) is up-to-date with the release changes
|
|
||||||
|
|
||||||
## Docker images
|
|
||||||
|
|
||||||
* [ ] Update Pillow in the Docker Images repository
|
|
||||||
```bash
|
|
||||||
git clone https://github.com/python-pillow/docker-images
|
|
||||||
cd docker-images
|
|
||||||
./update-pillow-tag.sh [[release tag]]
|
|
||||||
```
|
|
2
.github/mergify.yml
vendored
|
@ -8,6 +8,8 @@ pull_request_rules:
|
||||||
- status-success=Docker Test Successful
|
- status-success=Docker Test Successful
|
||||||
- status-success=Windows Test Successful
|
- status-success=Windows Test Successful
|
||||||
- status-success=MinGW
|
- status-success=MinGW
|
||||||
|
- status-success=Cygwin Test Successful
|
||||||
|
- status-success=continuous-integration/appveyor/pr
|
||||||
actions:
|
actions:
|
||||||
merge:
|
merge:
|
||||||
method: merge
|
method: merge
|
||||||
|
|
11
.github/release-drafter.yml
vendored
|
@ -3,19 +3,18 @@ tag-template: "$NEXT_MINOR_VERSION"
|
||||||
change-template: '- $TITLE #$NUMBER [@$AUTHOR]'
|
change-template: '- $TITLE #$NUMBER [@$AUTHOR]'
|
||||||
|
|
||||||
categories:
|
categories:
|
||||||
- title: "Removals"
|
- title: "Dependencies"
|
||||||
label: "Removal"
|
label: "Dependency"
|
||||||
- title: "Deprecations"
|
- title: "Deprecations"
|
||||||
label: "Deprecation"
|
label: "Deprecation"
|
||||||
- title: "Documentation"
|
- title: "Documentation"
|
||||||
label: "Documentation"
|
label: "Documentation"
|
||||||
- title: "Dependencies"
|
- title: "Removals"
|
||||||
label: "Dependency"
|
label: "Removal"
|
||||||
- title: "Testing"
|
- title: "Testing"
|
||||||
label: "Testing"
|
label: "Testing"
|
||||||
- title: "Type hints"
|
- title: "Type hints"
|
||||||
label: "Type hints"
|
label: "Type hints"
|
||||||
- title: "Other changes"
|
|
||||||
|
|
||||||
exclude-labels:
|
exclude-labels:
|
||||||
- "changelog: skip"
|
- "changelog: skip"
|
||||||
|
@ -24,4 +23,6 @@ template: |
|
||||||
|
|
||||||
https://pillow.readthedocs.io/en/stable/releasenotes/$NEXT_MINOR_VERSION.html
|
https://pillow.readthedocs.io/en/stable/releasenotes/$NEXT_MINOR_VERSION.html
|
||||||
|
|
||||||
|
## Changes
|
||||||
|
|
||||||
$CHANGES
|
$CHANGES
|
||||||
|
|
12
.github/renovate.json
vendored
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||||
"extends": [
|
"extends": [
|
||||||
"config:recommended"
|
"config:base"
|
||||||
],
|
],
|
||||||
"labels": [
|
"labels": [
|
||||||
"Dependency"
|
"Dependency"
|
||||||
|
@ -9,13 +9,9 @@
|
||||||
"packageRules": [
|
"packageRules": [
|
||||||
{
|
{
|
||||||
"groupName": "github-actions",
|
"groupName": "github-actions",
|
||||||
"matchManagers": [
|
"matchManagers": ["github-actions"],
|
||||||
"github-actions"
|
"separateMajorMinor": "false"
|
||||||
],
|
|
||||||
"separateMajorMinor": false
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"schedule": [
|
"schedule": ["on the 3rd day of the month"]
|
||||||
"* * 3 * *"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|
2
.github/workflows/cifuzz.yml
vendored
|
@ -6,13 +6,11 @@ on:
|
||||||
- "**"
|
- "**"
|
||||||
paths:
|
paths:
|
||||||
- ".github/workflows/cifuzz.yml"
|
- ".github/workflows/cifuzz.yml"
|
||||||
- ".github/workflows/wheels-dependencies.sh"
|
|
||||||
- "**.c"
|
- "**.c"
|
||||||
- "**.h"
|
- "**.h"
|
||||||
pull_request:
|
pull_request:
|
||||||
paths:
|
paths:
|
||||||
- ".github/workflows/cifuzz.yml"
|
- ".github/workflows/cifuzz.yml"
|
||||||
- ".github/workflows/wheels-dependencies.sh"
|
|
||||||
- "**.c"
|
- "**.c"
|
||||||
- "**.h"
|
- "**.h"
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
2
.github/workflows/docs.yml
vendored
|
@ -33,8 +33,6 @@ jobs:
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
|
||||||
persist-credentials: false
|
|
||||||
|
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
|
|
2
.github/workflows/lint.yml
vendored
|
@ -21,8 +21,6 @@ jobs:
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
|
||||||
persist-credentials: false
|
|
||||||
|
|
||||||
- name: pre-commit cache
|
- name: pre-commit cache
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
|
|
21
.github/workflows/macos-install.sh
vendored
|
@ -2,40 +2,31 @@
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
if [[ "$ImageOS" == "macos13" ]]; then
|
|
||||||
brew uninstall gradle maven
|
|
||||||
fi
|
|
||||||
brew install \
|
brew install \
|
||||||
aom \
|
|
||||||
dav1d \
|
|
||||||
freetype \
|
freetype \
|
||||||
ghostscript \
|
ghostscript \
|
||||||
jpeg-turbo \
|
|
||||||
libimagequant \
|
libimagequant \
|
||||||
|
libjpeg \
|
||||||
libraqm \
|
libraqm \
|
||||||
libtiff \
|
libtiff \
|
||||||
little-cms2 \
|
little-cms2 \
|
||||||
openjpeg \
|
openjpeg \
|
||||||
rav1e \
|
|
||||||
svt-av1 \
|
|
||||||
webp
|
webp
|
||||||
export PKG_CONFIG_PATH="/usr/local/opt/openblas/lib/pkgconfig"
|
export PKG_CONFIG_PATH="/usr/local/opt/openblas/lib/pkgconfig"
|
||||||
|
|
||||||
|
# TODO Update condition when cffi supports 3.13
|
||||||
|
if ! [[ "$GHA_PYTHON_VERSION" == "3.13" ]]; then PYTHONOPTIMIZE=0 python3 -m pip install cffi ; fi
|
||||||
|
|
||||||
python3 -m pip install coverage
|
python3 -m pip install coverage
|
||||||
python3 -m pip install defusedxml
|
python3 -m pip install defusedxml
|
||||||
python3 -m pip install ipython
|
|
||||||
python3 -m pip install olefile
|
python3 -m pip install olefile
|
||||||
python3 -m pip install -U pytest
|
python3 -m pip install -U pytest
|
||||||
python3 -m pip install -U pytest-cov
|
python3 -m pip install -U pytest-cov
|
||||||
python3 -m pip install -U pytest-timeout
|
python3 -m pip install -U pytest-timeout
|
||||||
python3 -m pip install pyroma
|
python3 -m pip install pyroma
|
||||||
python3 -m pip install numpy
|
|
||||||
# optional test dependency, only install if there's a binary package.
|
|
||||||
# fails on beta 3.14 and PyPy
|
|
||||||
python3 -m pip install --only-binary=:all: pyarrow || true
|
|
||||||
|
|
||||||
# libavif
|
# TODO Update condition when NumPy supports 3.13
|
||||||
pushd depends && ./install_libavif.sh && popd
|
if ! [[ "$GHA_PYTHON_VERSION" == "3.13" ]]; then python3 -m pip install numpy ; fi
|
||||||
|
|
||||||
# extra test images
|
# extra test images
|
||||||
pushd depends && ./install_extra_test_images.sh && popd
|
pushd depends && ./install_extra_test_images.sh && popd
|
||||||
|
|
4
.github/workflows/stale.yml
vendored
|
@ -6,7 +6,7 @@ on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
issues: write
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
group: ${{ github.workflow }}-${{ github.ref }}
|
group: ${{ github.workflow }}-${{ github.ref }}
|
||||||
|
@ -15,8 +15,6 @@ concurrency:
|
||||||
jobs:
|
jobs:
|
||||||
stale:
|
stale:
|
||||||
if: github.repository_owner == 'python-pillow'
|
if: github.repository_owner == 'python-pillow'
|
||||||
permissions:
|
|
||||||
issues: write
|
|
||||||
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
|
149
.github/workflows/test-cygwin.yml
vendored
Normal file
|
@ -0,0 +1,149 @@
|
||||||
|
name: Test Cygwin
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- "**"
|
||||||
|
paths-ignore:
|
||||||
|
- ".github/workflows/docs.yml"
|
||||||
|
- ".github/workflows/wheels*"
|
||||||
|
- ".gitmodules"
|
||||||
|
- "docs/**"
|
||||||
|
- "wheels/**"
|
||||||
|
pull_request:
|
||||||
|
paths-ignore:
|
||||||
|
- ".github/workflows/docs.yml"
|
||||||
|
- ".github/workflows/wheels*"
|
||||||
|
- ".gitmodules"
|
||||||
|
- "docs/**"
|
||||||
|
- "wheels/**"
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: ${{ github.workflow }}-${{ github.ref }}
|
||||||
|
cancel-in-progress: true
|
||||||
|
|
||||||
|
env:
|
||||||
|
COVERAGE_CORE: sysmon
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: windows-latest
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
python-minor-version: [8, 9]
|
||||||
|
|
||||||
|
timeout-minutes: 40
|
||||||
|
|
||||||
|
name: Python 3.${{ matrix.python-minor-version }}
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Fix line endings
|
||||||
|
run: |
|
||||||
|
git config --global core.autocrlf input
|
||||||
|
|
||||||
|
- name: Checkout Pillow
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Install Cygwin
|
||||||
|
uses: cygwin/cygwin-install-action@v4
|
||||||
|
with:
|
||||||
|
packages: >
|
||||||
|
gcc-g++
|
||||||
|
ghostscript
|
||||||
|
ImageMagick
|
||||||
|
jpeg
|
||||||
|
libfreetype-devel
|
||||||
|
libimagequant-devel
|
||||||
|
libjpeg-devel
|
||||||
|
liblapack-devel
|
||||||
|
liblcms2-devel
|
||||||
|
libopenjp2-devel
|
||||||
|
libraqm-devel
|
||||||
|
libtiff-devel
|
||||||
|
libwebp-devel
|
||||||
|
libxcb-devel
|
||||||
|
libxcb-xinerama0
|
||||||
|
make
|
||||||
|
netpbm
|
||||||
|
perl
|
||||||
|
python3${{ matrix.python-minor-version }}-cffi
|
||||||
|
python3${{ matrix.python-minor-version }}-cython
|
||||||
|
python3${{ matrix.python-minor-version }}-devel
|
||||||
|
python3${{ matrix.python-minor-version }}-numpy
|
||||||
|
python3${{ matrix.python-minor-version }}-sip
|
||||||
|
python3${{ matrix.python-minor-version }}-tkinter
|
||||||
|
wget
|
||||||
|
xorg-server-extra
|
||||||
|
zlib-devel
|
||||||
|
|
||||||
|
- name: Add Lapack to PATH
|
||||||
|
uses: egor-tensin/cleanup-path@v4
|
||||||
|
with:
|
||||||
|
dirs: 'C:\cygwin\bin;C:\cygwin\lib\lapack'
|
||||||
|
|
||||||
|
- name: Select Python version
|
||||||
|
run: |
|
||||||
|
ln -sf c:/cygwin/bin/python3.${{ matrix.python-minor-version }} c:/cygwin/bin/python3
|
||||||
|
|
||||||
|
- name: pip cache
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: 'C:\cygwin\home\runneradmin\.cache\pip'
|
||||||
|
key: ${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-${{ hashFiles('.ci/install.sh') }}
|
||||||
|
restore-keys: |
|
||||||
|
${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-
|
||||||
|
|
||||||
|
- name: Build system information
|
||||||
|
run: |
|
||||||
|
dash.exe -c "python3 .github/workflows/system-info.py"
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: |
|
||||||
|
bash.exe .ci/install.sh
|
||||||
|
|
||||||
|
- name: Build
|
||||||
|
shell: bash.exe -eo pipefail -o igncr "{0}"
|
||||||
|
run: |
|
||||||
|
.ci/build.sh
|
||||||
|
|
||||||
|
- name: Test
|
||||||
|
run: |
|
||||||
|
bash.exe xvfb-run -s '-screen 0 1024x768x24' .ci/test.sh
|
||||||
|
|
||||||
|
- name: Prepare to upload errors
|
||||||
|
if: failure()
|
||||||
|
run: |
|
||||||
|
dash.exe -c "mkdir -p Tests/errors"
|
||||||
|
|
||||||
|
- name: Upload errors
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
if: failure()
|
||||||
|
with:
|
||||||
|
name: errors
|
||||||
|
path: Tests/errors
|
||||||
|
|
||||||
|
- name: After success
|
||||||
|
run: |
|
||||||
|
bash.exe .ci/after_success.sh
|
||||||
|
|
||||||
|
- name: Upload coverage
|
||||||
|
uses: codecov/codecov-action@v3.1.5
|
||||||
|
with:
|
||||||
|
file: ./coverage.xml
|
||||||
|
flags: GHA_Cygwin
|
||||||
|
name: Cygwin Python 3.${{ matrix.python-minor-version }}
|
||||||
|
|
||||||
|
success:
|
||||||
|
permissions:
|
||||||
|
contents: none
|
||||||
|
needs: build
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
name: Cygwin Test Successful
|
||||||
|
steps:
|
||||||
|
- name: Success
|
||||||
|
run: echo Cygwin Test Successful
|
48
.github/workflows/test-docker.yml
vendored
|
@ -29,55 +29,53 @@ concurrency:
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os: ["ubuntu-latest"]
|
|
||||||
docker: [
|
docker: [
|
||||||
# Run slower jobs first to give them a headstart and reduce waiting time
|
# Run slower jobs first to give them a headstart and reduce waiting time
|
||||||
ubuntu-24.04-noble-ppc64le,
|
ubuntu-22.04-jammy-arm64v8,
|
||||||
ubuntu-24.04-noble-s390x,
|
ubuntu-22.04-jammy-ppc64le,
|
||||||
|
ubuntu-22.04-jammy-s390x,
|
||||||
# Then run the remainder
|
# Then run the remainder
|
||||||
alpine,
|
alpine,
|
||||||
amazon-2-amd64,
|
amazon-2-amd64,
|
||||||
amazon-2023-amd64,
|
amazon-2023-amd64,
|
||||||
arch,
|
arch,
|
||||||
|
centos-7-amd64,
|
||||||
|
centos-stream-8-amd64,
|
||||||
centos-stream-9-amd64,
|
centos-stream-9-amd64,
|
||||||
centos-stream-10-amd64,
|
debian-11-bullseye-amd64,
|
||||||
debian-12-bookworm-x86,
|
debian-12-bookworm-x86,
|
||||||
debian-12-bookworm-amd64,
|
debian-12-bookworm-amd64,
|
||||||
fedora-41-amd64,
|
fedora-38-amd64,
|
||||||
fedora-42-amd64,
|
fedora-39-amd64,
|
||||||
gentoo,
|
gentoo,
|
||||||
|
ubuntu-20.04-focal-amd64,
|
||||||
ubuntu-22.04-jammy-amd64,
|
ubuntu-22.04-jammy-amd64,
|
||||||
ubuntu-24.04-noble-amd64,
|
|
||||||
]
|
]
|
||||||
dockerTag: [main]
|
dockerTag: [main]
|
||||||
include:
|
include:
|
||||||
- docker: "ubuntu-24.04-noble-ppc64le"
|
- docker: "ubuntu-22.04-jammy-arm64v8"
|
||||||
|
qemu-arch: "aarch64"
|
||||||
|
- docker: "ubuntu-22.04-jammy-ppc64le"
|
||||||
qemu-arch: "ppc64le"
|
qemu-arch: "ppc64le"
|
||||||
- docker: "ubuntu-24.04-noble-s390x"
|
- docker: "ubuntu-22.04-jammy-s390x"
|
||||||
qemu-arch: "s390x"
|
qemu-arch: "s390x"
|
||||||
- docker: "ubuntu-24.04-noble-arm64v8"
|
|
||||||
os: "ubuntu-24.04-arm"
|
|
||||||
dockerTag: main
|
|
||||||
|
|
||||||
name: ${{ matrix.docker }}
|
name: ${{ matrix.docker }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
|
||||||
persist-credentials: false
|
|
||||||
|
|
||||||
- name: Build system information
|
- name: Build system information
|
||||||
run: python3 .github/workflows/system-info.py
|
run: python3 .github/workflows/system-info.py
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
if: "matrix.qemu-arch"
|
if: "matrix.qemu-arch"
|
||||||
uses: docker/setup-qemu-action@v3
|
run: |
|
||||||
with:
|
docker run --rm --privileged aptman/qus -s -- -p ${{ matrix.qemu-arch }}
|
||||||
platforms: ${{ matrix.qemu-arch }}
|
|
||||||
|
|
||||||
- name: Docker pull
|
- name: Docker pull
|
||||||
run: |
|
run: |
|
||||||
|
@ -85,29 +83,29 @@ jobs:
|
||||||
|
|
||||||
- name: Docker build
|
- name: Docker build
|
||||||
run: |
|
run: |
|
||||||
# The Pillow user in the docker container is UID 1001
|
# The Pillow user in the docker container is UID 1000
|
||||||
sudo chown -R 1001 $GITHUB_WORKSPACE
|
sudo chown -R 1000 $GITHUB_WORKSPACE
|
||||||
docker run --name pillow_container -v $GITHUB_WORKSPACE:/Pillow pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }}
|
docker run --name pillow_container -v $GITHUB_WORKSPACE:/Pillow pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }}
|
||||||
sudo chown -R runner $GITHUB_WORKSPACE
|
sudo chown -R runner $GITHUB_WORKSPACE
|
||||||
|
|
||||||
- name: After success
|
- name: After success
|
||||||
run: |
|
run: |
|
||||||
|
PATH="$PATH:~/.local/bin"
|
||||||
docker start pillow_container
|
docker start pillow_container
|
||||||
sudo docker cp pillow_container:/Pillow /Pillow
|
|
||||||
sudo chown -R runner /Pillow
|
|
||||||
pil_path=`docker exec pillow_container /vpy3/bin/python -c 'import os, PIL;print(os.path.realpath(os.path.dirname(PIL.__file__)))'`
|
pil_path=`docker exec pillow_container /vpy3/bin/python -c 'import os, PIL;print(os.path.realpath(os.path.dirname(PIL.__file__)))'`
|
||||||
docker stop pillow_container
|
docker stop pillow_container
|
||||||
sudo mkdir -p $pil_path
|
sudo mkdir -p $pil_path
|
||||||
sudo cp src/PIL/*.py $pil_path
|
sudo cp src/PIL/*.py $pil_path
|
||||||
cd /Pillow
|
|
||||||
.ci/after_success.sh
|
.ci/after_success.sh
|
||||||
|
env:
|
||||||
|
MATRIX_DOCKER: ${{ matrix.docker }}
|
||||||
|
|
||||||
- name: Upload coverage
|
- name: Upload coverage
|
||||||
uses: codecov/codecov-action@v5
|
uses: codecov/codecov-action@v3.1.5
|
||||||
with:
|
with:
|
||||||
flags: GHA_Docker
|
flags: GHA_Docker
|
||||||
name: ${{ matrix.docker }}
|
name: ${{ matrix.docker }}
|
||||||
token: ${{ secrets.CODECOV_ORG_TOKEN }}
|
gcov: true
|
||||||
|
|
||||||
success:
|
success:
|
||||||
permissions:
|
permissions:
|
||||||
|
|
26
.github/workflows/test-mingw.yml
vendored
|
@ -46,8 +46,6 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Pillow
|
- name: Checkout Pillow
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
|
||||||
persist-credentials: false
|
|
||||||
|
|
||||||
- name: Set up shell
|
- name: Set up shell
|
||||||
run: echo "C:\msys64\usr\bin\" >> $env:GITHUB_PATH
|
run: echo "C:\msys64\usr\bin\" >> $env:GITHUB_PATH
|
||||||
|
@ -60,35 +58,35 @@ jobs:
|
||||||
mingw-w64-x86_64-gcc \
|
mingw-w64-x86_64-gcc \
|
||||||
mingw-w64-x86_64-ghostscript \
|
mingw-w64-x86_64-ghostscript \
|
||||||
mingw-w64-x86_64-lcms2 \
|
mingw-w64-x86_64-lcms2 \
|
||||||
mingw-w64-x86_64-libavif \
|
|
||||||
mingw-w64-x86_64-libimagequant \
|
mingw-w64-x86_64-libimagequant \
|
||||||
mingw-w64-x86_64-libjpeg-turbo \
|
mingw-w64-x86_64-libjpeg-turbo \
|
||||||
mingw-w64-x86_64-libraqm \
|
mingw-w64-x86_64-libraqm \
|
||||||
mingw-w64-x86_64-libtiff \
|
mingw-w64-x86_64-libtiff \
|
||||||
mingw-w64-x86_64-libwebp \
|
mingw-w64-x86_64-libwebp \
|
||||||
mingw-w64-x86_64-openjpeg2 \
|
mingw-w64-x86_64-openjpeg2 \
|
||||||
mingw-w64-x86_64-python-numpy \
|
mingw-w64-x86_64-python3-cffi \
|
||||||
mingw-w64-x86_64-python-olefile \
|
mingw-w64-x86_64-python3-numpy \
|
||||||
mingw-w64-x86_64-python-pip \
|
mingw-w64-x86_64-python3-olefile \
|
||||||
mingw-w64-x86_64-python-pytest \
|
mingw-w64-x86_64-python3-setuptools \
|
||||||
mingw-w64-x86_64-python-pytest-cov \
|
|
||||||
mingw-w64-x86_64-python-pytest-timeout \
|
|
||||||
mingw-w64-x86_64-python-pyqt6
|
mingw-w64-x86_64-python-pyqt6
|
||||||
|
|
||||||
|
python3 -m ensurepip
|
||||||
|
python3 -m pip install pyroma pytest pytest-cov pytest-timeout
|
||||||
|
|
||||||
pushd depends && ./install_extra_test_images.sh && popd
|
pushd depends && ./install_extra_test_images.sh && popd
|
||||||
|
|
||||||
- name: Build Pillow
|
- name: Build Pillow
|
||||||
run: CFLAGS="-coverage" python3 -m pip install .
|
run: SETUPTOOLS_USE_DISTUTILS="stdlib" CFLAGS="-coverage" python3 -m pip install .
|
||||||
|
|
||||||
- name: Test Pillow
|
- name: Test Pillow
|
||||||
run: |
|
run: |
|
||||||
python3 selftest.py --installed
|
python3 selftest.py --installed
|
||||||
.ci/test.sh
|
python3 -c "from PIL import Image"
|
||||||
|
python3 -m pytest -vx --cov PIL --cov Tests --cov-report term --cov-report xml Tests
|
||||||
|
|
||||||
- name: Upload coverage
|
- name: Upload coverage
|
||||||
uses: codecov/codecov-action@v5
|
uses: codecov/codecov-action@v3.1.5
|
||||||
with:
|
with:
|
||||||
files: ./coverage.xml
|
file: ./coverage.xml
|
||||||
flags: GHA_Windows
|
flags: GHA_Windows
|
||||||
name: "MSYS2 MinGW"
|
name: "MSYS2 MinGW"
|
||||||
token: ${{ secrets.CODECOV_ORG_TOKEN }}
|
|
||||||
|
|
60
.github/workflows/test-valgrind-memory.yml
vendored
|
@ -1,60 +0,0 @@
|
||||||
name: Test Valgrind Memory Leaks
|
|
||||||
|
|
||||||
# like the Docker tests, but running valgrind only on *.c/*.h changes.
|
|
||||||
|
|
||||||
# this is very expensive. Only run on the pull request.
|
|
||||||
on:
|
|
||||||
# push:
|
|
||||||
# branches:
|
|
||||||
# - "**"
|
|
||||||
# paths:
|
|
||||||
# - ".github/workflows/test-valgrind.yml"
|
|
||||||
# - "**.c"
|
|
||||||
# - "**.h"
|
|
||||||
pull_request:
|
|
||||||
paths:
|
|
||||||
- ".github/workflows/test-valgrind.yml"
|
|
||||||
- "**.c"
|
|
||||||
- "**.h"
|
|
||||||
- "depends/docker-test-valgrind-memory.sh"
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: ${{ github.workflow }}-${{ github.ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
docker: [
|
|
||||||
ubuntu-22.04-jammy-amd64-valgrind,
|
|
||||||
]
|
|
||||||
dockerTag: [main]
|
|
||||||
|
|
||||||
name: ${{ matrix.docker }}
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
persist-credentials: false
|
|
||||||
|
|
||||||
- name: Build system information
|
|
||||||
run: python3 .github/workflows/system-info.py
|
|
||||||
|
|
||||||
- name: Docker pull
|
|
||||||
run: |
|
|
||||||
docker pull pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }}
|
|
||||||
|
|
||||||
- name: Build and Run Valgrind
|
|
||||||
run: |
|
|
||||||
# The Pillow user in the docker container is UID 1001
|
|
||||||
sudo chown -R 1001 $GITHUB_WORKSPACE
|
|
||||||
docker run --name pillow_container -e "PILLOW_VALGRIND_TEST=true" -v $GITHUB_WORKSPACE:/Pillow pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }} /Pillow/depends/docker-test-valgrind-memory.sh
|
|
||||||
sudo chown -R runner $GITHUB_WORKSPACE
|
|
6
.github/workflows/test-valgrind.yml
vendored
|
@ -40,8 +40,6 @@ jobs:
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
|
||||||
persist-credentials: false
|
|
||||||
|
|
||||||
- name: Build system information
|
- name: Build system information
|
||||||
run: python3 .github/workflows/system-info.py
|
run: python3 .github/workflows/system-info.py
|
||||||
|
@ -52,7 +50,7 @@ jobs:
|
||||||
|
|
||||||
- name: Build and Run Valgrind
|
- name: Build and Run Valgrind
|
||||||
run: |
|
run: |
|
||||||
# The Pillow user in the docker container is UID 1001
|
# The Pillow user in the docker container is UID 1000
|
||||||
sudo chown -R 1001 $GITHUB_WORKSPACE
|
sudo chown -R 1000 $GITHUB_WORKSPACE
|
||||||
docker run --name pillow_container -e "PILLOW_VALGRIND_TEST=true" -v $GITHUB_WORKSPACE:/Pillow pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }}
|
docker run --name pillow_container -e "PILLOW_VALGRIND_TEST=true" -v $GITHUB_WORKSPACE:/Pillow pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }}
|
||||||
sudo chown -R runner $GITHUB_WORKSPACE
|
sudo chown -R runner $GITHUB_WORKSPACE
|
||||||
|
|
56
.github/workflows/test-windows.yml
vendored
|
@ -35,33 +35,25 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
python-version: ["pypy3.11", "3.11", "3.12", "3.13", "3.14"]
|
python-version: ["pypy3.10", "pypy3.9", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
|
||||||
architecture: ["x64"]
|
|
||||||
include:
|
|
||||||
# Test the oldest Python on 32-bit
|
|
||||||
- { python-version: "3.10", architecture: "x86" }
|
|
||||||
|
|
||||||
timeout-minutes: 45
|
timeout-minutes: 30
|
||||||
|
|
||||||
name: Python ${{ matrix.python-version }} (${{ matrix.architecture }})
|
name: Python ${{ matrix.python-version }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Pillow
|
- name: Checkout Pillow
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
|
||||||
persist-credentials: false
|
|
||||||
|
|
||||||
- name: Checkout cached dependencies
|
- name: Checkout cached dependencies
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
persist-credentials: false
|
|
||||||
repository: python-pillow/pillow-depends
|
repository: python-pillow/pillow-depends
|
||||||
path: winbuild\depends
|
path: winbuild\depends
|
||||||
|
|
||||||
- name: Checkout extra test images
|
- name: Checkout extra test images
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
persist-credentials: false
|
|
||||||
repository: python-pillow/test-images
|
repository: python-pillow/test-images
|
||||||
path: Tests\test-images
|
path: Tests\test-images
|
||||||
|
|
||||||
|
@ -71,25 +63,22 @@ jobs:
|
||||||
with:
|
with:
|
||||||
python-version: ${{ matrix.python-version }}
|
python-version: ${{ matrix.python-version }}
|
||||||
allow-prereleases: true
|
allow-prereleases: true
|
||||||
architecture: ${{ matrix.architecture }}
|
|
||||||
cache: pip
|
cache: pip
|
||||||
cache-dependency-path: ".github/workflows/test-windows.yml"
|
cache-dependency-path: ".github/workflows/test-windows.yml"
|
||||||
|
|
||||||
- name: Print build system information
|
- name: Print build system information
|
||||||
run: python3 .github/workflows/system-info.py
|
run: python3 .github/workflows/system-info.py
|
||||||
|
|
||||||
- name: Upgrade pip
|
- name: Install Python dependencies
|
||||||
run: |
|
run: >
|
||||||
python3 -m pip install --upgrade pip
|
python3 -m pip install
|
||||||
|
coverage>=7.4.2
|
||||||
- name: Install CPython dependencies
|
defusedxml
|
||||||
if: "!contains(matrix.python-version, 'pypy') && !contains(matrix.python-version, '3.14') && matrix.architecture != 'x86'"
|
olefile
|
||||||
run: |
|
pyroma
|
||||||
python3 -m pip install PyQt6
|
pytest
|
||||||
|
pytest-cov
|
||||||
- name: Install PyArrow dependency
|
pytest-timeout
|
||||||
run: |
|
|
||||||
python3 -m pip install --only-binary=:all: pyarrow || true
|
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
id: install
|
id: install
|
||||||
|
@ -97,8 +86,8 @@ jobs:
|
||||||
choco install nasm --no-progress
|
choco install nasm --no-progress
|
||||||
echo "C:\Program Files\NASM" >> $env:GITHUB_PATH
|
echo "C:\Program Files\NASM" >> $env:GITHUB_PATH
|
||||||
|
|
||||||
choco install ghostscript --version=10.5.1 --no-progress
|
choco install ghostscript --version=10.3.0 --no-progress
|
||||||
echo "C:\Program Files\gs\gs10.05.1\bin" >> $env:GITHUB_PATH
|
echo "C:\Program Files\gs\gs10.00.0\bin" >> $env:GITHUB_PATH
|
||||||
|
|
||||||
# Install extra test images
|
# Install extra test images
|
||||||
xcopy /S /Y Tests\test-images\* Tests\images
|
xcopy /S /Y Tests\test-images\* Tests\images
|
||||||
|
@ -148,10 +137,6 @@ jobs:
|
||||||
if: steps.build-cache.outputs.cache-hit != 'true'
|
if: steps.build-cache.outputs.cache-hit != 'true'
|
||||||
run: "& winbuild\\build\\build_dep_libpng.cmd"
|
run: "& winbuild\\build\\build_dep_libpng.cmd"
|
||||||
|
|
||||||
- name: Build dependencies / libavif
|
|
||||||
if: steps.build-cache.outputs.cache-hit != 'true' && matrix.architecture == 'x64'
|
|
||||||
run: "& winbuild\\build\\build_dep_libavif.cmd"
|
|
||||||
|
|
||||||
# for FreeType WOFF2 font support
|
# for FreeType WOFF2 font support
|
||||||
- name: Build dependencies / brotli
|
- name: Build dependencies / brotli
|
||||||
if: steps.build-cache.outputs.cache-hit != 'true'
|
if: steps.build-cache.outputs.cache-hit != 'true'
|
||||||
|
@ -193,7 +178,7 @@ jobs:
|
||||||
- name: Build Pillow
|
- name: Build Pillow
|
||||||
run: |
|
run: |
|
||||||
$FLAGS="-C raqm=vendor -C fribidi=vendor"
|
$FLAGS="-C raqm=vendor -C fribidi=vendor"
|
||||||
cmd /c "winbuild\build\build_env.cmd && $env:pythonLocation\python.exe -m pip install -v $FLAGS .[tests]"
|
cmd /c "winbuild\build\build_env.cmd && $env:pythonLocation\python.exe -m pip install -v $FLAGS ."
|
||||||
& $env:pythonLocation\python.exe selftest.py --installed
|
& $env:pythonLocation\python.exe selftest.py --installed
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
|
|
||||||
|
@ -205,8 +190,8 @@ jobs:
|
||||||
|
|
||||||
- name: Test Pillow
|
- name: Test Pillow
|
||||||
run: |
|
run: |
|
||||||
path %GITHUB_WORKSPACE%\winbuild\build\bin;%PATH%
|
path %GITHUB_WORKSPACE%\\winbuild\\build\\bin;%PATH%
|
||||||
.ci\test.cmd
|
python.exe -m pytest -vx -W always --cov PIL --cov Tests --cov-report term --cov-report xml Tests
|
||||||
shell: cmd
|
shell: cmd
|
||||||
|
|
||||||
- name: Prepare to upload errors
|
- name: Prepare to upload errors
|
||||||
|
@ -228,12 +213,11 @@ jobs:
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
|
|
||||||
- name: Upload coverage
|
- name: Upload coverage
|
||||||
uses: codecov/codecov-action@v5
|
uses: codecov/codecov-action@v3.1.5
|
||||||
with:
|
with:
|
||||||
files: ./coverage.xml
|
file: ./coverage.xml
|
||||||
flags: GHA_Windows
|
flags: GHA_Windows
|
||||||
name: ${{ runner.os }} Python ${{ matrix.python-version }}
|
name: ${{ runner.os }} Python ${{ matrix.python-version }}
|
||||||
token: ${{ secrets.CODECOV_ORG_TOKEN }}
|
|
||||||
|
|
||||||
success:
|
success:
|
||||||
permissions:
|
permissions:
|
||||||
|
|
45
.github/workflows/test.yml
vendored
|
@ -37,37 +37,41 @@ jobs:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os: [
|
os: [
|
||||||
"macos-latest",
|
"macos-14",
|
||||||
"ubuntu-latest",
|
"ubuntu-latest",
|
||||||
]
|
]
|
||||||
python-version: [
|
python-version: [
|
||||||
"pypy3.11",
|
"pypy3.10",
|
||||||
"3.14t",
|
"pypy3.9",
|
||||||
"3.14",
|
|
||||||
"3.13t",
|
|
||||||
"3.13",
|
"3.13",
|
||||||
"3.12",
|
"3.12",
|
||||||
"3.11",
|
"3.11",
|
||||||
"3.10",
|
"3.10",
|
||||||
|
"3.9",
|
||||||
|
"3.8",
|
||||||
]
|
]
|
||||||
include:
|
include:
|
||||||
- { python-version: "3.12", PYTHONOPTIMIZE: 1, REVERSE: "--reverse" }
|
- python-version: "3.11"
|
||||||
- { python-version: "3.11", PYTHONOPTIMIZE: 2 }
|
PYTHONOPTIMIZE: 1
|
||||||
# Free-threaded
|
REVERSE: "--reverse"
|
||||||
- { python-version: "3.14t", disable-gil: true }
|
- python-version: "3.10"
|
||||||
- { python-version: "3.13t", disable-gil: true }
|
PYTHONOPTIMIZE: 2
|
||||||
# Intel
|
# M1 only available for 3.10+
|
||||||
- { os: "macos-13", python-version: "3.10" }
|
- os: "macos-latest"
|
||||||
|
python-version: "3.9"
|
||||||
|
- os: "macos-latest"
|
||||||
|
python-version: "3.8"
|
||||||
exclude:
|
exclude:
|
||||||
- { os: "macos-latest", python-version: "3.10" }
|
- os: "macos-14"
|
||||||
|
python-version: "3.9"
|
||||||
|
- os: "macos-14"
|
||||||
|
python-version: "3.8"
|
||||||
|
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
name: ${{ matrix.os }} Python ${{ matrix.python-version }}
|
name: ${{ matrix.os }} Python ${{ matrix.python-version }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
|
||||||
persist-credentials: false
|
|
||||||
|
|
||||||
- name: Set up Python ${{ matrix.python-version }}
|
- name: Set up Python ${{ matrix.python-version }}
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
|
@ -79,11 +83,6 @@ jobs:
|
||||||
".ci/*.sh"
|
".ci/*.sh"
|
||||||
"pyproject.toml"
|
"pyproject.toml"
|
||||||
|
|
||||||
- name: Set PYTHON_GIL
|
|
||||||
if: "${{ matrix.disable-gil }}"
|
|
||||||
run: |
|
|
||||||
echo "PYTHON_GIL=0" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Build system information
|
- name: Build system information
|
||||||
run: python3 .github/workflows/system-info.py
|
run: python3 .github/workflows/system-info.py
|
||||||
|
|
||||||
|
@ -111,7 +110,7 @@ jobs:
|
||||||
GHA_PYTHON_VERSION: ${{ matrix.python-version }}
|
GHA_PYTHON_VERSION: ${{ matrix.python-version }}
|
||||||
|
|
||||||
- name: Register gcc problem matcher
|
- name: Register gcc problem matcher
|
||||||
if: "matrix.os == 'ubuntu-latest' && matrix.python-version == '3.13'"
|
if: "matrix.os == 'ubuntu-latest' && matrix.python-version == '3.12'"
|
||||||
run: echo "::add-matcher::.github/problem-matchers/gcc.json"
|
run: echo "::add-matcher::.github/problem-matchers/gcc.json"
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
|
@ -151,11 +150,11 @@ jobs:
|
||||||
.ci/after_success.sh
|
.ci/after_success.sh
|
||||||
|
|
||||||
- name: Upload coverage
|
- name: Upload coverage
|
||||||
uses: codecov/codecov-action@v5
|
uses: codecov/codecov-action@v3.1.5
|
||||||
with:
|
with:
|
||||||
flags: ${{ matrix.os == 'ubuntu-latest' && 'GHA_Ubuntu' || 'GHA_macOS' }}
|
flags: ${{ matrix.os == 'ubuntu-latest' && 'GHA_Ubuntu' || 'GHA_macOS' }}
|
||||||
name: ${{ matrix.os }} Python ${{ matrix.python-version }}
|
name: ${{ matrix.os }} Python ${{ matrix.python-version }}
|
||||||
token: ${{ secrets.CODECOV_ORG_TOKEN }}
|
gcov: true
|
||||||
|
|
||||||
success:
|
success:
|
||||||
permissions:
|
permissions:
|
||||||
|
|
448
.github/workflows/wheels-dependencies.sh
vendored
|
@ -1,418 +1,150 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Safety check - Pillow builds require that CIBW_ARCHS is set, and that it only
|
|
||||||
# contains a single value (even though cibuildwheel allows multiple values in
|
|
||||||
# CIBW_ARCHS). This check doesn't work on Linux because of how the CIBW_ARCHS
|
|
||||||
# variable is exposed.
|
|
||||||
function check_cibw_archs {
|
|
||||||
if [[ -z "$CIBW_ARCHS" ]]; then
|
|
||||||
echo "ERROR: Pillow builds require CIBW_ARCHS be defined."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
if [[ "$CIBW_ARCHS" == *" "* ]]; then
|
|
||||||
echo "ERROR: Pillow builds only support a single architecture in CIBW_ARCHS."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Setup that needs to be done before multibuild utils are invoked. Process
|
|
||||||
# potential cross-build platforms before native platforms to ensure that we pick
|
|
||||||
# up the cross environment.
|
|
||||||
PROJECTDIR=$(pwd)
|
|
||||||
if [[ "$CIBW_PLATFORM" == "ios" ]]; then
|
|
||||||
check_cibw_archs
|
|
||||||
# On iOS, CIBW_ARCHS is actually a multi-arch - arm64_iphoneos,
|
|
||||||
# arm64_iphonesimulator or x86_64_iphonesimulator. Split into the CPU
|
|
||||||
# platform, and the iOS SDK.
|
|
||||||
PLAT=$(echo $CIBW_ARCHS | sed "s/\(.*\)_\(.*\)/\1/")
|
|
||||||
IOS_SDK=$(echo $CIBW_ARCHS | sed "s/\(.*\)_\(.*\)/\2/")
|
|
||||||
|
|
||||||
# Build iOS builds in `build/iphoneos` or `build/iphonesimulator`
|
|
||||||
# (depending on the build target). Install them into `build/deps/iphoneos`
|
|
||||||
# or `build/deps/iphonesimulator`
|
|
||||||
WORKDIR=$(pwd)/build/$IOS_SDK
|
|
||||||
BUILD_PREFIX=$(pwd)/build/deps/$IOS_SDK
|
|
||||||
PATCH_DIR=$(pwd)/patches/iOS
|
|
||||||
|
|
||||||
# GNU tooling insists on using aarch64 rather than arm64
|
|
||||||
if [[ $PLAT == "arm64" ]]; then
|
|
||||||
GNU_ARCH=aarch64
|
|
||||||
else
|
|
||||||
GNU_ARCH=x86_64
|
|
||||||
fi
|
|
||||||
|
|
||||||
IOS_SDK_PATH=$(xcrun --sdk $IOS_SDK --show-sdk-path)
|
|
||||||
CMAKE_SYSTEM_NAME=iOS
|
|
||||||
IOS_HOST_TRIPLE=$PLAT-apple-ios$IPHONEOS_DEPLOYMENT_TARGET
|
|
||||||
if [[ "$IOS_SDK" == "iphonesimulator" ]]; then
|
|
||||||
IOS_HOST_TRIPLE=$IOS_HOST_TRIPLE-simulator
|
|
||||||
fi
|
|
||||||
|
|
||||||
# GNU Autotools doesn't recognize the existence of arm64-apple-ios-simulator
|
|
||||||
# as a valid host. However, the only difference between arm64-apple-ios and
|
|
||||||
# arm64-apple-ios-simulator is the choice of sysroot, and that is
|
|
||||||
# coordinated by CC, CFLAGS etc. From the perspective of configure, the two
|
|
||||||
# platforms are identical, so we can use arm64-apple-ios consistently.
|
|
||||||
# This (mostly) avoids us needing to patch config.sub in dependency sources.
|
|
||||||
HOST_CONFIGURE_FLAGS="--disable-shared --enable-static --host=$GNU_ARCH-apple-ios --build=$GNU_ARCH-apple-darwin"
|
|
||||||
|
|
||||||
# CMake has native support for iOS. However, most of that support is based
|
|
||||||
# on using the Xcode builder, which isn't very helpful for most of Pillow's
|
|
||||||
# dependencies. Therefore, we lean on the OSX configurations, plus CC, CFLAGS
|
|
||||||
# etc. to ensure the right sysroot is selected.
|
|
||||||
HOST_CMAKE_FLAGS="-DCMAKE_SYSTEM_NAME=$CMAKE_SYSTEM_NAME -DCMAKE_SYSTEM_PROCESSOR=$GNU_ARCH -DCMAKE_OSX_DEPLOYMENT_TARGET=$IPHONEOS_DEPLOYMENT_TARGET -DCMAKE_OSX_SYSROOT=$IOS_SDK_PATH -DBUILD_SHARED_LIBS=NO -DENABLE_SHARED=NO"
|
|
||||||
|
|
||||||
# Meson needs to be pointed at a cross-platform configuration file
|
|
||||||
# This will be generated once CC etc. have been evaluated.
|
|
||||||
HOST_MESON_FLAGS="--cross-file $WORKDIR/meson-cross.txt -Dprefer_static=true -Ddefault_library=static"
|
|
||||||
|
|
||||||
elif [[ "$(uname -s)" == "Darwin" ]]; then
|
|
||||||
check_cibw_archs
|
|
||||||
# Build macOS dependencies in `build/darwin`
|
|
||||||
# Install them into `build/deps/darwin`
|
|
||||||
PLAT=$CIBW_ARCHS
|
|
||||||
WORKDIR=$(pwd)/build/darwin
|
|
||||||
BUILD_PREFIX=$(pwd)/build/deps/darwin
|
|
||||||
else
|
|
||||||
# Build prefix will default to /usr/local
|
|
||||||
PLAT="${CIBW_ARCHS:-$AUDITWHEEL_ARCH}"
|
|
||||||
WORKDIR=$(pwd)/build
|
|
||||||
MB_ML_LIBC=${AUDITWHEEL_POLICY::9}
|
|
||||||
MB_ML_VER=${AUDITWHEEL_POLICY:9}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Define custom utilities
|
# Define custom utilities
|
||||||
|
# Test for macOS with [ -n "$IS_MACOS" ]
|
||||||
|
if [ -z "$IS_MACOS" ]; then
|
||||||
|
export MB_ML_LIBC=${AUDITWHEEL_POLICY::9}
|
||||||
|
export MB_ML_VER=${AUDITWHEEL_POLICY:9}
|
||||||
|
fi
|
||||||
|
export PLAT=$CIBW_ARCHS
|
||||||
source wheels/multibuild/common_utils.sh
|
source wheels/multibuild/common_utils.sh
|
||||||
source wheels/multibuild/library_builders.sh
|
source wheels/multibuild/library_builders.sh
|
||||||
if [[ -z "$IS_MACOS" ]]; then
|
if [ -z "$IS_MACOS" ]; then
|
||||||
source wheels/multibuild/manylinux_utils.sh
|
source wheels/multibuild/manylinux_utils.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ARCHIVE_SDIR=pillow-depends-main
|
ARCHIVE_SDIR=pillow-depends-main
|
||||||
|
|
||||||
# Package versions for fresh source builds. Version numbers with "Patched"
|
# Package versions for fresh source builds
|
||||||
# annotations have a source code patch that is required for some platforms. If
|
FREETYPE_VERSION=2.13.2
|
||||||
# you change those versions, ensure the patch is also updated.
|
HARFBUZZ_VERSION=8.4.0
|
||||||
FREETYPE_VERSION=2.13.3
|
LIBPNG_VERSION=1.6.43
|
||||||
HARFBUZZ_VERSION=11.2.1
|
JPEGTURBO_VERSION=3.0.2
|
||||||
LIBPNG_VERSION=1.6.50
|
OPENJPEG_VERSION=2.5.2
|
||||||
JPEGTURBO_VERSION=3.1.1
|
XZ_VERSION=5.4.5
|
||||||
OPENJPEG_VERSION=2.5.3
|
TIFF_VERSION=4.6.0
|
||||||
XZ_VERSION=5.8.1
|
LCMS2_VERSION=2.16
|
||||||
TIFF_VERSION=4.7.0
|
if [[ -n "$IS_MACOS" ]]; then
|
||||||
LCMS2_VERSION=2.17
|
GIFLIB_VERSION=5.2.2
|
||||||
ZLIB_VERSION=1.3.1
|
else
|
||||||
ZLIB_NG_VERSION=2.2.4
|
GIFLIB_VERSION=5.2.1
|
||||||
LIBWEBP_VERSION=1.6.0
|
fi
|
||||||
|
if [[ -n "$IS_MACOS" ]] || [[ "$MB_ML_VER" != 2014 ]]; then
|
||||||
|
ZLIB_VERSION=1.3.1
|
||||||
|
else
|
||||||
|
ZLIB_VERSION=1.2.8
|
||||||
|
fi
|
||||||
|
LIBWEBP_VERSION=1.3.2
|
||||||
BZIP2_VERSION=1.0.8
|
BZIP2_VERSION=1.0.8
|
||||||
LIBXCB_VERSION=1.17.0
|
LIBXCB_VERSION=1.16.1
|
||||||
BROTLI_VERSION=1.1.0 # Patched; next release won't need patching. See patch file.
|
BROTLI_VERSION=1.1.0
|
||||||
LIBAVIF_VERSION=1.3.0
|
|
||||||
|
|
||||||
function build_pkg_config {
|
if [[ -n "$IS_MACOS" ]] && [[ "$CIBW_ARCHS" == "x86_64" ]]; then
|
||||||
if [ -e pkg-config-stamp ]; then return; fi
|
function build_openjpeg {
|
||||||
# This essentially duplicates the Homebrew recipe.
|
local out_dir=$(fetch_unpack https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz openjpeg-${OPENJPEG_VERSION}.tar.gz)
|
||||||
# On iOS, we need a binary that can be executed on the build machine; but we
|
(cd $out_dir \
|
||||||
# can create a host-specific pc-path to store iOS .pc files. To ensure a
|
&& cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \
|
||||||
# macOS-compatible build, we temporarily clear environment flags that set
|
&& make install)
|
||||||
# iOS-specific values.
|
touch openjpeg-stamp
|
||||||
if [[ -n "$IOS_SDK" ]]; then
|
}
|
||||||
ORIGINAL_HOST_CONFIGURE_FLAGS=$HOST_CONFIGURE_FLAGS
|
fi
|
||||||
ORIGINAL_IPHONEOS_DEPLOYMENT_TARGET=$IPHONEOS_DEPLOYMENT_TARGET
|
|
||||||
unset HOST_CONFIGURE_FLAGS
|
|
||||||
unset IPHONEOS_DEPLOYMENT_TARGET
|
|
||||||
fi
|
|
||||||
|
|
||||||
CFLAGS="$CFLAGS -Wno-int-conversion" CPPFLAGS="" build_simple pkg-config 0.29.2 https://pkg-config.freedesktop.org/releases tar.gz \
|
|
||||||
--disable-debug --disable-host-tool --with-internal-glib \
|
|
||||||
--with-pc-path=$BUILD_PREFIX/share/pkgconfig:$BUILD_PREFIX/lib/pkgconfig \
|
|
||||||
--with-system-include-path=$(xcrun --show-sdk-path --sdk macosx)/usr/include
|
|
||||||
|
|
||||||
if [[ -n "$IOS_SDK" ]]; then
|
|
||||||
HOST_CONFIGURE_FLAGS=$ORIGINAL_HOST_CONFIGURE_FLAGS
|
|
||||||
IPHONEOS_DEPLOYMENT_TARGET=$ORIGINAL_IPHONEOS_DEPLOYMENT_TARGET
|
|
||||||
fi;
|
|
||||||
|
|
||||||
export PKG_CONFIG=$BUILD_PREFIX/bin/pkg-config
|
|
||||||
touch pkg-config-stamp
|
|
||||||
}
|
|
||||||
|
|
||||||
function build_zlib_ng {
|
|
||||||
if [ -e zlib-stamp ]; then return; fi
|
|
||||||
# zlib-ng uses a "configure" script, but it's not a GNU autotools script, so
|
|
||||||
# it doesn't honor the usual flags. Temporarily disable any
|
|
||||||
# cross-compilation flags.
|
|
||||||
ORIGINAL_HOST_CONFIGURE_FLAGS=$HOST_CONFIGURE_FLAGS
|
|
||||||
unset HOST_CONFIGURE_FLAGS
|
|
||||||
|
|
||||||
build_github zlib-ng/zlib-ng $ZLIB_NG_VERSION --zlib-compat
|
|
||||||
|
|
||||||
HOST_CONFIGURE_FLAGS=$ORIGINAL_HOST_CONFIGURE_FLAGS
|
|
||||||
|
|
||||||
if [[ -n "$IS_MACOS" ]] && [[ -z "$IOS_SDK" ]]; then
|
|
||||||
# Ensure that on macOS, the library name is an absolute path, not an
|
|
||||||
# @rpath, so that delocate picks up the right library (and doesn't need
|
|
||||||
# DYLD_LIBRARY_PATH to be set). The default Makefile doesn't have an
|
|
||||||
# option to control the install_name. This isn't needed on iOS, as iOS
|
|
||||||
# only builds the static library.
|
|
||||||
install_name_tool -id $BUILD_PREFIX/lib/libz.1.dylib $BUILD_PREFIX/lib/libz.1.dylib
|
|
||||||
fi
|
|
||||||
touch zlib-stamp
|
|
||||||
}
|
|
||||||
|
|
||||||
function build_brotli {
|
function build_brotli {
|
||||||
if [ -e brotli-stamp ]; then return; fi
|
local cmake=$(get_modern_cmake)
|
||||||
local out_dir=$(fetch_unpack https://github.com/google/brotli/archive/v$BROTLI_VERSION.tar.gz brotli-$BROTLI_VERSION.tar.gz)
|
local out_dir=$(fetch_unpack https://github.com/google/brotli/archive/v$BROTLI_VERSION.tar.gz brotli-1.1.0.tar.gz)
|
||||||
(cd $out_dir \
|
(cd $out_dir \
|
||||||
&& cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_LIBDIR=$BUILD_PREFIX/lib -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib $HOST_CMAKE_FLAGS . \
|
&& $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \
|
||||||
&& make install)
|
&& make install)
|
||||||
touch brotli-stamp
|
if [[ "$MB_ML_LIBC" == "manylinux" ]]; then
|
||||||
}
|
cp /usr/local/lib64/libbrotli* /usr/local/lib
|
||||||
|
cp /usr/local/lib64/pkgconfig/libbrotli* /usr/local/lib/pkgconfig
|
||||||
function build_harfbuzz {
|
|
||||||
if [ -e harfbuzz-stamp ]; then return; fi
|
|
||||||
python3 -m pip install meson ninja
|
|
||||||
|
|
||||||
local out_dir=$(fetch_unpack https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION/harfbuzz-$HARFBUZZ_VERSION.tar.xz harfbuzz-$HARFBUZZ_VERSION.tar.xz)
|
|
||||||
(cd $out_dir \
|
|
||||||
&& meson setup build --prefix=$BUILD_PREFIX --libdir=$BUILD_PREFIX/lib --buildtype=minsize -Dfreetype=enabled -Dglib=disabled -Dtests=disabled $HOST_MESON_FLAGS)
|
|
||||||
(cd $out_dir/build \
|
|
||||||
&& meson install)
|
|
||||||
touch harfbuzz-stamp
|
|
||||||
}
|
|
||||||
|
|
||||||
function build_libavif {
|
|
||||||
if [ -e libavif-stamp ]; then return; fi
|
|
||||||
|
|
||||||
python3 -m pip install meson ninja
|
|
||||||
|
|
||||||
if ([[ "$PLAT" == "x86_64" ]] && [[ -z "$IOS_SDK" ]]) || [ -n "$SANITIZER" ]; then
|
|
||||||
build_simple nasm 2.16.03 https://www.nasm.us/pub/nasm/releasebuilds/2.16.03
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local build_type=MinSizeRel
|
|
||||||
local build_shared=ON
|
|
||||||
local lto=ON
|
|
||||||
|
|
||||||
local libavif_cmake_flags
|
|
||||||
|
|
||||||
if [[ -n "$IS_MACOS" ]]; then
|
|
||||||
lto=OFF
|
|
||||||
libavif_cmake_flags=(
|
|
||||||
-DCMAKE_C_FLAGS_MINSIZEREL="-Oz -DNDEBUG -flto" \
|
|
||||||
-DCMAKE_CXX_FLAGS_MINSIZEREL="-Oz -DNDEBUG -flto" \
|
|
||||||
-DCMAKE_SHARED_LINKER_FLAGS_INIT="-Wl,-S,-x,-dead_strip_dylibs" \
|
|
||||||
)
|
|
||||||
if [[ -n "$IOS_SDK" ]]; then
|
|
||||||
build_shared=OFF
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if [[ "$MB_ML_VER" == 2014 ]] && [[ "$PLAT" == "x86_64" ]]; then
|
|
||||||
build_type=Release
|
|
||||||
fi
|
|
||||||
libavif_cmake_flags=(-DCMAKE_SHARED_LINKER_FLAGS_INIT="-Wl,--strip-all,-z,relro,-z,now")
|
|
||||||
fi
|
|
||||||
if [[ -n "$IOS_SDK" ]] && [[ "$PLAT" == "x86_64" ]]; then
|
|
||||||
libavif_cmake_flags+=(-DAOM_TARGET_CPU=generic)
|
|
||||||
else
|
|
||||||
libavif_cmake_flags+=(
|
|
||||||
-DAVIF_CODEC_AOM_DECODE=OFF \
|
|
||||||
-DAVIF_CODEC_DAV1D=LOCAL
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
|
|
||||||
local out_dir=$(fetch_unpack https://github.com/AOMediaCodec/libavif/archive/refs/tags/v$LIBAVIF_VERSION.tar.gz libavif-$LIBAVIF_VERSION.tar.gz)
|
|
||||||
|
|
||||||
# CONFIG_AV1_HIGHBITDEPTH=0 is a flag for libaom (included as a subproject
|
|
||||||
# of libavif) that disables support for encoding high bit depth images.
|
|
||||||
(cd $out_dir \
|
|
||||||
&& cmake \
|
|
||||||
-DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX \
|
|
||||||
-DCMAKE_INSTALL_LIBDIR=$BUILD_PREFIX/lib \
|
|
||||||
-DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib \
|
|
||||||
-DBUILD_SHARED_LIBS=$build_shared \
|
|
||||||
-DAVIF_LIBSHARPYUV=LOCAL \
|
|
||||||
-DAVIF_LIBYUV=LOCAL \
|
|
||||||
-DAVIF_CODEC_AOM=LOCAL \
|
|
||||||
-DCONFIG_AV1_HIGHBITDEPTH=0 \
|
|
||||||
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=$lto \
|
|
||||||
-DCMAKE_C_VISIBILITY_PRESET=hidden \
|
|
||||||
-DCMAKE_CXX_VISIBILITY_PRESET=hidden \
|
|
||||||
-DCMAKE_BUILD_TYPE=$build_type \
|
|
||||||
"${libavif_cmake_flags[@]}" \
|
|
||||||
$HOST_CMAKE_FLAGS . )
|
|
||||||
|
|
||||||
if [[ -n "$IOS_SDK" ]]; then
|
|
||||||
# libavif's CMake configuration generates a meson cross file... but it
|
|
||||||
# doesn't work for iOS cross-compilation. Copy in Pillow-generated
|
|
||||||
# meson-cross config to replace the cmake-generated version.
|
|
||||||
cp $WORKDIR/meson-cross.txt $out_dir/crossfile-apple.meson
|
|
||||||
fi
|
|
||||||
|
|
||||||
(cd $out_dir && make install)
|
|
||||||
|
|
||||||
touch libavif-stamp
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function build {
|
function build {
|
||||||
|
if [[ -n "$IS_MACOS" ]] && [[ "$CIBW_ARCHS" == "arm64" ]]; then
|
||||||
|
sudo chown -R runner /usr/local
|
||||||
|
fi
|
||||||
build_xz
|
build_xz
|
||||||
if [ -z "$IS_ALPINE" ] && [ -z "$SANITIZER" ] && [ -z "$IS_MACOS" ]; then
|
if [ -z "$IS_ALPINE" ] && [ -z "$IS_MACOS" ]; then
|
||||||
yum remove -y zlib-devel
|
yum remove -y zlib-devel
|
||||||
fi
|
fi
|
||||||
if [[ -n "$IS_MACOS" ]] && [[ "$MACOSX_DEPLOYMENT_TARGET" == "10.10" || "$MACOSX_DEPLOYMENT_TARGET" == "10.13" ]]; then
|
build_new_zlib
|
||||||
build_new_zlib
|
|
||||||
else
|
|
||||||
build_zlib_ng
|
|
||||||
fi
|
|
||||||
|
|
||||||
build_simple xcb-proto 1.17.0 https://xorg.freedesktop.org/archive/individual/proto
|
build_simple xcb-proto 1.16.0 https://xorg.freedesktop.org/archive/individual/proto
|
||||||
if [[ -n "$IS_MACOS" ]]; then
|
if [ -n "$IS_MACOS" ]; then
|
||||||
build_simple xorgproto 2024.1 https://www.x.org/pub/individual/proto
|
build_simple xorgproto 2024.1 https://www.x.org/pub/individual/proto
|
||||||
build_simple libXau 1.0.12 https://www.x.org/pub/individual/lib
|
build_simple libXau 1.0.11 https://www.x.org/pub/individual/lib
|
||||||
build_simple libpthread-stubs 0.5 https://xcb.freedesktop.org/dist
|
build_simple libpthread-stubs 0.5 https://xcb.freedesktop.org/dist
|
||||||
|
if [[ "$CIBW_ARCHS" == "arm64" ]]; then
|
||||||
|
cp /usr/local/share/pkgconfig/xcb-proto.pc /usr/local/lib/pkgconfig
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
sed "s/\${pc_sysrootdir\}//" $BUILD_PREFIX/share/pkgconfig/xcb-proto.pc > $BUILD_PREFIX/lib/pkgconfig/xcb-proto.pc
|
sed s/\${pc_sysrootdir\}// /usr/local/share/pkgconfig/xcb-proto.pc > /usr/local/lib/pkgconfig/xcb-proto.pc
|
||||||
fi
|
fi
|
||||||
build_simple libxcb $LIBXCB_VERSION https://www.x.org/releases/individual/lib
|
build_simple libxcb $LIBXCB_VERSION https://www.x.org/releases/individual/lib
|
||||||
|
|
||||||
build_libjpeg_turbo
|
build_libjpeg_turbo
|
||||||
if [[ -n "$IS_MACOS" ]]; then
|
build_tiff
|
||||||
# Custom tiff build to include jpeg; by default, configure won't include
|
|
||||||
# headers/libs in the custom macOS/iOS prefix. Explicitly disable webp,
|
|
||||||
# libdeflate and zstd, because on x86_64 macs, it will pick up the
|
|
||||||
# Homebrew versions of those libraries from /usr/local.
|
|
||||||
build_simple tiff $TIFF_VERSION https://download.osgeo.org/libtiff tar.gz \
|
|
||||||
--with-jpeg-include-dir=$BUILD_PREFIX/include --with-jpeg-lib-dir=$BUILD_PREFIX/lib \
|
|
||||||
--disable-webp --disable-libdeflate --disable-zstd
|
|
||||||
else
|
|
||||||
build_tiff
|
|
||||||
fi
|
|
||||||
|
|
||||||
build_libavif
|
|
||||||
build_libpng
|
build_libpng
|
||||||
build_lcms2
|
build_lcms2
|
||||||
build_openjpeg
|
build_openjpeg
|
||||||
|
if [ -f /usr/local/lib64/libopenjp2.so ]; then
|
||||||
|
cp /usr/local/lib64/libopenjp2.so /usr/local/lib
|
||||||
|
fi
|
||||||
|
|
||||||
webp_cflags="-O3 -DNDEBUG"
|
ORIGINAL_CFLAGS=$CFLAGS
|
||||||
|
CFLAGS="$CFLAGS -O3 -DNDEBUG"
|
||||||
if [[ -n "$IS_MACOS" ]]; then
|
if [[ -n "$IS_MACOS" ]]; then
|
||||||
webp_cflags="$webp_cflags -Wl,-headerpad_max_install_names"
|
CFLAGS="$CFLAGS -Wl,-headerpad_max_install_names"
|
||||||
fi
|
fi
|
||||||
webp_ldflags=""
|
build_libwebp
|
||||||
if [[ -n "$IOS_SDK" ]]; then
|
CFLAGS=$ORIGINAL_CFLAGS
|
||||||
webp_ldflags="$webp_ldflags -llzma -lz"
|
|
||||||
fi
|
|
||||||
CFLAGS="$CFLAGS $webp_cflags" LDFLAGS="$LDFLAGS $webp_ldflags" build_simple libwebp $LIBWEBP_VERSION \
|
|
||||||
https://storage.googleapis.com/downloads.webmproject.org/releases/webp tar.gz \
|
|
||||||
--enable-libwebpmux --enable-libwebpdemux
|
|
||||||
|
|
||||||
build_brotli
|
build_brotli
|
||||||
|
|
||||||
if [[ -n "$IS_MACOS" ]]; then
|
if [ -n "$IS_MACOS" ]; then
|
||||||
# Custom freetype build
|
# Custom freetype build
|
||||||
build_simple freetype $FREETYPE_VERSION https://download.savannah.gnu.org/releases/freetype tar.gz --with-harfbuzz=no
|
build_simple freetype $FREETYPE_VERSION https://download.savannah.gnu.org/releases/freetype tar.gz --with-harfbuzz=no
|
||||||
else
|
else
|
||||||
build_freetype
|
build_freetype
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z "$IOS_SDK" ]]; then
|
if [ -z "$IS_MACOS" ]; then
|
||||||
# On iOS, there's no vendor-provided raqm, and we can't ship it due to
|
export FREETYPE_LIBS=-lfreetype
|
||||||
# licensing, so there's no point building harfbuzz.
|
export FREETYPE_CFLAGS=-I/usr/local/include/freetype2/
|
||||||
build_harfbuzz
|
fi
|
||||||
|
build_simple harfbuzz $HARFBUZZ_VERSION https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION tar.xz --with-freetype=yes --with-glib=no
|
||||||
|
if [ -z "$IS_MACOS" ]; then
|
||||||
|
export FREETYPE_LIBS=""
|
||||||
|
export FREETYPE_CFLAGS=""
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function create_meson_cross_config {
|
|
||||||
cat << EOF > $WORKDIR/meson-cross.txt
|
|
||||||
[binaries]
|
|
||||||
pkg-config = '$BUILD_PREFIX/bin/pkg-config'
|
|
||||||
cmake = '$(which cmake)'
|
|
||||||
c = '$CC'
|
|
||||||
cpp = '$CXX'
|
|
||||||
strip = '$STRIP'
|
|
||||||
|
|
||||||
[built-in options]
|
|
||||||
c_args = '$CFLAGS -I$BUILD_PREFIX/include'
|
|
||||||
cpp_args = '$CXXFLAGS -I$BUILD_PREFIX/include'
|
|
||||||
c_link_args = '$CFLAGS -L$BUILD_PREFIX/lib'
|
|
||||||
cpp_link_args = '$CFLAGS -L$BUILD_PREFIX/lib'
|
|
||||||
|
|
||||||
[host_machine]
|
|
||||||
system = 'darwin'
|
|
||||||
subsystem = 'ios'
|
|
||||||
kernel = 'xnu'
|
|
||||||
cpu_family = '$(uname -m)'
|
|
||||||
cpu = '$(uname -m)'
|
|
||||||
endian = 'little'
|
|
||||||
|
|
||||||
EOF
|
|
||||||
}
|
|
||||||
|
|
||||||
# Perform all dependency builds in the build subfolder.
|
|
||||||
mkdir -p $WORKDIR
|
|
||||||
pushd $WORKDIR > /dev/null
|
|
||||||
|
|
||||||
# Any stuff that you need to do before you start building the wheels
|
# Any stuff that you need to do before you start building the wheels
|
||||||
# Runs in the root directory of this repository.
|
# Runs in the root directory of this repository.
|
||||||
if [[ ! -d $WORKDIR/pillow-depends-main ]]; then
|
curl -fsSL -o pillow-depends-main.zip https://github.com/python-pillow/pillow-depends/archive/main.zip
|
||||||
if [[ ! -f $PROJECTDIR/pillow-depends-main.zip ]]; then
|
untar pillow-depends-main.zip
|
||||||
echo "Download pillow dependency sources..."
|
|
||||||
curl -fSL -o $PROJECTDIR/pillow-depends-main.zip https://github.com/python-pillow/pillow-depends/archive/main.zip
|
|
||||||
fi
|
|
||||||
echo "Unpacking pillow dependency sources..."
|
|
||||||
untar $PROJECTDIR/pillow-depends-main.zip
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -n "$IS_MACOS" ]]; then
|
if [[ -n "$IS_MACOS" ]]; then
|
||||||
# Ensure the basic structure of the build prefix directory exists.
|
# libtiff and libxcb cause a conflict with building libtiff and libxcb
|
||||||
mkdir -p "$BUILD_PREFIX/bin"
|
# libxau and libxdmcp cause an issue on macOS < 11
|
||||||
mkdir -p "$BUILD_PREFIX/lib"
|
# remove cairo to fix building harfbuzz on arm64
|
||||||
|
# remove lcms2 and libpng to fix building openjpeg on arm64
|
||||||
|
# remove jpeg-turbo to avoid inclusion on arm64
|
||||||
|
# remove webp and zstd to avoid inclusion on x86_64
|
||||||
|
# curl from brew requires zstd, use system curl
|
||||||
|
brew remove --ignore-dependencies libpng libtiff libxcb libxau libxdmcp curl cairo lcms2 zstd
|
||||||
|
if [[ "$CIBW_ARCHS" == "arm64" ]]; then
|
||||||
|
brew remove --ignore-dependencies jpeg-turbo
|
||||||
|
else
|
||||||
|
brew remove --ignore-dependencies webp
|
||||||
|
fi
|
||||||
|
|
||||||
# Ensure pkg-config is available. This is done *before* setting CC, CFLAGS
|
brew install pkg-config
|
||||||
# etc. to ensure that the build is *always* a macOS build, even when building
|
|
||||||
# for iOS.
|
|
||||||
build_pkg_config
|
|
||||||
|
|
||||||
# Ensure cmake is available, and that the default prefix used by CMake is
|
|
||||||
# the build prefix
|
|
||||||
python3 -m pip install cmake
|
|
||||||
export CMAKE_PREFIX_PATH=$BUILD_PREFIX
|
|
||||||
|
|
||||||
if [[ -n "$IOS_SDK" ]]; then
|
|
||||||
export AR="$(xcrun --find --sdk $IOS_SDK ar)"
|
|
||||||
export CPP="$(xcrun --find --sdk $IOS_SDK clang) -E"
|
|
||||||
export CC=$(xcrun --find --sdk $IOS_SDK clang)
|
|
||||||
export CXX=$(xcrun --find --sdk $IOS_SDK clang++)
|
|
||||||
export LD=$(xcrun --find --sdk $IOS_SDK ld)
|
|
||||||
export STRIP=$(xcrun --find --sdk $IOS_SDK strip)
|
|
||||||
|
|
||||||
CPPFLAGS="$CPPFLAGS --sysroot=$IOS_SDK_PATH"
|
|
||||||
CFLAGS="-target $IOS_HOST_TRIPLE --sysroot=$IOS_SDK_PATH -mios-version-min=$IPHONEOS_DEPLOYMENT_TARGET"
|
|
||||||
CXXFLAGS="-target $IOS_HOST_TRIPLE --sysroot=$IOS_SDK_PATH -mios-version-min=$IPHONEOS_DEPLOYMENT_TARGET"
|
|
||||||
|
|
||||||
# Having IPHONEOS_DEPLOYMENT_TARGET in the environment causes problems
|
|
||||||
# with some cross-building toolchains, because it introduces implicit
|
|
||||||
# behavior into clang.
|
|
||||||
unset IPHONEOS_DEPLOYMENT_TARGET
|
|
||||||
|
|
||||||
# Now that we know CC etc., we can create a meson cross-configuration file
|
|
||||||
create_meson_cross_config
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
wrap_wheel_builder build
|
wrap_wheel_builder build
|
||||||
|
|
||||||
# A safety catch for iOS. iOS can't use dynamic libraries, but clang will prefer
|
|
||||||
# to link dynamic libraries to static libraries. The only way to reliably
|
|
||||||
# prevent this is to not have dynamic libraries available in the first place.
|
|
||||||
# The build process *shouldn't* generate any dylibs... but just in case, purge
|
|
||||||
# any dylibs that *have* been installed into the build prefix directory.
|
|
||||||
if [[ -n "$IOS_SDK" ]]; then
|
|
||||||
find "$BUILD_PREFIX" -name "*.dylib" -exec rm -rf {} \;
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Return to the project root to finish the build
|
|
||||||
popd > /dev/null
|
|
||||||
|
|
||||||
# Append licenses
|
# Append licenses
|
||||||
for filename in wheels/dependency_licenses/*; do
|
for filename in wheels/dependency_licenses/*; do
|
||||||
echo -e "\n\n----\n\n$(basename $filename | cut -f 1 -d '.')\n" | cat >> LICENSE
|
echo -e "\n\n----\n\n$(basename $filename | cut -f 1 -d '.')\n" | cat >> LICENSE
|
||||||
|
|
14
.github/workflows/wheels-test.ps1
vendored
|
@ -9,18 +9,14 @@ if ("$venv" -like "*\cibw-run-*\pp*-win_amd64\*") {
|
||||||
C:\vc_redist.x64.exe /install /quiet /norestart | Out-Null
|
C:\vc_redist.x64.exe /install /quiet /norestart | Out-Null
|
||||||
}
|
}
|
||||||
$env:path += ";$pillow\winbuild\build\bin\"
|
$env:path += ";$pillow\winbuild\build\bin\"
|
||||||
if (Test-Path $venv\Scripts\pypy.exe) {
|
& "$venv\Scripts\activate.ps1"
|
||||||
$python = "pypy.exe"
|
|
||||||
} else {
|
|
||||||
$python = "python.exe"
|
|
||||||
}
|
|
||||||
& reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\python.exe" /v "GlobalFlag" /t REG_SZ /d "0x02000000" /f
|
& reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\python.exe" /v "GlobalFlag" /t REG_SZ /d "0x02000000" /f
|
||||||
cd $pillow
|
cd $pillow
|
||||||
& $venv\Scripts\$python -VV
|
& python -VV
|
||||||
if (!$?) { exit $LASTEXITCODE }
|
if (!$?) { exit $LASTEXITCODE }
|
||||||
& $venv\Scripts\$python selftest.py
|
& python selftest.py
|
||||||
if (!$?) { exit $LASTEXITCODE }
|
if (!$?) { exit $LASTEXITCODE }
|
||||||
& $venv\Scripts\$python -m pytest -vv -x checks\check_wheel.py
|
& python -m pytest -vx Tests\check_wheel.py
|
||||||
if (!$?) { exit $LASTEXITCODE }
|
if (!$?) { exit $LASTEXITCODE }
|
||||||
& $venv\Scripts\$python -m pytest -vv -x Tests
|
& python -m pytest -vx Tests
|
||||||
if (!$?) { exit $LASTEXITCODE }
|
if (!$?) { exit $LASTEXITCODE }
|
||||||
|
|
27
.github/workflows/wheels-test.sh
vendored
|
@ -1,29 +1,20 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
# Ensure fribidi is installed by the system.
|
|
||||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||||
# If Homebrew is on the path during the build, it may leak into the wheels.
|
brew install fribidi
|
||||||
# However, we *do* need Homebrew to provide a copy of fribidi for
|
export PKG_CONFIG_PATH="/usr/local/opt/openblas/lib/pkgconfig"
|
||||||
# testing purposes so that we can verify the fribidi shim works as expected.
|
if [ -f /opt/homebrew/lib/libfribidi.dylib ]; then
|
||||||
if [[ "$(uname -m)" == "x86_64" ]]; then
|
sudo cp /opt/homebrew/lib/libfribidi.dylib /usr/local/lib
|
||||||
HOMEBREW_PREFIX=/usr/local
|
|
||||||
else
|
|
||||||
HOMEBREW_PREFIX=/opt/homebrew
|
|
||||||
fi
|
fi
|
||||||
$HOMEBREW_PREFIX/bin/brew install fribidi
|
|
||||||
|
|
||||||
# Add the lib folder for fribidi so that the vendored library can be found.
|
|
||||||
# Don't use $HOMEWBREW_PREFIX/lib directly - use the lib folder where the
|
|
||||||
# installed copy of fribidi is cellared. This ensures we don't pick up the
|
|
||||||
# Homebrew version of any other library that we're dependent on (most notably,
|
|
||||||
# freetype).
|
|
||||||
export DYLD_LIBRARY_PATH=$(dirname $(realpath $HOMEBREW_PREFIX/lib/libfribidi.dylib))
|
|
||||||
elif [ "${AUDITWHEEL_POLICY::9}" == "musllinux" ]; then
|
elif [ "${AUDITWHEEL_POLICY::9}" == "musllinux" ]; then
|
||||||
apk add curl fribidi
|
apk add curl fribidi
|
||||||
else
|
else
|
||||||
yum install -y fribidi
|
yum install -y fribidi
|
||||||
fi
|
fi
|
||||||
|
if [ "${AUDITWHEEL_POLICY::9}" != "musllinux" ]; then
|
||||||
|
python3 -m pip install numpy
|
||||||
|
fi
|
||||||
|
|
||||||
if [ ! -d "test-images-main" ]; then
|
if [ ! -d "test-images-main" ]; then
|
||||||
curl -fsSL -o pillow-test-images.zip https://github.com/python-pillow/test-images/archive/main.zip
|
curl -fsSL -o pillow-test-images.zip https://github.com/python-pillow/test-images/archive/main.zip
|
||||||
|
@ -33,5 +24,5 @@ fi
|
||||||
|
|
||||||
# Runs tests
|
# Runs tests
|
||||||
python3 selftest.py
|
python3 selftest.py
|
||||||
python3 -m pytest -vv -x checks/check_wheel.py
|
python3 -m pytest Tests/check_wheel.py
|
||||||
python3 -m pytest -vv -x
|
python3 -m pytest
|
||||||
|
|
169
.github/workflows/wheels.yml
vendored
|
@ -1,19 +1,10 @@
|
||||||
name: Wheels
|
name: Wheels
|
||||||
|
|
||||||
on:
|
on:
|
||||||
schedule:
|
|
||||||
# ┌───────────── minute (0 - 59)
|
|
||||||
# │ ┌───────────── hour (0 - 23)
|
|
||||||
# │ │ ┌───────────── day of the month (1 - 31)
|
|
||||||
# │ │ │ ┌───────────── month (1 - 12 or JAN-DEC)
|
|
||||||
# │ │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
|
|
||||||
# │ │ │ │ │
|
|
||||||
- cron: "42 1 * * 0,3"
|
|
||||||
push:
|
push:
|
||||||
paths:
|
paths:
|
||||||
- ".ci/requirements-cibw.txt"
|
- ".ci/requirements-cibw.txt"
|
||||||
- ".github/workflows/wheel*"
|
- ".github/workflows/wheel*"
|
||||||
- "pyproject.toml"
|
|
||||||
- "setup.py"
|
- "setup.py"
|
||||||
- "wheels/*"
|
- "wheels/*"
|
||||||
- "winbuild/build_prepare.py"
|
- "winbuild/build_prepare.py"
|
||||||
|
@ -24,7 +15,6 @@ on:
|
||||||
paths:
|
paths:
|
||||||
- ".ci/requirements-cibw.txt"
|
- ".ci/requirements-cibw.txt"
|
||||||
- ".github/workflows/wheel*"
|
- ".github/workflows/wheel*"
|
||||||
- "pyproject.toml"
|
|
||||||
- "setup.py"
|
- "setup.py"
|
||||||
- "wheels/*"
|
- "wheels/*"
|
||||||
- "winbuild/build_prepare.py"
|
- "winbuild/build_prepare.py"
|
||||||
|
@ -42,73 +32,89 @@ env:
|
||||||
FORCE_COLOR: 1
|
FORCE_COLOR: 1
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-native-wheels:
|
build-1-QEMU-emulated-wheels:
|
||||||
if: github.event_name != 'schedule' || github.repository_owner == 'python-pillow'
|
name: aarch64 ${{ matrix.python-version }} ${{ matrix.spec }}
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
python-version:
|
||||||
|
- pp39
|
||||||
|
- pp310
|
||||||
|
- cp38
|
||||||
|
- cp39
|
||||||
|
- cp310
|
||||||
|
- cp311
|
||||||
|
- cp312
|
||||||
|
spec:
|
||||||
|
- manylinux2014
|
||||||
|
- manylinux_2_28
|
||||||
|
- musllinux
|
||||||
|
exclude:
|
||||||
|
- { python-version: pp39, spec: musllinux }
|
||||||
|
- { python-version: pp310, spec: musllinux }
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
submodules: true
|
||||||
|
|
||||||
|
- uses: actions/setup-python@v5
|
||||||
|
with:
|
||||||
|
python-version: "3.x"
|
||||||
|
|
||||||
|
# https://github.com/docker/setup-qemu-action
|
||||||
|
- name: Set up QEMU
|
||||||
|
uses: docker/setup-qemu-action@v3
|
||||||
|
|
||||||
|
- name: Install cibuildwheel
|
||||||
|
run: |
|
||||||
|
python3 -m pip install -r .ci/requirements-cibw.txt
|
||||||
|
|
||||||
|
- name: Build wheels
|
||||||
|
run: |
|
||||||
|
python3 -m cibuildwheel --output-dir wheelhouse
|
||||||
|
env:
|
||||||
|
# Build only the currently selected Linux architecture (so we can
|
||||||
|
# parallelise for speed).
|
||||||
|
CIBW_ARCHS: "aarch64"
|
||||||
|
# Likewise, select only one Python version per job to speed this up.
|
||||||
|
CIBW_BUILD: "${{ matrix.python-version }}-${{ matrix.spec == 'musllinux' && 'musllinux' || 'manylinux' }}*"
|
||||||
|
# Extra options for manylinux.
|
||||||
|
CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.spec }}
|
||||||
|
CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: ${{ matrix.spec }}
|
||||||
|
|
||||||
|
- uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: dist-qemu-${{ matrix.python-version }}-${{ matrix.spec }}
|
||||||
|
path: ./wheelhouse/*.whl
|
||||||
|
|
||||||
|
build-2-native-wheels:
|
||||||
name: ${{ matrix.name }}
|
name: ${{ matrix.name }}
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- name: "macOS 10.10 x86_64"
|
- name: "macOS x86_64"
|
||||||
platform: macos
|
|
||||||
os: macos-13
|
|
||||||
cibw_arch: x86_64
|
|
||||||
build: "cp3{9,10,11}*"
|
|
||||||
macosx_deployment_target: "10.10"
|
|
||||||
- name: "macOS 10.13 x86_64"
|
|
||||||
platform: macos
|
|
||||||
os: macos-13
|
|
||||||
cibw_arch: x86_64
|
|
||||||
build: "cp3{12,13,14}*"
|
|
||||||
macosx_deployment_target: "10.13"
|
|
||||||
- name: "macOS 10.15 x86_64"
|
|
||||||
platform: macos
|
|
||||||
os: macos-13
|
|
||||||
cibw_arch: x86_64
|
|
||||||
build: "pp3*"
|
|
||||||
macosx_deployment_target: "10.15"
|
|
||||||
- name: "macOS arm64"
|
|
||||||
platform: macos
|
|
||||||
os: macos-latest
|
os: macos-latest
|
||||||
|
cibw_arch: x86_64
|
||||||
|
macosx_deployment_target: "10.10"
|
||||||
|
- name: "macOS arm64"
|
||||||
|
os: macos-14
|
||||||
cibw_arch: arm64
|
cibw_arch: arm64
|
||||||
macosx_deployment_target: "11.0"
|
macosx_deployment_target: "11.0"
|
||||||
- name: "manylinux2014 and musllinux x86_64"
|
- name: "manylinux2014 and musllinux x86_64"
|
||||||
platform: linux
|
|
||||||
os: ubuntu-latest
|
os: ubuntu-latest
|
||||||
cibw_arch: x86_64
|
cibw_arch: x86_64
|
||||||
manylinux: "manylinux2014"
|
|
||||||
- name: "manylinux_2_28 x86_64"
|
- name: "manylinux_2_28 x86_64"
|
||||||
platform: linux
|
|
||||||
os: ubuntu-latest
|
os: ubuntu-latest
|
||||||
cibw_arch: x86_64
|
cibw_arch: x86_64
|
||||||
build: "*manylinux*"
|
build: "*manylinux*"
|
||||||
- name: "manylinux2014 and musllinux aarch64"
|
manylinux: "manylinux_2_28"
|
||||||
platform: linux
|
|
||||||
os: ubuntu-24.04-arm
|
|
||||||
cibw_arch: aarch64
|
|
||||||
manylinux: "manylinux2014"
|
|
||||||
- name: "manylinux_2_28 aarch64"
|
|
||||||
platform: linux
|
|
||||||
os: ubuntu-24.04-arm
|
|
||||||
cibw_arch: aarch64
|
|
||||||
build: "*manylinux*"
|
|
||||||
- name: "iOS arm64 device"
|
|
||||||
platform: ios
|
|
||||||
os: macos-latest
|
|
||||||
cibw_arch: arm64_iphoneos
|
|
||||||
- name: "iOS arm64 simulator"
|
|
||||||
platform: ios
|
|
||||||
os: macos-latest
|
|
||||||
cibw_arch: arm64_iphonesimulator
|
|
||||||
- name: "iOS x86_64 simulator"
|
|
||||||
platform: ios
|
|
||||||
os: macos-13
|
|
||||||
cibw_arch: x86_64_iphonesimulator
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
persist-credentials: false
|
|
||||||
submodules: true
|
submodules: true
|
||||||
|
|
||||||
- uses: actions/setup-python@v5
|
- uses: actions/setup-python@v5
|
||||||
|
@ -123,44 +129,35 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
python3 -m cibuildwheel --output-dir wheelhouse
|
python3 -m cibuildwheel --output-dir wheelhouse
|
||||||
env:
|
env:
|
||||||
CIBW_PLATFORM: ${{ matrix.platform }}
|
|
||||||
CIBW_ARCHS: ${{ matrix.cibw_arch }}
|
CIBW_ARCHS: ${{ matrix.cibw_arch }}
|
||||||
CIBW_BUILD: ${{ matrix.build }}
|
CIBW_BUILD: ${{ matrix.build }}
|
||||||
CIBW_ENABLE: cpython-prerelease cpython-freethreading pypy
|
|
||||||
CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.manylinux }}
|
|
||||||
CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: ${{ matrix.manylinux }}
|
|
||||||
CIBW_MANYLINUX_PYPY_X86_64_IMAGE: ${{ matrix.manylinux }}
|
CIBW_MANYLINUX_PYPY_X86_64_IMAGE: ${{ matrix.manylinux }}
|
||||||
CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux }}
|
CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux }}
|
||||||
|
CIBW_SKIP: pp38-*
|
||||||
|
CIBW_TEST_SKIP: cp38-macosx_arm64
|
||||||
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }}
|
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }}
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v4
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: dist-${{ matrix.name }}
|
name: dist-${{ matrix.os }}-${{ matrix.cibw_arch }}${{ matrix.manylinux && format('-{0}', matrix.manylinux) }}
|
||||||
path: ./wheelhouse/*.whl
|
path: ./wheelhouse/*.whl
|
||||||
|
|
||||||
windows:
|
windows:
|
||||||
if: github.event_name != 'schedule' || github.repository_owner == 'python-pillow'
|
|
||||||
name: Windows ${{ matrix.cibw_arch }}
|
name: Windows ${{ matrix.cibw_arch }}
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: windows-latest
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- cibw_arch: x86
|
- cibw_arch: x86
|
||||||
os: windows-latest
|
|
||||||
- cibw_arch: AMD64
|
- cibw_arch: AMD64
|
||||||
os: windows-latest
|
|
||||||
- cibw_arch: ARM64
|
- cibw_arch: ARM64
|
||||||
os: windows-11-arm
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
|
||||||
persist-credentials: false
|
|
||||||
|
|
||||||
- name: Checkout extra test images
|
- name: Checkout extra test images
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
persist-credentials: false
|
|
||||||
repository: python-pillow/test-images
|
repository: python-pillow/test-images
|
||||||
path: Tests\test-images
|
path: Tests\test-images
|
||||||
|
|
||||||
|
@ -207,7 +204,7 @@ jobs:
|
||||||
CIBW_ARCHS: ${{ matrix.cibw_arch }}
|
CIBW_ARCHS: ${{ matrix.cibw_arch }}
|
||||||
CIBW_BEFORE_ALL: "{package}\\winbuild\\build\\build_dep_all.cmd"
|
CIBW_BEFORE_ALL: "{package}\\winbuild\\build\\build_dep_all.cmd"
|
||||||
CIBW_CACHE_PATH: "C:\\cibw"
|
CIBW_CACHE_PATH: "C:\\cibw"
|
||||||
CIBW_ENABLE: cpython-prerelease cpython-freethreading pypy
|
CIBW_SKIP: pp38-*
|
||||||
CIBW_TEST_SKIP: "*-win_arm64"
|
CIBW_TEST_SKIP: "*-win_arm64"
|
||||||
CIBW_TEST_COMMAND: 'docker run --rm
|
CIBW_TEST_COMMAND: 'docker run --rm
|
||||||
-v {project}:C:\pillow
|
-v {project}:C:\pillow
|
||||||
|
@ -231,17 +228,16 @@ jobs:
|
||||||
path: winbuild\build\bin\fribidi*
|
path: winbuild\build\bin\fribidi*
|
||||||
|
|
||||||
sdist:
|
sdist:
|
||||||
if: github.event_name != 'schedule'
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
|
||||||
persist-credentials: false
|
|
||||||
|
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: "3.x"
|
python-version: "3.x"
|
||||||
|
cache: pip
|
||||||
|
cache-dependency-path: "Makefile"
|
||||||
|
|
||||||
- run: make sdist
|
- run: make sdist
|
||||||
|
|
||||||
|
@ -250,26 +246,9 @@ jobs:
|
||||||
name: dist-sdist
|
name: dist-sdist
|
||||||
path: dist/*.tar.gz
|
path: dist/*.tar.gz
|
||||||
|
|
||||||
scientific-python-nightly-wheels-publish:
|
|
||||||
if: github.repository_owner == 'python-pillow' && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
|
|
||||||
needs: [build-native-wheels, windows]
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
name: Upload wheels to scientific-python-nightly-wheels
|
|
||||||
steps:
|
|
||||||
- uses: actions/download-artifact@v4
|
|
||||||
with:
|
|
||||||
pattern: dist-*
|
|
||||||
path: dist
|
|
||||||
merge-multiple: true
|
|
||||||
- name: Upload wheels to scientific-python-nightly-wheels
|
|
||||||
uses: scientific-python/upload-nightly-action@b36e8c0c10dbcfd2e05bf95f17ef8c14fd708dbf # 0.6.2
|
|
||||||
with:
|
|
||||||
artifacts_path: dist
|
|
||||||
anaconda_nightly_upload_token: ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }}
|
|
||||||
|
|
||||||
pypi-publish:
|
pypi-publish:
|
||||||
if: github.repository_owner == 'python-pillow' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
|
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
|
||||||
needs: [build-native-wheels, windows, sdist]
|
needs: [build-1-QEMU-emulated-wheels, build-2-native-wheels, windows, sdist]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
name: Upload release to PyPI
|
name: Upload release to PyPI
|
||||||
environment:
|
environment:
|
||||||
|
@ -285,5 +264,3 @@ jobs:
|
||||||
merge-multiple: true
|
merge-multiple: true
|
||||||
- name: Publish to PyPI
|
- name: Publish to PyPI
|
||||||
uses: pypa/gh-action-pypi-publish@release/v1
|
uses: pypa/gh-action-pypi-publish@release/v1
|
||||||
with:
|
|
||||||
attestations: true
|
|
||||||
|
|
7
.github/zizmor.yml
vendored
|
@ -1,7 +0,0 @@
|
||||||
# Configuration for the zizmor static analysis tool, run via pre-commit in CI
|
|
||||||
# https://woodruffw.github.io/zizmor/configuration/
|
|
||||||
rules:
|
|
||||||
unpinned-uses:
|
|
||||||
config:
|
|
||||||
policies:
|
|
||||||
"*": ref-pin
|
|
5
.gitignore
vendored
|
@ -19,7 +19,6 @@ lib64/
|
||||||
parts/
|
parts/
|
||||||
sdist/
|
sdist/
|
||||||
var/
|
var/
|
||||||
wheelhouse/
|
|
||||||
*.egg-info/
|
*.egg-info/
|
||||||
.installed.cfg
|
.installed.cfg
|
||||||
*.egg
|
*.egg
|
||||||
|
@ -91,9 +90,5 @@ Tests/images/msp
|
||||||
Tests/images/picins
|
Tests/images/picins
|
||||||
Tests/images/sunraster
|
Tests/images/sunraster
|
||||||
|
|
||||||
# Test and dependency downloads
|
|
||||||
pillow-depends-main.zip
|
|
||||||
pillow-test-images.zip
|
|
||||||
|
|
||||||
# pyinstaller
|
# pyinstaller
|
||||||
*.spec
|
*.spec
|
||||||
|
|
|
@ -1,34 +1,27 @@
|
||||||
repos:
|
repos:
|
||||||
- repo: https://github.com/astral-sh/ruff-pre-commit
|
- repo: https://github.com/astral-sh/ruff-pre-commit
|
||||||
rev: v0.12.2
|
rev: v0.2.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: ruff-check
|
- id: ruff
|
||||||
args: [--exit-non-zero-on-fix]
|
args: [--fix, --exit-non-zero-on-fix]
|
||||||
|
|
||||||
- repo: https://github.com/psf/black-pre-commit-mirror
|
- repo: https://github.com/psf/black-pre-commit-mirror
|
||||||
rev: 25.1.0
|
rev: 24.1.1
|
||||||
hooks:
|
hooks:
|
||||||
- id: black
|
- id: black
|
||||||
|
|
||||||
- repo: https://github.com/PyCQA/bandit
|
- repo: https://github.com/PyCQA/bandit
|
||||||
rev: 1.8.6
|
rev: 1.7.7
|
||||||
hooks:
|
hooks:
|
||||||
- id: bandit
|
- id: bandit
|
||||||
args: [--severity-level=high]
|
args: [--severity-level=high]
|
||||||
files: ^src/
|
files: ^src/
|
||||||
|
|
||||||
- repo: https://github.com/Lucas-C/pre-commit-hooks
|
- repo: https://github.com/Lucas-C/pre-commit-hooks
|
||||||
rev: v1.5.5
|
rev: v1.5.4
|
||||||
hooks:
|
hooks:
|
||||||
- id: remove-tabs
|
- id: remove-tabs
|
||||||
exclude: (Makefile$|\.bat$|\.cmake$|\.eps$|\.fits$|\.gd$|\.opt$|\.patch$)
|
exclude: (Makefile$|\.bat$|\.cmake$|\.eps$|\.fits$|\.gd$|\.opt$)
|
||||||
|
|
||||||
- repo: https://github.com/pre-commit/mirrors-clang-format
|
|
||||||
rev: v20.1.7
|
|
||||||
hooks:
|
|
||||||
- id: clang-format
|
|
||||||
types: [c]
|
|
||||||
exclude: ^src/thirdparty/
|
|
||||||
|
|
||||||
- repo: https://github.com/pre-commit/pygrep-hooks
|
- repo: https://github.com/pre-commit/pygrep-hooks
|
||||||
rev: v1.10.0
|
rev: v1.10.0
|
||||||
|
@ -36,7 +29,7 @@ repos:
|
||||||
- id: rst-backticks
|
- id: rst-backticks
|
||||||
|
|
||||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||||
rev: v5.0.0
|
rev: v4.5.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: check-executables-have-shebangs
|
- id: check-executables-have-shebangs
|
||||||
- id: check-shebang-scripts-are-executable
|
- id: check-shebang-scripts-are-executable
|
||||||
|
@ -44,49 +37,30 @@ repos:
|
||||||
- id: check-json
|
- id: check-json
|
||||||
- id: check-toml
|
- id: check-toml
|
||||||
- id: check-yaml
|
- id: check-yaml
|
||||||
args: [--allow-multiple-documents]
|
|
||||||
- id: end-of-file-fixer
|
- id: end-of-file-fixer
|
||||||
exclude: ^Tests/images/|\.patch$
|
exclude: ^Tests/images/
|
||||||
- id: trailing-whitespace
|
- id: trailing-whitespace
|
||||||
exclude: ^.github/.*TEMPLATE|^Tests/(fonts|images)/|\.patch$
|
exclude: ^.github/.*TEMPLATE|^Tests/(fonts|images)/
|
||||||
|
|
||||||
- repo: https://github.com/python-jsonschema/check-jsonschema
|
|
||||||
rev: 0.33.2
|
|
||||||
hooks:
|
|
||||||
- id: check-github-workflows
|
|
||||||
- id: check-readthedocs
|
|
||||||
- id: check-renovate
|
|
||||||
|
|
||||||
- repo: https://github.com/woodruffw/zizmor-pre-commit
|
|
||||||
rev: v1.11.0
|
|
||||||
hooks:
|
|
||||||
- id: zizmor
|
|
||||||
|
|
||||||
- repo: https://github.com/sphinx-contrib/sphinx-lint
|
- repo: https://github.com/sphinx-contrib/sphinx-lint
|
||||||
rev: v1.0.0
|
rev: v0.9.1
|
||||||
hooks:
|
hooks:
|
||||||
- id: sphinx-lint
|
- id: sphinx-lint
|
||||||
|
|
||||||
- repo: https://github.com/tox-dev/pyproject-fmt
|
- repo: https://github.com/tox-dev/pyproject-fmt
|
||||||
rev: v2.6.0
|
rev: 1.7.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: pyproject-fmt
|
- id: pyproject-fmt
|
||||||
|
|
||||||
- repo: https://github.com/abravalheri/validate-pyproject
|
- repo: https://github.com/abravalheri/validate-pyproject
|
||||||
rev: v0.24.1
|
rev: v0.16
|
||||||
hooks:
|
hooks:
|
||||||
- id: validate-pyproject
|
- id: validate-pyproject
|
||||||
additional_dependencies: [trove-classifiers>=2024.10.12]
|
|
||||||
|
|
||||||
- repo: https://github.com/tox-dev/tox-ini-fmt
|
- repo: https://github.com/tox-dev/tox-ini-fmt
|
||||||
rev: 1.5.0
|
rev: 1.3.1
|
||||||
hooks:
|
hooks:
|
||||||
- id: tox-ini-fmt
|
- id: tox-ini-fmt
|
||||||
|
|
||||||
- repo: meta
|
|
||||||
hooks:
|
|
||||||
- id: check-hooks-apply
|
|
||||||
- id: check-useless-excludes
|
|
||||||
|
|
||||||
ci:
|
ci:
|
||||||
autoupdate_schedule: monthly
|
autoupdate_schedule: monthly
|
||||||
|
|
|
@ -1,18 +1,11 @@
|
||||||
version: 2
|
version: 2
|
||||||
|
|
||||||
sphinx:
|
|
||||||
configuration: docs/conf.py
|
|
||||||
|
|
||||||
formats: [pdf]
|
formats: [pdf]
|
||||||
|
|
||||||
build:
|
build:
|
||||||
os: ubuntu-lts-latest
|
os: ubuntu-22.04
|
||||||
tools:
|
tools:
|
||||||
python: "3"
|
python: "3"
|
||||||
jobs:
|
|
||||||
post_checkout:
|
|
||||||
- git remote add upstream https://github.com/python-pillow/Pillow.git # For forks
|
|
||||||
- git fetch upstream --tags
|
|
||||||
|
|
||||||
python:
|
python:
|
||||||
install:
|
install:
|
||||||
|
|
292
CHANGES.rst
|
@ -2,298 +2,6 @@
|
||||||
Changelog (Pillow)
|
Changelog (Pillow)
|
||||||
==================
|
==================
|
||||||
|
|
||||||
11.1.0 and newer
|
|
||||||
----------------
|
|
||||||
|
|
||||||
See GitHub Releases:
|
|
||||||
|
|
||||||
- https://github.com/python-pillow/Pillow/releases
|
|
||||||
|
|
||||||
11.0.0 (2024-10-15)
|
|
||||||
-------------------
|
|
||||||
|
|
||||||
- Update licence to MIT-CMU #8460
|
|
||||||
[hugovk]
|
|
||||||
|
|
||||||
- Conditionally define ImageCms type hint to avoid requiring core #8197
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Support writing LONG8 offsets in AppendingTiffWriter #8417
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Use ImageFile.MAXBLOCK when saving TIFF images #8461
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Do not close provided file handles with libtiff when saving #8458
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Support ImageFilter.BuiltinFilter for I;16* images #8438
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Use ImagingCore.ptr instead of ImagingCore.id #8341
|
|
||||||
[homm, radarhere, hugovk]
|
|
||||||
|
|
||||||
- Updated EPS mode when opening images without transparency #8281
|
|
||||||
[Yay295, radarhere]
|
|
||||||
|
|
||||||
- Use transparency when combining P frames from APNGs #8443
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Support all resampling filters when resizing I;16* images #8422
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Free memory on early return #8413
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Cast int before potentially exceeding INT_MAX #8402
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Check image value before use #8400
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Improved copying imagequant libraries #8420
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Use Capsule for WebP saving #8386
|
|
||||||
[homm, radarhere]
|
|
||||||
|
|
||||||
- Fixed writing multiple StripOffsets to TIFF #8317
|
|
||||||
[Yay295, radarhere]
|
|
||||||
|
|
||||||
- Fix dereference before checking for NULL in ImagingTransformAffine #8398
|
|
||||||
[PavlNekrasov]
|
|
||||||
|
|
||||||
- Use transposed size after opening for TIFF images #8390
|
|
||||||
[radarhere, homm]
|
|
||||||
|
|
||||||
- Improve ImageFont error messages #8338
|
|
||||||
[yngvem, radarhere, hugovk]
|
|
||||||
|
|
||||||
- Mention MAX_TEXT_CHUNK limit in PNG error message #8391
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Cast Dib handle to int #8385
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Accept float stroke widths #8369
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Deprecate ICNS (width, height, scale) sizes in favour of load(scale) #8352
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Improved handling of RGBA palettes when saving GIF images #8366
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Deprecate isImageType #8364
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Support converting more modes to LAB by converting to RGBA first #8358
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Deprecate support for FreeType 2.9.0 #8356
|
|
||||||
[hugovk, radarhere]
|
|
||||||
|
|
||||||
- Removed unused TiffImagePlugin IFD_LEGACY_API #8355
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Handle duplicate EXIF header #8350
|
|
||||||
[zakajd, radarhere]
|
|
||||||
|
|
||||||
- Return early from BoxBlur if either width or height is zero #8347
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Check text is either string or bytes #8308
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Added writing XMP bytes to JPEG #8286
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Support JPEG2000 RGBA palettes #8256
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Expand C image to match GIF frame image size #8237
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Allow saving I;16 images as PPM #8231
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- When IFD is missing, connect get_ifd() dictionary to Exif #8230
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Skip truncated ICO mask if LOAD_TRUNCATED_IMAGES is enabled #8180
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Treat unknown JPEG2000 colorspace as unspecified #8343
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Updated error message when saving WebP with invalid width or height #8322
|
|
||||||
[radarhere, hugovk]
|
|
||||||
|
|
||||||
- Remove warning if NumPy failed to raise an error during conversion #8326
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- If left and right sides meet in ImageDraw.rounded_rectangle(), do not draw rectangle to fill gap #8304
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Remove WebP support without anim, mux/demux, and with buggy alpha #8213
|
|
||||||
[homm, radarhere]
|
|
||||||
|
|
||||||
- Add missing TIFF CMYK;16B reader #8298
|
|
||||||
[homm]
|
|
||||||
|
|
||||||
- Remove all WITH_* flags from _imaging.c and other flags #8211
|
|
||||||
[homm]
|
|
||||||
|
|
||||||
- Improve ImageDraw2 shape methods #8265
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Lock around usages of imaging memory arenas #8238
|
|
||||||
[lysnikolaou]
|
|
||||||
|
|
||||||
- Deprecate JpegImageFile huffman_ac and huffman_dc #8274
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Deprecate ImageMath lambda_eval and unsafe_eval options argument #8242
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Changed ContainerIO to subclass IO #8240
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Move away from APIs that use borrowed references under the free-threaded build #8216
|
|
||||||
[hugovk, lysnikolaou]
|
|
||||||
|
|
||||||
- Allow size argument to resize() to be a NumPy array #8201
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Drop support for Python 3.8 #8183
|
|
||||||
[hugovk, radarhere]
|
|
||||||
|
|
||||||
- Add support for Python 3.13 #8181
|
|
||||||
[hugovk, radarhere]
|
|
||||||
|
|
||||||
- Fix incompatibility with NumPy 1.20 #8187
|
|
||||||
[neutrinoceros, radarhere]
|
|
||||||
|
|
||||||
- Remove PSFile, PyAccess and USE_CFFI_ACCESS #8182
|
|
||||||
[hugovk, radarhere]
|
|
||||||
|
|
||||||
10.4.0 (2024-07-01)
|
|
||||||
-------------------
|
|
||||||
|
|
||||||
- Raise FileNotFoundError if show_file() path does not exist #8178
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Improved reading 16-bit TGA images with colour #7965
|
|
||||||
[Yay295, radarhere]
|
|
||||||
|
|
||||||
- Deprecate non-image ImageCms modes #8031
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Fixed processing multiple JPEG EXIF markers #8127
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Do not preserve EXIFIFD tag by default when saving TIFF images #8110
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Added ImageFont.load_default_imagefont() #8086
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Added Image.WARN_POSSIBLE_FORMATS #8063
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Remove zero-byte end padding when parsing any XMP data #8171
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Do not detect Ultra HDR images as MPO #8056
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Raise SyntaxError specific to JP2 #8146
|
|
||||||
[Yay295, radarhere]
|
|
||||||
|
|
||||||
- Do not use first frame duration for other frames when saving APNG images #8104
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Consider I;16 pixel size when using a 1 mode mask #8112
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- When saving multiple PNG frames, convert to mode rather than raw mode #8087
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Added byte support to FreeTypeFont #8141
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Allow float center for rotate operations #8114
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Do not read layers immediately when opening PSD images #8039
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Restore original thread state #8065
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Read IM and TIFF images as RGB, rather than RGBX #7997
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Only preserve TIFF IPTC_NAA_CHUNK tag if type is BYTE or UNDEFINED #7948
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Clarify ImageDraw2 error message when size is missing #8165
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Support unpacking more rawmodes to RGBA palettes #7966
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Removed support for Qt 5 #8159
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Improve ``ImageFont.freetype`` support for XDG directories on Linux #8135
|
|
||||||
[mamg22, radarhere]
|
|
||||||
|
|
||||||
- Improved consistency of XMP handling #8069
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Use pkg-config to help find libwebp and raqm #8142
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Accept 't' suffix for libtiff version #8126, #8129
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Deprecate ImageDraw.getdraw hints parameter #8124
|
|
||||||
[radarhere, hugovk]
|
|
||||||
|
|
||||||
- Added ImageDraw circle() #8085
|
|
||||||
[void4, hugovk, radarhere]
|
|
||||||
|
|
||||||
- Add mypy target to Makefile #8077
|
|
||||||
[Yay295]
|
|
||||||
|
|
||||||
- Added more modes to Image.MODES #7984
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Deprecate BGR;15, BGR;16 and BGR;24 modes #7978
|
|
||||||
[radarhere, hugovk]
|
|
||||||
|
|
||||||
- Fix ImagingAccess for I;16N on big-endian #7921
|
|
||||||
[Yay295, radarhere]
|
|
||||||
|
|
||||||
- Support reading P mode TIFF images with padding #7996
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Deprecate support for libtiff < 4 #7998
|
|
||||||
[radarhere, hugovk]
|
|
||||||
|
|
||||||
- Corrected ImageShow UnixViewer command #7987
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
- Use functools.cached_property in ImageStat #7952
|
|
||||||
[nulano, hugovk, radarhere]
|
|
||||||
|
|
||||||
- Add support for reading BITMAPV2INFOHEADER and BITMAPV3INFOHEADER #7956
|
|
||||||
[Cirras, radarhere]
|
|
||||||
|
|
||||||
- Support reading CMYK JPEG2000 images #7947
|
|
||||||
[radarhere]
|
|
||||||
|
|
||||||
10.3.0 (2024-04-01)
|
10.3.0 (2024-04-01)
|
||||||
-------------------
|
-------------------
|
||||||
|
|
||||||
|
|
4
LICENSE
|
@ -5,9 +5,9 @@ The Python Imaging Library (PIL) is
|
||||||
|
|
||||||
Pillow is the friendly PIL fork. It is
|
Pillow is the friendly PIL fork. It is
|
||||||
|
|
||||||
Copyright © 2010 by Jeffrey A. Clark and contributors
|
Copyright © 2010-2024 by Jeffrey A. Clark and contributors
|
||||||
|
|
||||||
Like PIL, Pillow is licensed under the open source MIT-CMU License:
|
Like PIL, Pillow is licensed under the open source HPND License:
|
||||||
|
|
||||||
By obtaining, using, and/or copying this software and/or its associated
|
By obtaining, using, and/or copying this software and/or its associated
|
||||||
documentation, you agree that you have read, understood, and will comply
|
documentation, you agree that you have read, understood, and will comply
|
||||||
|
|
15
MANIFEST.in
|
@ -13,9 +13,6 @@ include LICENSE
|
||||||
include Makefile
|
include Makefile
|
||||||
include tox.ini
|
include tox.ini
|
||||||
graft Tests
|
graft Tests
|
||||||
graft Tests/images
|
|
||||||
graft checks
|
|
||||||
graft patches
|
|
||||||
graft src
|
graft src
|
||||||
graft depends
|
graft depends
|
||||||
graft winbuild
|
graft winbuild
|
||||||
|
@ -23,25 +20,15 @@ graft docs
|
||||||
graft _custom_build
|
graft _custom_build
|
||||||
|
|
||||||
# build/src control detritus
|
# build/src control detritus
|
||||||
|
exclude .appveyor.yml
|
||||||
exclude .clang-format
|
exclude .clang-format
|
||||||
exclude .coveragerc
|
exclude .coveragerc
|
||||||
exclude .editorconfig
|
exclude .editorconfig
|
||||||
exclude .readthedocs.yml
|
exclude .readthedocs.yml
|
||||||
exclude codecov.yml
|
exclude codecov.yml
|
||||||
exclude renovate.json
|
exclude renovate.json
|
||||||
exclude Tests/images/README.md
|
|
||||||
exclude Tests/images/crash*.tif
|
|
||||||
exclude Tests/images/string_dimension.tiff
|
|
||||||
global-exclude .git*
|
global-exclude .git*
|
||||||
global-exclude *.pyc
|
global-exclude *.pyc
|
||||||
global-exclude *.so
|
global-exclude *.so
|
||||||
prune .ci
|
prune .ci
|
||||||
prune wheels
|
prune wheels
|
||||||
prune winbuild/build
|
|
||||||
prune winbuild/depends
|
|
||||||
prune Tests/errors
|
|
||||||
prune Tests/images/jpeg2000
|
|
||||||
prune Tests/images/msp
|
|
||||||
prune Tests/images/picins
|
|
||||||
prune Tests/images/sunraster
|
|
||||||
prune Tests/test-images
|
|
||||||
|
|
35
Makefile
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
clean:
|
clean:
|
||||||
|
python3 setup.py clean
|
||||||
rm src/PIL/*.so || true
|
rm src/PIL/*.so || true
|
||||||
rm -r build || true
|
rm -r build || true
|
||||||
find . -name __pycache__ | xargs rm -r || true
|
find . -name __pycache__ | xargs rm -r || true
|
||||||
|
@ -17,16 +18,14 @@ coverage:
|
||||||
.PHONY: doc
|
.PHONY: doc
|
||||||
.PHONY: html
|
.PHONY: html
|
||||||
doc html:
|
doc html:
|
||||||
|
python3 -c "import PIL" > /dev/null 2>&1 || python3 -m pip install .
|
||||||
$(MAKE) -C docs html
|
$(MAKE) -C docs html
|
||||||
|
|
||||||
.PHONY: htmlview
|
.PHONY: htmlview
|
||||||
htmlview:
|
htmlview:
|
||||||
|
python3 -c "import PIL" > /dev/null 2>&1 || python3 -m pip install .
|
||||||
$(MAKE) -C docs htmlview
|
$(MAKE) -C docs htmlview
|
||||||
|
|
||||||
.PHONY: htmllive
|
|
||||||
htmllive:
|
|
||||||
$(MAKE) -C docs htmllive
|
|
||||||
|
|
||||||
.PHONY: doccheck
|
.PHONY: doccheck
|
||||||
doccheck:
|
doccheck:
|
||||||
$(MAKE) doc
|
$(MAKE) doc
|
||||||
|
@ -47,7 +46,6 @@ help:
|
||||||
@echo " docserve run an HTTP server on the docs directory"
|
@echo " docserve run an HTTP server on the docs directory"
|
||||||
@echo " html make HTML docs"
|
@echo " html make HTML docs"
|
||||||
@echo " htmlview open the index page built by the html target in your browser"
|
@echo " htmlview open the index page built by the html target in your browser"
|
||||||
@echo " htmllive rebuild and reload HTML files in your browser"
|
|
||||||
@echo " install make and install"
|
@echo " install make and install"
|
||||||
@echo " install-coverage make and install with C coverage"
|
@echo " install-coverage make and install with C coverage"
|
||||||
@echo " lint run the lint checks"
|
@echo " lint run the lint checks"
|
||||||
|
@ -75,11 +73,13 @@ debug:
|
||||||
|
|
||||||
.PHONY: release-test
|
.PHONY: release-test
|
||||||
release-test:
|
release-test:
|
||||||
python3 checks/check_release_notes.py
|
python3 Tests/check_release_notes.py
|
||||||
python3 -m pip install -e .[tests]
|
python3 -m pip install -e .[tests]
|
||||||
python3 selftest.py
|
python3 selftest.py
|
||||||
python3 -m pytest Tests
|
python3 -m pytest Tests
|
||||||
python3 -m pip install .
|
python3 -m pip install .
|
||||||
|
-rm dist/*.egg
|
||||||
|
-rmdir dist
|
||||||
python3 -m pytest -qq
|
python3 -m pytest -qq
|
||||||
python3 -m check_manifest
|
python3 -m check_manifest
|
||||||
python3 -m pyroma .
|
python3 -m pyroma .
|
||||||
|
@ -97,27 +97,13 @@ test:
|
||||||
python3 -c "import pytest" > /dev/null 2>&1 || python3 -m pip install pytest
|
python3 -c "import pytest" > /dev/null 2>&1 || python3 -m pip install pytest
|
||||||
python3 -m pytest -qq
|
python3 -m pytest -qq
|
||||||
|
|
||||||
.PHONY: test-p
|
|
||||||
test-p:
|
|
||||||
python3 -c "import xdist" > /dev/null 2>&1 || python3 -m pip install pytest-xdist
|
|
||||||
python3 -m pytest -qq -n auto
|
|
||||||
|
|
||||||
|
|
||||||
.PHONY: valgrind
|
.PHONY: valgrind
|
||||||
valgrind:
|
valgrind:
|
||||||
python3 -c "import pytest_valgrind" > /dev/null 2>&1 || python3 -m pip install pytest-valgrind
|
python3 -c "import pytest_valgrind" > /dev/null 2>&1 || python3 -m pip install pytest-valgrind
|
||||||
PILLOW_VALGRIND_TEST=true PYTHONMALLOC=malloc valgrind --suppressions=Tests/oss-fuzz/python.supp --leak-check=no \
|
PYTHONMALLOC=malloc valgrind --suppressions=Tests/oss-fuzz/python.supp --leak-check=no \
|
||||||
--log-file=/tmp/valgrind-output \
|
--log-file=/tmp/valgrind-output \
|
||||||
python3 -m pytest --no-memcheck -vv --valgrind --valgrind-log=/tmp/valgrind-output
|
python3 -m pytest --no-memcheck -vv --valgrind --valgrind-log=/tmp/valgrind-output
|
||||||
|
|
||||||
.PHONY: valgrind-leak
|
|
||||||
valgrind-leak:
|
|
||||||
python3 -c "import pytest_valgrind" > /dev/null 2>&1 || python3 -m pip install pytest-valgrind
|
|
||||||
PILLOW_VALGRIND_TEST=true PYTHONMALLOC=malloc valgrind --suppressions=Tests/oss-fuzz/python.supp \
|
|
||||||
--leak-check=full --show-leak-kinds=definite --errors-for-leak-kinds=definite \
|
|
||||||
--log-file=/tmp/valgrind-output \
|
|
||||||
python3 -m pytest -vv --valgrind --valgrind-log=/tmp/valgrind-output
|
|
||||||
|
|
||||||
.PHONY: readme
|
.PHONY: readme
|
||||||
readme:
|
readme:
|
||||||
python3 -c "import markdown2" > /dev/null 2>&1 || python3 -m pip install markdown2
|
python3 -c "import markdown2" > /dev/null 2>&1 || python3 -m pip install markdown2
|
||||||
|
@ -134,9 +120,4 @@ lint-fix:
|
||||||
python3 -c "import black" > /dev/null 2>&1 || python3 -m pip install black
|
python3 -c "import black" > /dev/null 2>&1 || python3 -m pip install black
|
||||||
python3 -m black .
|
python3 -m black .
|
||||||
python3 -c "import ruff" > /dev/null 2>&1 || python3 -m pip install ruff
|
python3 -c "import ruff" > /dev/null 2>&1 || python3 -m pip install ruff
|
||||||
python3 -m ruff check --fix .
|
python3 -m ruff --fix .
|
||||||
|
|
||||||
.PHONY: mypy
|
|
||||||
mypy:
|
|
||||||
python3 -c "import tox" > /dev/null 2>&1 || python3 -m pip install tox
|
|
||||||
python3 -m tox -e mypy
|
|
||||||
|
|
16
README.md
|
@ -36,16 +36,22 @@ As of 2019, Pillow development is
|
||||||
<a href="https://github.com/python-pillow/Pillow/actions/workflows/test-mingw.yml"><img
|
<a href="https://github.com/python-pillow/Pillow/actions/workflows/test-mingw.yml"><img
|
||||||
alt="GitHub Actions build status (Test MinGW)"
|
alt="GitHub Actions build status (Test MinGW)"
|
||||||
src="https://github.com/python-pillow/Pillow/workflows/Test%20MinGW/badge.svg"></a>
|
src="https://github.com/python-pillow/Pillow/workflows/Test%20MinGW/badge.svg"></a>
|
||||||
|
<a href="https://github.com/python-pillow/Pillow/actions/workflows/test-cygwin.yml"><img
|
||||||
|
alt="GitHub Actions build status (Test Cygwin)"
|
||||||
|
src="https://github.com/python-pillow/Pillow/workflows/Test%20Cygwin/badge.svg"></a>
|
||||||
<a href="https://github.com/python-pillow/Pillow/actions/workflows/test-docker.yml"><img
|
<a href="https://github.com/python-pillow/Pillow/actions/workflows/test-docker.yml"><img
|
||||||
alt="GitHub Actions build status (Test Docker)"
|
alt="GitHub Actions build status (Test Docker)"
|
||||||
src="https://github.com/python-pillow/Pillow/workflows/Test%20Docker/badge.svg"></a>
|
src="https://github.com/python-pillow/Pillow/workflows/Test%20Docker/badge.svg"></a>
|
||||||
|
<a href="https://ci.appveyor.com/project/python-pillow/Pillow"><img
|
||||||
|
alt="AppVeyor CI build status (Windows)"
|
||||||
|
src="https://img.shields.io/appveyor/build/python-pillow/Pillow/main.svg?label=Windows%20build"></a>
|
||||||
<a href="https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml"><img
|
<a href="https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml"><img
|
||||||
alt="GitHub Actions build status (Wheels)"
|
alt="GitHub Actions build status (Wheels)"
|
||||||
src="https://github.com/python-pillow/Pillow/workflows/Wheels/badge.svg"></a>
|
src="https://github.com/python-pillow/Pillow/workflows/Wheels/badge.svg"></a>
|
||||||
<a href="https://app.codecov.io/gh/python-pillow/Pillow"><img
|
<a href="https://app.codecov.io/gh/python-pillow/Pillow"><img
|
||||||
alt="Code coverage"
|
alt="Code coverage"
|
||||||
src="https://codecov.io/gh/python-pillow/Pillow/branch/main/graph/badge.svg"></a>
|
src="https://codecov.io/gh/python-pillow/Pillow/branch/main/graph/badge.svg"></a>
|
||||||
<a href="https://issues.oss-fuzz.com/issues?q=title:pillow"><img
|
<a href="https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:pillow"><img
|
||||||
alt="Fuzzing Status"
|
alt="Fuzzing Status"
|
||||||
src="https://oss-fuzz-build-logs.storage.googleapis.com/badges/pillow.svg"></a>
|
src="https://oss-fuzz-build-logs.storage.googleapis.com/badges/pillow.svg"></a>
|
||||||
</td>
|
</td>
|
||||||
|
@ -92,18 +98,18 @@ This library provides extensive file format support, an efficient internal repre
|
||||||
|
|
||||||
The core image library is designed for fast access to data stored in a few basic pixel formats. It should provide a solid foundation for a general image processing tool.
|
The core image library is designed for fast access to data stored in a few basic pixel formats. It should provide a solid foundation for a general image processing tool.
|
||||||
|
|
||||||
## More information
|
## More Information
|
||||||
|
|
||||||
- [Documentation](https://pillow.readthedocs.io/)
|
- [Documentation](https://pillow.readthedocs.io/)
|
||||||
- [Installation](https://pillow.readthedocs.io/en/latest/installation/basic-installation.html)
|
- [Installation](https://pillow.readthedocs.io/en/latest/installation.html)
|
||||||
- [Handbook](https://pillow.readthedocs.io/en/latest/handbook/index.html)
|
- [Handbook](https://pillow.readthedocs.io/en/latest/handbook/index.html)
|
||||||
- [Contribute](https://github.com/python-pillow/Pillow/blob/main/.github/CONTRIBUTING.md)
|
- [Contribute](https://github.com/python-pillow/Pillow/blob/main/.github/CONTRIBUTING.md)
|
||||||
- [Issues](https://github.com/python-pillow/Pillow/issues)
|
- [Issues](https://github.com/python-pillow/Pillow/issues)
|
||||||
- [Pull requests](https://github.com/python-pillow/Pillow/pulls)
|
- [Pull requests](https://github.com/python-pillow/Pillow/pulls)
|
||||||
- [Release notes](https://pillow.readthedocs.io/en/stable/releasenotes/index.html)
|
- [Release notes](https://pillow.readthedocs.io/en/stable/releasenotes/index.html)
|
||||||
- [Changelog](https://github.com/python-pillow/Pillow/releases)
|
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
|
||||||
- [Pre-fork](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst#pre-fork)
|
- [Pre-fork](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst#pre-fork)
|
||||||
|
|
||||||
## Report a vulnerability
|
## Report a Vulnerability
|
||||||
|
|
||||||
To report a security vulnerability, please follow the procedure described in the [Tidelift security policy](https://tidelift.com/docs/security).
|
To report a security vulnerability, please follow the procedure described in the [Tidelift security policy](https://tidelift.com/docs/security).
|
||||||
|
|
51
RELEASING.md
|
@ -1,25 +1,44 @@
|
||||||
# Release checklist
|
# Release Checklist
|
||||||
|
|
||||||
See https://pillow.readthedocs.io/en/stable/releasenotes/versioning.html for
|
See https://pillow.readthedocs.io/en/stable/releasenotes/versioning.html for
|
||||||
information about how the version numbers line up with releases.
|
information about how the version numbers line up with releases.
|
||||||
|
|
||||||
## Main release
|
## Main Release
|
||||||
|
|
||||||
Released quarterly on January 2nd, April 1st, July 1st and October 15th.
|
Released quarterly on January 2nd, April 1st, July 1st and October 15th.
|
||||||
|
|
||||||
* [ ] Create a new issue and select the "Maintainers only: Release" template.
|
* [ ] Open a release ticket e.g. https://github.com/python-pillow/Pillow/issues/3154
|
||||||
|
* [ ] Develop and prepare release in `main` branch.
|
||||||
## Point release
|
* [ ] Check [GitHub Actions](https://github.com/python-pillow/Pillow/actions) and [AppVeyor](https://ci.appveyor.com/project/python-pillow/Pillow) to confirm passing tests in `main` branch.
|
||||||
|
* [ ] Check that all the wheel builds pass the tests in the [GitHub Actions "Wheels" workflow](https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml) jobs by manually triggering them.
|
||||||
|
* [ ] In compliance with [PEP 440](https://peps.python.org/pep-0440/), update version identifier in `src/PIL/_version.py`
|
||||||
|
* [ ] Update `CHANGES.rst`.
|
||||||
|
* [ ] Run pre-release check via `make release-test` in a freshly cloned repo.
|
||||||
|
* [ ] Create branch and tag for release e.g.:
|
||||||
|
```bash
|
||||||
|
git branch 5.2.x
|
||||||
|
git tag 5.2.0
|
||||||
|
git push --tags
|
||||||
|
```
|
||||||
|
* [ ] Create and upload all [source and binary distributions](https://github.com/python-pillow/Pillow/blob/main/RELEASING.md#source-and-binary-distributions)
|
||||||
|
* [ ] Publish the [release on GitHub](https://github.com/python-pillow/Pillow/releases)
|
||||||
|
* [ ] In compliance with [PEP 440](https://peps.python.org/pep-0440/),
|
||||||
|
increment and append `.dev0` to version identifier in `src/PIL/_version.py` and then:
|
||||||
|
```bash
|
||||||
|
git push --all
|
||||||
|
```
|
||||||
|
## Point Release
|
||||||
|
|
||||||
Released as needed for security, installation or critical bug fixes.
|
Released as needed for security, installation or critical bug fixes.
|
||||||
|
|
||||||
* [ ] Make necessary changes in `main` branch.
|
* [ ] Make necessary changes in `main` branch.
|
||||||
|
* [ ] Update `CHANGES.rst`.
|
||||||
* [ ] Check out release branch e.g.:
|
* [ ] Check out release branch e.g.:
|
||||||
```bash
|
```bash
|
||||||
git checkout -t remotes/origin/5.2.x
|
git checkout -t remotes/origin/5.2.x
|
||||||
```
|
```
|
||||||
* [ ] Cherry pick individual commits from `main` branch to release branch e.g. `5.2.x`, then `git push`.
|
* [ ] Cherry pick individual commits from `main` branch to release branch e.g. `5.2.x`, then `git push`.
|
||||||
* [ ] Check [GitHub Actions](https://github.com/python-pillow/Pillow/actions) to confirm passing tests in release branch e.g. `5.2.x`.
|
* [ ] Check [GitHub Actions](https://github.com/python-pillow/Pillow/actions) and [AppVeyor](https://ci.appveyor.com/project/python-pillow/Pillow) to confirm passing tests in release branch e.g. `5.2.x`.
|
||||||
* [ ] In compliance with [PEP 440](https://peps.python.org/pep-0440/), update version identifier in `src/PIL/_version.py`
|
* [ ] In compliance with [PEP 440](https://peps.python.org/pep-0440/), update version identifier in `src/PIL/_version.py`
|
||||||
* [ ] Run pre-release check via `make release-test`.
|
* [ ] Run pre-release check via `make release-test`.
|
||||||
* [ ] Create tag for release e.g.:
|
* [ ] Create tag for release e.g.:
|
||||||
|
@ -31,15 +50,13 @@ Released as needed for security, installation or critical bug fixes.
|
||||||
```bash
|
```bash
|
||||||
make sdist
|
make sdist
|
||||||
```
|
```
|
||||||
* [ ] Check the [GitHub Actions "Wheels" workflow](https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml)
|
* [ ] Create and upload all [source and binary distributions](https://github.com/python-pillow/Pillow/blob/main/RELEASING.md#source-and-binary-distributions)
|
||||||
has passed, including the "Upload release to PyPI" job. This will have been triggered
|
|
||||||
by the new tag.
|
|
||||||
* [ ] Publish the [release on GitHub](https://github.com/python-pillow/Pillow/releases) and then:
|
* [ ] Publish the [release on GitHub](https://github.com/python-pillow/Pillow/releases) and then:
|
||||||
```bash
|
```bash
|
||||||
git push
|
git push
|
||||||
```
|
```
|
||||||
|
|
||||||
## Embargoed release
|
## Embargoed Release
|
||||||
|
|
||||||
Released as needed privately to individual vendors for critical security-related bug fixes.
|
Released as needed privately to individual vendors for critical security-related bug fixes.
|
||||||
|
|
||||||
|
@ -55,15 +72,19 @@ Released as needed privately to individual vendors for critical security-related
|
||||||
git tag 2.5.3
|
git tag 2.5.3
|
||||||
git push origin --tags
|
git push origin --tags
|
||||||
```
|
```
|
||||||
* [ ] Check the [GitHub Actions "Wheels" workflow](https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml)
|
* [ ] Create and upload all [source and binary distributions](https://github.com/python-pillow/Pillow/blob/main/RELEASING.md#source-and-binary-distributions)
|
||||||
has passed, including the "Upload release to PyPI" job. This will have been triggered
|
|
||||||
by the new tag.
|
|
||||||
* [ ] Publish the [release on GitHub](https://github.com/python-pillow/Pillow/releases) and then:
|
* [ ] Publish the [release on GitHub](https://github.com/python-pillow/Pillow/releases) and then:
|
||||||
```bash
|
```bash
|
||||||
git push origin 2.5.x
|
git push origin 2.5.x
|
||||||
```
|
```
|
||||||
|
|
||||||
## Publicize release
|
## Source and Binary Distributions
|
||||||
|
|
||||||
|
* [ ] Check the [GitHub Actions "Wheels" workflow](https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml)
|
||||||
|
has passed, including the "Upload release to PyPI" job. This will have been triggered
|
||||||
|
by the new tag.
|
||||||
|
|
||||||
|
## Publicize Release
|
||||||
|
|
||||||
* [ ] Announce release availability via [Mastodon](https://fosstodon.org/@pillow) e.g. https://fosstodon.org/@pillow/110639450470725321
|
* [ ] Announce release availability via [Mastodon](https://fosstodon.org/@pillow) e.g. https://fosstodon.org/@pillow/110639450470725321
|
||||||
|
|
||||||
|
@ -71,7 +92,7 @@ Released as needed privately to individual vendors for critical security-related
|
||||||
|
|
||||||
* [ ] Make sure the [default version for Read the Docs](https://pillow.readthedocs.io/en/stable/) is up-to-date with the release changes
|
* [ ] Make sure the [default version for Read the Docs](https://pillow.readthedocs.io/en/stable/) is up-to-date with the release changes
|
||||||
|
|
||||||
## Docker images
|
## Docker Images
|
||||||
|
|
||||||
* [ ] Update Pillow in the Docker Images repository
|
* [ ] Update Pillow in the Docker Images repository
|
||||||
```bash
|
```bash
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
Pillow tests
|
Pillow Tests
|
||||||
============
|
============
|
||||||
|
|
||||||
Test scripts are named ``test_xxx.py``. Helper classes and functions can be found in ``helper.py``.
|
Test scripts are named ``test_xxx.py``. Helper classes and functions can be found in ``helper.py``.
|
||||||
|
|
54
Tests/bench_cffi_access.py
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import time
|
||||||
|
|
||||||
|
from PIL import PyAccess
|
||||||
|
|
||||||
|
from .helper import hopper
|
||||||
|
|
||||||
|
# Not running this test by default. No DOS against CI.
|
||||||
|
|
||||||
|
|
||||||
|
def iterate_get(size, access) -> None:
|
||||||
|
(w, h) = size
|
||||||
|
for x in range(w):
|
||||||
|
for y in range(h):
|
||||||
|
access[(x, y)]
|
||||||
|
|
||||||
|
|
||||||
|
def iterate_set(size, access) -> None:
|
||||||
|
(w, h) = size
|
||||||
|
for x in range(w):
|
||||||
|
for y in range(h):
|
||||||
|
access[(x, y)] = (x % 256, y % 256, 0)
|
||||||
|
|
||||||
|
|
||||||
|
def timer(func, label, *args) -> None:
|
||||||
|
iterations = 5000
|
||||||
|
starttime = time.time()
|
||||||
|
for x in range(iterations):
|
||||||
|
func(*args)
|
||||||
|
if time.time() - starttime > 10:
|
||||||
|
break
|
||||||
|
endtime = time.time()
|
||||||
|
print(
|
||||||
|
"{}: completed {} iterations in {:.4f}s, {:.6f}s per iteration".format(
|
||||||
|
label, x + 1, endtime - starttime, (endtime - starttime) / (x + 1.0)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_direct() -> None:
|
||||||
|
im = hopper()
|
||||||
|
im.load()
|
||||||
|
# im = Image.new("RGB", (2000, 2000), (1, 3, 2))
|
||||||
|
caccess = im.im.pixel_access(False)
|
||||||
|
access = PyAccess.new(im, False)
|
||||||
|
|
||||||
|
assert caccess[(0, 0)] == access[(0, 0)]
|
||||||
|
|
||||||
|
print(f"Size: {im.width}x{im.height}")
|
||||||
|
timer(iterate_get, "PyAccess - get", im.size, access)
|
||||||
|
timer(iterate_set, "PyAccess - set", im.size, access)
|
||||||
|
timer(iterate_get, "C-api - get", im.size, caccess)
|
||||||
|
timer(iterate_set, "C-api - set", im.size, caccess)
|
|
@ -1,8 +1,7 @@
|
||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from collections.abc import Callable
|
from typing import Any, Callable
|
||||||
from typing import Any
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
|
@ -9,6 +9,6 @@ from PIL import Image
|
||||||
|
|
||||||
def test_j2k_overflow(tmp_path: Path) -> None:
|
def test_j2k_overflow(tmp_path: Path) -> None:
|
||||||
im = Image.new("RGBA", (1024, 131584))
|
im = Image.new("RGBA", (1024, 131584))
|
||||||
target = tmp_path / "temp.jpc"
|
target = str(tmp_path / "temp.jpc")
|
||||||
with pytest.raises(OSError):
|
with pytest.raises(OSError):
|
||||||
im.save(target)
|
im.save(target)
|
|
@ -13,7 +13,7 @@ iterations = 5000
|
||||||
When run on a system without the jpeg leak fixes,
|
When run on a system without the jpeg leak fixes,
|
||||||
the valgrind runs look like this.
|
the valgrind runs look like this.
|
||||||
|
|
||||||
valgrind --tool=massif python test-installed.py -s -v checks/check_jpeg_leaks.py
|
valgrind --tool=massif python test-installed.py -s -v Tests/check_jpeg_leaks.py
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -32,7 +32,7 @@ pytestmark = pytest.mark.skipif(sys.maxsize <= 2**32, reason="requires 64-bit sy
|
||||||
|
|
||||||
|
|
||||||
def _write_png(tmp_path: Path, xdim: int, ydim: int) -> None:
|
def _write_png(tmp_path: Path, xdim: int, ydim: int) -> None:
|
||||||
f = tmp_path / "temp.png"
|
f = str(tmp_path / "temp.png")
|
||||||
im = Image.new("L", (xdim, ydim), 0)
|
im = Image.new("L", (xdim, ydim), 0)
|
||||||
im.save(f)
|
im.save(f)
|
||||||
|
|
|
@ -28,7 +28,7 @@ pytestmark = pytest.mark.skipif(sys.maxsize <= 2**32, reason="requires 64-bit sy
|
||||||
def _write_png(tmp_path: Path, xdim: int, ydim: int) -> None:
|
def _write_png(tmp_path: Path, xdim: int, ydim: int) -> None:
|
||||||
dtype = np.uint8
|
dtype = np.uint8
|
||||||
a = np.zeros((xdim, ydim), dtype=dtype)
|
a = np.zeros((xdim, ydim), dtype=dtype)
|
||||||
f = tmp_path / "temp.png"
|
f = str(tmp_path / "temp.png")
|
||||||
im = Image.fromarray(a, "L")
|
im = Image.fromarray(a, "L")
|
||||||
im.save(f)
|
im.save(f)
|
||||||
|
|
|
@ -3,25 +3,26 @@ from __future__ import annotations
|
||||||
import zlib
|
import zlib
|
||||||
from io import BytesIO
|
from io import BytesIO
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
from PIL import Image, ImageFile, PngImagePlugin
|
from PIL import Image, ImageFile, PngImagePlugin
|
||||||
|
|
||||||
TEST_FILE = "Tests/images/png_decompression_dos.png"
|
TEST_FILE = "Tests/images/png_decompression_dos.png"
|
||||||
|
|
||||||
|
|
||||||
def test_ignore_dos_text(monkeypatch: pytest.MonkeyPatch) -> None:
|
def test_ignore_dos_text() -> None:
|
||||||
monkeypatch.setattr(ImageFile, "LOAD_TRUNCATED_IMAGES", True)
|
ImageFile.LOAD_TRUNCATED_IMAGES = True
|
||||||
|
|
||||||
with Image.open(TEST_FILE) as im:
|
try:
|
||||||
|
im = Image.open(TEST_FILE)
|
||||||
im.load()
|
im.load()
|
||||||
|
finally:
|
||||||
|
ImageFile.LOAD_TRUNCATED_IMAGES = False
|
||||||
|
|
||||||
assert isinstance(im, PngImagePlugin.PngImageFile)
|
assert isinstance(im, PngImagePlugin.PngImageFile)
|
||||||
for s in im.text.values():
|
for s in im.text.values():
|
||||||
assert len(s) < 1024 * 1024, "Text chunk larger than 1M"
|
assert len(s) < 1024 * 1024, "Text chunk larger than 1M"
|
||||||
|
|
||||||
for s in im.info.values():
|
for s in im.info.values():
|
||||||
assert len(s) < 1024 * 1024, "Text chunk larger than 1M"
|
assert len(s) < 1024 * 1024, "Text chunk larger than 1M"
|
||||||
|
|
||||||
|
|
||||||
def test_dos_text() -> None:
|
def test_dos_text() -> None:
|
43
Tests/check_wheel.py
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import sys
|
||||||
|
|
||||||
|
from PIL import features
|
||||||
|
|
||||||
|
|
||||||
|
def test_wheel_modules() -> None:
|
||||||
|
expected_modules = {"pil", "tkinter", "freetype2", "littlecms2", "webp"}
|
||||||
|
|
||||||
|
# tkinter is not available in cibuildwheel installed CPython on Windows
|
||||||
|
try:
|
||||||
|
import tkinter
|
||||||
|
|
||||||
|
assert tkinter
|
||||||
|
except ImportError:
|
||||||
|
expected_modules.remove("tkinter")
|
||||||
|
|
||||||
|
assert set(features.get_supported_modules()) == expected_modules
|
||||||
|
|
||||||
|
|
||||||
|
def test_wheel_codecs() -> None:
|
||||||
|
expected_codecs = {"jpg", "jpg_2000", "zlib", "libtiff"}
|
||||||
|
|
||||||
|
assert set(features.get_supported_codecs()) == expected_codecs
|
||||||
|
|
||||||
|
|
||||||
|
def test_wheel_features() -> None:
|
||||||
|
expected_features = {
|
||||||
|
"webp_anim",
|
||||||
|
"webp_mux",
|
||||||
|
"transp_webp",
|
||||||
|
"raqm",
|
||||||
|
"fribidi",
|
||||||
|
"harfbuzz",
|
||||||
|
"libjpeg_turbo",
|
||||||
|
"xcb",
|
||||||
|
}
|
||||||
|
|
||||||
|
if sys.platform == "win32":
|
||||||
|
expected_features.remove("xcb")
|
||||||
|
|
||||||
|
assert set(features.get_supported_features()) == expected_features
|
|
@ -9,20 +9,16 @@ import os
|
||||||
import shutil
|
import shutil
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
import sysconfig
|
||||||
import tempfile
|
import tempfile
|
||||||
from functools import lru_cache
|
from functools import lru_cache
|
||||||
from io import BytesIO
|
from io import BytesIO
|
||||||
|
from typing import Any, Callable, Sequence
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from packaging.version import parse as parse_version
|
from packaging.version import parse as parse_version
|
||||||
|
|
||||||
from PIL import Image, ImageFile, ImageMath, features
|
from PIL import Image, ImageMath, features
|
||||||
|
|
||||||
TYPE_CHECKING = False
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from collections.abc import Callable, Sequence
|
|
||||||
from pathlib import Path
|
|
||||||
from typing import Any
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
@ -63,7 +59,9 @@ def convert_to_comparable(
|
||||||
return new_a, new_b
|
return new_a, new_b
|
||||||
|
|
||||||
|
|
||||||
def assert_deep_equal(a: Any, b: Any, msg: str | None = None) -> None:
|
def assert_deep_equal(
|
||||||
|
a: Sequence[Any], b: Sequence[Any], msg: str | None = None
|
||||||
|
) -> None:
|
||||||
try:
|
try:
|
||||||
assert len(a) == len(b), msg or f"got length {len(a)}, expected {len(b)}"
|
assert len(a) == len(b), msg or f"got length {len(a)}, expected {len(b)}"
|
||||||
except Exception:
|
except Exception:
|
||||||
|
@ -99,10 +97,7 @@ def assert_image_equal(a: Image.Image, b: Image.Image, msg: str | None = None) -
|
||||||
|
|
||||||
|
|
||||||
def assert_image_equal_tofile(
|
def assert_image_equal_tofile(
|
||||||
a: Image.Image,
|
a: Image.Image, filename: str, msg: str | None = None, mode: str | None = None
|
||||||
filename: str | Path,
|
|
||||||
msg: str | None = None,
|
|
||||||
mode: str | None = None,
|
|
||||||
) -> None:
|
) -> None:
|
||||||
with Image.open(filename) as img:
|
with Image.open(filename) as img:
|
||||||
if mode:
|
if mode:
|
||||||
|
@ -143,14 +138,21 @@ def assert_image_similar(
|
||||||
|
|
||||||
def assert_image_similar_tofile(
|
def assert_image_similar_tofile(
|
||||||
a: Image.Image,
|
a: Image.Image,
|
||||||
filename: str | Path,
|
filename: str,
|
||||||
epsilon: float,
|
epsilon: float,
|
||||||
msg: str | None = None,
|
msg: str | None = None,
|
||||||
|
mode: str | None = None,
|
||||||
) -> None:
|
) -> None:
|
||||||
with Image.open(filename) as img:
|
with Image.open(filename) as img:
|
||||||
|
if mode:
|
||||||
|
img = img.convert(mode)
|
||||||
assert_image_similar(a, img, epsilon, msg)
|
assert_image_similar(a, img, epsilon, msg)
|
||||||
|
|
||||||
|
|
||||||
|
def assert_all_same(items: Sequence[Any], msg: str | None = None) -> None:
|
||||||
|
assert items.count(items[0]) == len(items), msg
|
||||||
|
|
||||||
|
|
||||||
def assert_not_all_same(items: Sequence[Any], msg: str | None = None) -> None:
|
def assert_not_all_same(items: Sequence[Any], msg: str | None = None) -> None:
|
||||||
assert items.count(items[0]) != len(items), msg
|
assert items.count(items[0]) != len(items), msg
|
||||||
|
|
||||||
|
@ -164,12 +166,6 @@ def assert_tuple_approx_equal(
|
||||||
pytest.fail(msg + ": " + repr(actuals) + " != " + repr(targets))
|
pytest.fail(msg + ": " + repr(actuals) + " != " + repr(targets))
|
||||||
|
|
||||||
|
|
||||||
def timeout_unless_slower_valgrind(timeout: float) -> pytest.MarkDecorator:
|
|
||||||
if "PILLOW_VALGRIND_TEST" in os.environ:
|
|
||||||
return pytest.mark.pil_noop_mark()
|
|
||||||
return pytest.mark.timeout(timeout)
|
|
||||||
|
|
||||||
|
|
||||||
def skip_unless_feature(feature: str) -> pytest.MarkDecorator:
|
def skip_unless_feature(feature: str) -> pytest.MarkDecorator:
|
||||||
reason = f"{feature} not available"
|
reason = f"{feature} not available"
|
||||||
return pytest.mark.skipif(not features.check(feature), reason=reason)
|
return pytest.mark.skipif(not features.check(feature), reason=reason)
|
||||||
|
@ -178,13 +174,12 @@ def skip_unless_feature(feature: str) -> pytest.MarkDecorator:
|
||||||
def skip_unless_feature_version(
|
def skip_unless_feature_version(
|
||||||
feature: str, required: str, reason: str | None = None
|
feature: str, required: str, reason: str | None = None
|
||||||
) -> pytest.MarkDecorator:
|
) -> pytest.MarkDecorator:
|
||||||
version = features.version(feature)
|
if not features.check(feature):
|
||||||
if version is None:
|
|
||||||
return pytest.mark.skip(f"{feature} not available")
|
return pytest.mark.skip(f"{feature} not available")
|
||||||
if reason is None:
|
if reason is None:
|
||||||
reason = f"{feature} is older than {required}"
|
reason = f"{feature} is older than {required}"
|
||||||
version_required = parse_version(required)
|
version_required = parse_version(required)
|
||||||
version_available = parse_version(version)
|
version_available = parse_version(features.version(feature))
|
||||||
return pytest.mark.skipif(version_available < version_required, reason=reason)
|
return pytest.mark.skipif(version_available < version_required, reason=reason)
|
||||||
|
|
||||||
|
|
||||||
|
@ -194,13 +189,12 @@ def mark_if_feature_version(
|
||||||
version_blacklist: str,
|
version_blacklist: str,
|
||||||
reason: str | None = None,
|
reason: str | None = None,
|
||||||
) -> pytest.MarkDecorator:
|
) -> pytest.MarkDecorator:
|
||||||
version = features.version(feature)
|
if not features.check(feature):
|
||||||
if version is None:
|
|
||||||
return pytest.mark.pil_noop_mark()
|
return pytest.mark.pil_noop_mark()
|
||||||
if reason is None:
|
if reason is None:
|
||||||
reason = f"{feature} is {version_blacklist}"
|
reason = f"{feature} is {version_blacklist}"
|
||||||
version_required = parse_version(version_blacklist)
|
version_required = parse_version(version_blacklist)
|
||||||
version_available = parse_version(version)
|
version_available = parse_version(features.version(feature))
|
||||||
if (
|
if (
|
||||||
version_available.major == version_required.major
|
version_available.major == version_required.major
|
||||||
and version_available.minor == version_required.minor
|
and version_available.minor == version_required.minor
|
||||||
|
@ -226,11 +220,16 @@ class PillowLeakTestCase:
|
||||||
from resource import RUSAGE_SELF, getrusage
|
from resource import RUSAGE_SELF, getrusage
|
||||||
|
|
||||||
mem = getrusage(RUSAGE_SELF).ru_maxrss
|
mem = getrusage(RUSAGE_SELF).ru_maxrss
|
||||||
# man 2 getrusage:
|
if sys.platform == "darwin":
|
||||||
# ru_maxrss
|
# man 2 getrusage:
|
||||||
# This is the maximum resident set size utilized
|
# ru_maxrss
|
||||||
# in bytes on macOS, in kilobytes on Linux
|
# This is the maximum resident set size utilized (in bytes).
|
||||||
return mem / 1024 if sys.platform == "darwin" else mem
|
return mem / 1024 # Kb
|
||||||
|
# linux
|
||||||
|
# man 2 getrusage
|
||||||
|
# ru_maxrss (since Linux 2.6.32)
|
||||||
|
# This is the maximum resident set size used (in kilobytes).
|
||||||
|
return mem # Kb
|
||||||
|
|
||||||
def _test_leak(self, core: Callable[[], None]) -> None:
|
def _test_leak(self, core: Callable[[], None]) -> None:
|
||||||
start_mem = self._get_mem_usage()
|
start_mem = self._get_mem_usage()
|
||||||
|
@ -244,7 +243,7 @@ class PillowLeakTestCase:
|
||||||
# helpers
|
# helpers
|
||||||
|
|
||||||
|
|
||||||
def fromstring(data: bytes) -> ImageFile.ImageFile:
|
def fromstring(data: bytes) -> Image.Image:
|
||||||
return Image.open(BytesIO(data))
|
return Image.open(BytesIO(data))
|
||||||
|
|
||||||
|
|
||||||
|
@ -274,14 +273,7 @@ def _cached_hopper(mode: str) -> Image.Image:
|
||||||
im = hopper("L")
|
im = hopper("L")
|
||||||
else:
|
else:
|
||||||
im = hopper()
|
im = hopper()
|
||||||
try:
|
return im.convert(mode)
|
||||||
im = im.convert(mode)
|
|
||||||
except ImportError:
|
|
||||||
if mode == "LAB":
|
|
||||||
im = Image.open("Tests/images/hopper.Lab.tif")
|
|
||||||
else:
|
|
||||||
raise
|
|
||||||
return im
|
|
||||||
|
|
||||||
|
|
||||||
def djpeg_available() -> bool:
|
def djpeg_available() -> bool:
|
||||||
|
@ -294,6 +286,16 @@ def djpeg_available() -> bool:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
def cjpeg_available() -> bool:
|
||||||
|
if shutil.which("cjpeg"):
|
||||||
|
try:
|
||||||
|
subprocess.check_call(["cjpeg", "-version"])
|
||||||
|
return True
|
||||||
|
except subprocess.CalledProcessError: # pragma: no cover
|
||||||
|
return False
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
def netpbm_available() -> bool:
|
def netpbm_available() -> bool:
|
||||||
return bool(shutil.which("ppmquant") and shutil.which("ppmtogif"))
|
return bool(shutil.which("ppmquant") and shutil.which("ppmtogif"))
|
||||||
|
|
||||||
|
@ -318,7 +320,16 @@ def magick_command() -> list[str] | None:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def on_appveyor() -> bool:
|
||||||
|
return "APPVEYOR" in os.environ
|
||||||
|
|
||||||
|
|
||||||
|
def on_github_actions() -> bool:
|
||||||
|
return "GITHUB_ACTIONS" in os.environ
|
||||||
|
|
||||||
|
|
||||||
def on_ci() -> bool:
|
def on_ci() -> bool:
|
||||||
|
# GitHub Actions and AppVeyor have "CI"
|
||||||
return "CI" in os.environ
|
return "CI" in os.environ
|
||||||
|
|
||||||
|
|
||||||
|
@ -340,6 +351,10 @@ def is_pypy() -> bool:
|
||||||
return hasattr(sys, "pypy_translation_info")
|
return hasattr(sys, "pypy_translation_info")
|
||||||
|
|
||||||
|
|
||||||
|
def is_mingw() -> bool:
|
||||||
|
return sysconfig.get_platform() == "mingw"
|
||||||
|
|
||||||
|
|
||||||
class CachedProperty:
|
class CachedProperty:
|
||||||
def __init__(self, func: Callable[[Any], Any]) -> None:
|
def __init__(self, func: Callable[[Any], Any]) -> None:
|
||||||
self.func = func
|
self.func = func
|
||||||
|
|
Before Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 984 B |
Before Width: | Height: | Size: 1.2 KiB |
|
@ -1,260 +0,0 @@
|
||||||
GIMP Palette
|
|
||||||
Name: fullpalette
|
|
||||||
Columns: 4
|
|
||||||
#
|
|
||||||
0 0 0 Index 0
|
|
||||||
1 1 1 Index 1
|
|
||||||
2 2 2 Index 2
|
|
||||||
3 3 3 Index 3
|
|
||||||
4 4 4 Index 4
|
|
||||||
5 5 5 Index 5
|
|
||||||
6 6 6 Index 6
|
|
||||||
7 7 7 Index 7
|
|
||||||
8 8 8 Index 8
|
|
||||||
9 9 9 Index 9
|
|
||||||
10 10 10 Index 10
|
|
||||||
11 11 11 Index 11
|
|
||||||
12 12 12 Index 12
|
|
||||||
13 13 13 Index 13
|
|
||||||
14 14 14 Index 14
|
|
||||||
15 15 15 Index 15
|
|
||||||
16 16 16 Index 16
|
|
||||||
17 17 17 Index 17
|
|
||||||
18 18 18 Index 18
|
|
||||||
19 19 19 Index 19
|
|
||||||
20 20 20 Index 20
|
|
||||||
21 21 21 Index 21
|
|
||||||
22 22 22 Index 22
|
|
||||||
23 23 23 Index 23
|
|
||||||
24 24 24 Index 24
|
|
||||||
25 25 25 Index 25
|
|
||||||
26 26 26 Index 26
|
|
||||||
27 27 27 Index 27
|
|
||||||
28 28 28 Index 28
|
|
||||||
29 29 29 Index 29
|
|
||||||
30 30 30 Index 30
|
|
||||||
31 31 31 Index 31
|
|
||||||
32 32 32 Index 32
|
|
||||||
33 33 33 Index 33
|
|
||||||
34 34 34 Index 34
|
|
||||||
35 35 35 Index 35
|
|
||||||
36 36 36 Index 36
|
|
||||||
37 37 37 Index 37
|
|
||||||
38 38 38 Index 38
|
|
||||||
39 39 39 Index 39
|
|
||||||
40 40 40 Index 40
|
|
||||||
41 41 41 Index 41
|
|
||||||
42 42 42 Index 42
|
|
||||||
43 43 43 Index 43
|
|
||||||
44 44 44 Index 44
|
|
||||||
45 45 45 Index 45
|
|
||||||
46 46 46 Index 46
|
|
||||||
47 47 47 Index 47
|
|
||||||
48 48 48 Index 48
|
|
||||||
49 49 49 Index 49
|
|
||||||
50 50 50 Index 50
|
|
||||||
51 51 51 Index 51
|
|
||||||
52 52 52 Index 52
|
|
||||||
53 53 53 Index 53
|
|
||||||
54 54 54 Index 54
|
|
||||||
55 55 55 Index 55
|
|
||||||
56 56 56 Index 56
|
|
||||||
57 57 57 Index 57
|
|
||||||
58 58 58 Index 58
|
|
||||||
59 59 59 Index 59
|
|
||||||
60 60 60 Index 60
|
|
||||||
61 61 61 Index 61
|
|
||||||
62 62 62 Index 62
|
|
||||||
63 63 63 Index 63
|
|
||||||
64 64 64 Index 64
|
|
||||||
65 65 65 Index 65
|
|
||||||
66 66 66 Index 66
|
|
||||||
67 67 67 Index 67
|
|
||||||
68 68 68 Index 68
|
|
||||||
69 69 69 Index 69
|
|
||||||
70 70 70 Index 70
|
|
||||||
71 71 71 Index 71
|
|
||||||
72 72 72 Index 72
|
|
||||||
73 73 73 Index 73
|
|
||||||
74 74 74 Index 74
|
|
||||||
75 75 75 Index 75
|
|
||||||
76 76 76 Index 76
|
|
||||||
77 77 77 Index 77
|
|
||||||
78 78 78 Index 78
|
|
||||||
79 79 79 Index 79
|
|
||||||
80 80 80 Index 80
|
|
||||||
81 81 81 Index 81
|
|
||||||
82 82 82 Index 82
|
|
||||||
83 83 83 Index 83
|
|
||||||
84 84 84 Index 84
|
|
||||||
85 85 85 Index 85
|
|
||||||
86 86 86 Index 86
|
|
||||||
87 87 87 Index 87
|
|
||||||
88 88 88 Index 88
|
|
||||||
89 89 89 Index 89
|
|
||||||
90 90 90 Index 90
|
|
||||||
91 91 91 Index 91
|
|
||||||
92 92 92 Index 92
|
|
||||||
93 93 93 Index 93
|
|
||||||
94 94 94 Index 94
|
|
||||||
95 95 95 Index 95
|
|
||||||
96 96 96 Index 96
|
|
||||||
97 97 97 Index 97
|
|
||||||
98 98 98 Index 98
|
|
||||||
99 99 99 Index 99
|
|
||||||
100 100 100 Index 100
|
|
||||||
101 101 101 Index 101
|
|
||||||
102 102 102 Index 102
|
|
||||||
103 103 103 Index 103
|
|
||||||
104 104 104 Index 104
|
|
||||||
105 105 105 Index 105
|
|
||||||
106 106 106 Index 106
|
|
||||||
107 107 107 Index 107
|
|
||||||
108 108 108 Index 108
|
|
||||||
109 109 109 Index 109
|
|
||||||
110 110 110 Index 110
|
|
||||||
111 111 111 Index 111
|
|
||||||
112 112 112 Index 112
|
|
||||||
113 113 113 Index 113
|
|
||||||
114 114 114 Index 114
|
|
||||||
115 115 115 Index 115
|
|
||||||
116 116 116 Index 116
|
|
||||||
117 117 117 Index 117
|
|
||||||
118 118 118 Index 118
|
|
||||||
119 119 119 Index 119
|
|
||||||
120 120 120 Index 120
|
|
||||||
121 121 121 Index 121
|
|
||||||
122 122 122 Index 122
|
|
||||||
123 123 123 Index 123
|
|
||||||
124 124 124 Index 124
|
|
||||||
125 125 125 Index 125
|
|
||||||
126 126 126 Index 126
|
|
||||||
127 127 127 Index 127
|
|
||||||
128 128 128 Index 128
|
|
||||||
129 129 129 Index 129
|
|
||||||
130 130 130 Index 130
|
|
||||||
131 131 131 Index 131
|
|
||||||
132 132 132 Index 132
|
|
||||||
133 133 133 Index 133
|
|
||||||
134 134 134 Index 134
|
|
||||||
135 135 135 Index 135
|
|
||||||
136 136 136 Index 136
|
|
||||||
137 137 137 Index 137
|
|
||||||
138 138 138 Index 138
|
|
||||||
139 139 139 Index 139
|
|
||||||
140 140 140 Index 140
|
|
||||||
141 141 141 Index 141
|
|
||||||
142 142 142 Index 142
|
|
||||||
143 143 143 Index 143
|
|
||||||
144 144 144 Index 144
|
|
||||||
145 145 145 Index 145
|
|
||||||
146 146 146 Index 146
|
|
||||||
147 147 147 Index 147
|
|
||||||
148 148 148 Index 148
|
|
||||||
149 149 149 Index 149
|
|
||||||
150 150 150 Index 150
|
|
||||||
151 151 151 Index 151
|
|
||||||
152 152 152 Index 152
|
|
||||||
153 153 153 Index 153
|
|
||||||
154 154 154 Index 154
|
|
||||||
155 155 155 Index 155
|
|
||||||
156 156 156 Index 156
|
|
||||||
157 157 157 Index 157
|
|
||||||
158 158 158 Index 158
|
|
||||||
159 159 159 Index 159
|
|
||||||
160 160 160 Index 160
|
|
||||||
161 161 161 Index 161
|
|
||||||
162 162 162 Index 162
|
|
||||||
163 163 163 Index 163
|
|
||||||
164 164 164 Index 164
|
|
||||||
165 165 165 Index 165
|
|
||||||
166 166 166 Index 166
|
|
||||||
167 167 167 Index 167
|
|
||||||
168 168 168 Index 168
|
|
||||||
169 169 169 Index 169
|
|
||||||
170 170 170 Index 170
|
|
||||||
171 171 171 Index 171
|
|
||||||
172 172 172 Index 172
|
|
||||||
173 173 173 Index 173
|
|
||||||
174 174 174 Index 174
|
|
||||||
175 175 175 Index 175
|
|
||||||
176 176 176 Index 176
|
|
||||||
177 177 177 Index 177
|
|
||||||
178 178 178 Index 178
|
|
||||||
179 179 179 Index 179
|
|
||||||
180 180 180 Index 180
|
|
||||||
181 181 181 Index 181
|
|
||||||
182 182 182 Index 182
|
|
||||||
183 183 183 Index 183
|
|
||||||
184 184 184 Index 184
|
|
||||||
185 185 185 Index 185
|
|
||||||
186 186 186 Index 186
|
|
||||||
187 187 187 Index 187
|
|
||||||
188 188 188 Index 188
|
|
||||||
189 189 189 Index 189
|
|
||||||
190 190 190 Index 190
|
|
||||||
191 191 191 Index 191
|
|
||||||
192 192 192 Index 192
|
|
||||||
193 193 193 Index 193
|
|
||||||
194 194 194 Index 194
|
|
||||||
195 195 195 Index 195
|
|
||||||
196 196 196 Index 196
|
|
||||||
197 197 197 Index 197
|
|
||||||
198 198 198 Index 198
|
|
||||||
199 199 199 Index 199
|
|
||||||
200 200 200 Index 200
|
|
||||||
201 201 201 Index 201
|
|
||||||
202 202 202 Index 202
|
|
||||||
203 203 203 Index 203
|
|
||||||
204 204 204 Index 204
|
|
||||||
205 205 205 Index 205
|
|
||||||
206 206 206 Index 206
|
|
||||||
207 207 207 Index 207
|
|
||||||
208 208 208 Index 208
|
|
||||||
209 209 209 Index 209
|
|
||||||
210 210 210 Index 210
|
|
||||||
211 211 211 Index 211
|
|
||||||
212 212 212 Index 212
|
|
||||||
213 213 213 Index 213
|
|
||||||
214 214 214 Index 214
|
|
||||||
215 215 215 Index 215
|
|
||||||
216 216 216 Index 216
|
|
||||||
217 217 217 Index 217
|
|
||||||
218 218 218 Index 218
|
|
||||||
219 219 219 Index 219
|
|
||||||
220 220 220 Index 220
|
|
||||||
221 221 221 Index 221
|
|
||||||
222 222 222 Index 222
|
|
||||||
223 223 223 Index 223
|
|
||||||
224 224 224 Index 224
|
|
||||||
225 225 225 Index 225
|
|
||||||
226 226 226 Index 226
|
|
||||||
227 227 227 Index 227
|
|
||||||
228 228 228 Index 228
|
|
||||||
229 229 229 Index 229
|
|
||||||
230 230 230 Index 230
|
|
||||||
231 231 231 Index 231
|
|
||||||
232 232 232 Index 232
|
|
||||||
233 233 233 Index 233
|
|
||||||
234 234 234 Index 234
|
|
||||||
235 235 235 Index 235
|
|
||||||
236 236 236 Index 236
|
|
||||||
237 237 237 Index 237
|
|
||||||
238 238 238 Index 238
|
|
||||||
239 239 239 Index 239
|
|
||||||
240 240 240 Index 240
|
|
||||||
241 241 241 Index 241
|
|
||||||
242 242 242 Index 242
|
|
||||||
243 243 243 Index 243
|
|
||||||
244 244 244 Index 244
|
|
||||||
245 245 245 Index 245
|
|
||||||
246 246 246 Index 246
|
|
||||||
247 247 247 Index 247
|
|
||||||
248 248 248 Index 248
|
|
||||||
249 249 249 Index 249
|
|
||||||
250 250 250 Index 250
|
|
||||||
251 251 251 Index 251
|
|
||||||
252 252 252 Index 252
|
|
||||||
253 253 253 Index 253
|
|
||||||
254 254 254 Index 254
|
|
||||||
255 255 255 Index 255
|
|
|
@ -1,390 +0,0 @@
|
||||||
/* XPM */
|
|
||||||
static const char *hopper[] = {
|
|
||||||
/* columns rows colors chars-per-pixel */
|
|
||||||
"128 128 256 2 ",
|
|
||||||
" c #0C0C0D",
|
|
||||||
". c #0A0708",
|
|
||||||
"X c #1C0A04",
|
|
||||||
"o c #120B0C",
|
|
||||||
"O c #170808",
|
|
||||||
"+ c #0B110D",
|
|
||||||
"@ c #16120C",
|
|
||||||
"# c #0D0D12",
|
|
||||||
"$ c #0D0D1A",
|
|
||||||
"% c #070A16",
|
|
||||||
"& c #120D13",
|
|
||||||
"* c #120E1A",
|
|
||||||
"= c #1A0C16",
|
|
||||||
"- c #0D1114",
|
|
||||||
"; c #0D121B",
|
|
||||||
": c #091518",
|
|
||||||
"> c #131215",
|
|
||||||
", c #14131B",
|
|
||||||
"< c #1A141C",
|
|
||||||
"1 c #1B191D",
|
|
||||||
"2 c #191517",
|
|
||||||
"3 c #250906",
|
|
||||||
"4 c #390904",
|
|
||||||
"5 c #27150A",
|
|
||||||
"6 c #250A18",
|
|
||||||
"7 c #251719",
|
|
||||||
"8 c #361410",
|
|
||||||
"9 c #342215",
|
|
||||||
"0 c #0C0C24",
|
|
||||||
"q c #0C0D2B",
|
|
||||||
"w c #060927",
|
|
||||||
"e c #130D24",
|
|
||||||
"r c #150D2A",
|
|
||||||
"t c #0C1225",
|
|
||||||
"y c #0C122C",
|
|
||||||
"u c #061227",
|
|
||||||
"i c #151422",
|
|
||||||
"p c #1A1522",
|
|
||||||
"a c #1C1B23",
|
|
||||||
"s c #13132C",
|
|
||||||
"d c #19172A",
|
|
||||||
"f c #0C0D35",
|
|
||||||
"g c #130E37",
|
|
||||||
"h c #0D1436",
|
|
||||||
"j c #131333",
|
|
||||||
"k c #13143C",
|
|
||||||
"l c #191838",
|
|
||||||
"z c #241926",
|
|
||||||
"x c #231B38",
|
|
||||||
"c c #2E1226",
|
|
||||||
"v c #372628",
|
|
||||||
"b c #292538",
|
|
||||||
"n c #362B37",
|
|
||||||
"m c #2F2A2F",
|
|
||||||
"M c #1A2233",
|
|
||||||
"N c #4C150D",
|
|
||||||
"B c #740F10",
|
|
||||||
"V c #512916",
|
|
||||||
"C c #793419",
|
|
||||||
"Z c #6D2C13",
|
|
||||||
"A c #4E1524",
|
|
||||||
"S c #741624",
|
|
||||||
"D c #4E332E",
|
|
||||||
"F c #6F3629",
|
|
||||||
"G c #574438",
|
|
||||||
"H c #744831",
|
|
||||||
"J c #775A2E",
|
|
||||||
"K c #0E1444",
|
|
||||||
"L c #141443",
|
|
||||||
"P c #1B1A44",
|
|
||||||
"I c #14144B",
|
|
||||||
"U c #1A1B4C",
|
|
||||||
"Y c #181747",
|
|
||||||
"T c #1B1B53",
|
|
||||||
"R c #181955",
|
|
||||||
"E c #0F0E44",
|
|
||||||
"W c #231C46",
|
|
||||||
"Q c #231C56",
|
|
||||||
"! c #1C234E",
|
|
||||||
"~ c #272547",
|
|
||||||
"^ c #2E2F52",
|
|
||||||
"/ c #2E3765",
|
|
||||||
"( c #483947",
|
|
||||||
") c #742D4A",
|
|
||||||
"_ c #364970",
|
|
||||||
"` c #534A51",
|
|
||||||
"' c #6E534D",
|
|
||||||
"] c #756654",
|
|
||||||
"[ c #53556D",
|
|
||||||
"{ c #6B5B69",
|
|
||||||
"} c #746B71",
|
|
||||||
"| c #5E616A",
|
|
||||||
" . c #880C15",
|
|
||||||
".. c #881217",
|
|
||||||
"X. c #8D0D0F",
|
|
||||||
"o. c #8B3218",
|
|
||||||
"O. c #8C3828",
|
|
||||||
"+. c #AC2F30",
|
|
||||||
"@. c #9A1825",
|
|
||||||
"#. c #CE202B",
|
|
||||||
"$. c #8A452A",
|
|
||||||
"%. c #974A2B",
|
|
||||||
"&. c #884934",
|
|
||||||
"*. c #954B35",
|
|
||||||
"=. c #995539",
|
|
||||||
"-. c #895736",
|
|
||||||
";. c #A75738",
|
|
||||||
":. c #A84E30",
|
|
||||||
">. c #996839",
|
|
||||||
",. c #B6683B",
|
|
||||||
"<. c #AE6835",
|
|
||||||
"1. c #A35419",
|
|
||||||
"2. c #D26D19",
|
|
||||||
"3. c #CC712E",
|
|
||||||
"4. c #CD6922",
|
|
||||||
"5. c #A83152",
|
|
||||||
"6. c #985845",
|
|
||||||
"7. c #8A5748",
|
|
||||||
"8. c #AE5A46",
|
|
||||||
"9. c #916A4F",
|
|
||||||
"0. c #A96647",
|
|
||||||
"q. c #B76947",
|
|
||||||
"w. c #BA744A",
|
|
||||||
"e. c #B97757",
|
|
||||||
"r. c #AB6F53",
|
|
||||||
"t. c #8D736D",
|
|
||||||
"y. c #B27669",
|
|
||||||
"u. c #91566F",
|
|
||||||
"i. c #C56B4A",
|
|
||||||
"p. c #C8764B",
|
|
||||||
"a. c #C87856",
|
|
||||||
"s. c #D47A59",
|
|
||||||
"d. c #C96E53",
|
|
||||||
"f. c #C77C64",
|
|
||||||
"g. c #D17969",
|
|
||||||
"h. c #D45D68",
|
|
||||||
"j. c #C52A46",
|
|
||||||
"k. c #D58932",
|
|
||||||
"l. c #B38355",
|
|
||||||
"z. c #968775",
|
|
||||||
"x. c #BA8667",
|
|
||||||
"c. c #B38C74",
|
|
||||||
"v. c #AB9C73",
|
|
||||||
"b. c #C9845A",
|
|
||||||
"n. c #D7855B",
|
|
||||||
"m. c #D39454",
|
|
||||||
"M. c #E28C5B",
|
|
||||||
"N. c #F7B251",
|
|
||||||
"B. c #C78867",
|
|
||||||
"V. c #D98866",
|
|
||||||
"C. c #D8956A",
|
|
||||||
"Z. c #C79878",
|
|
||||||
"A. c #D89876",
|
|
||||||
"S. c #CD8C70",
|
|
||||||
"D. c #E38A68",
|
|
||||||
"F. c #E5956A",
|
|
||||||
"G. c #E79776",
|
|
||||||
"H. c #ED9176",
|
|
||||||
"J. c #D6A371",
|
|
||||||
"K. c #E8A379",
|
|
||||||
"L. c #F3A677",
|
|
||||||
"P. c #D8A05D",
|
|
||||||
"I. c #3D65AB",
|
|
||||||
"U. c #3F67B2",
|
|
||||||
"Y. c #3B5C9C",
|
|
||||||
"T. c #506796",
|
|
||||||
"R. c #72748D",
|
|
||||||
"E. c #446AAE",
|
|
||||||
"W. c #4869A9",
|
|
||||||
"Q. c #4166B2",
|
|
||||||
"!. c #436BB3",
|
|
||||||
"~. c #496EB4",
|
|
||||||
"^. c #476DB9",
|
|
||||||
"/. c #4A71B6",
|
|
||||||
"(. c #4C73BA",
|
|
||||||
"). c #4772B6",
|
|
||||||
"_. c #5176BC",
|
|
||||||
"`. c #547BBD",
|
|
||||||
"'. c #577BB7",
|
|
||||||
"]. c #5572A9",
|
|
||||||
"[. c #6B7CAA",
|
|
||||||
"{. c #505B8C",
|
|
||||||
"}. c #557CC1",
|
|
||||||
"|. c #4C73C2",
|
|
||||||
" X c #897987",
|
|
||||||
".X c #9F7593",
|
|
||||||
"XX c #C46B87",
|
|
||||||
"oX c #5981BF",
|
|
||||||
"OX c #5884BD",
|
|
||||||
"+X c #768AB9",
|
|
||||||
"@X c #7288B5",
|
|
||||||
"#X c #5C83C3",
|
|
||||||
"$X c #5D8AC5",
|
|
||||||
"%X c #6186C5",
|
|
||||||
"&X c #648AC6",
|
|
||||||
"*X c #6B8DC6",
|
|
||||||
"=X c #668BC9",
|
|
||||||
"-X c #6B8ECA",
|
|
||||||
";X c #6586C6",
|
|
||||||
":X c #738DC7",
|
|
||||||
">X c #6D91CB",
|
|
||||||
",X c #6C94C6",
|
|
||||||
"<X c #7294CC",
|
|
||||||
"1X c #7895C8",
|
|
||||||
"2X c #6E92D1",
|
|
||||||
"3X c #7294D3",
|
|
||||||
"4X c #7698D5",
|
|
||||||
"5X c #708ED1",
|
|
||||||
"6X c #7799E3",
|
|
||||||
"7X c #9B9399",
|
|
||||||
"8X c #928890",
|
|
||||||
"9X c #B89887",
|
|
||||||
"0X c #A99191",
|
|
||||||
"qX c #B9A598",
|
|
||||||
"wX c #B1A394",
|
|
||||||
"eX c #8C8EAA",
|
|
||||||
"rX c #AB9AA6",
|
|
||||||
"tX c #ABA4A9",
|
|
||||||
"yX c #B7A9A8",
|
|
||||||
"uX c #B7ABB4",
|
|
||||||
"iX c #B6AFB7",
|
|
||||||
"pX c #C69B86",
|
|
||||||
"aX c #D4978B",
|
|
||||||
"sX c #EF9C83",
|
|
||||||
"dX c #CAA487",
|
|
||||||
"fX c #D7A787",
|
|
||||||
"gX c #C7A899",
|
|
||||||
"hX c #D1B294",
|
|
||||||
"jX c #E9A887",
|
|
||||||
"kX c #F8A886",
|
|
||||||
"lX c #F9B798",
|
|
||||||
"zX c #F1B291",
|
|
||||||
"xX c #C9B3AD",
|
|
||||||
"cX c #F4B9A5",
|
|
||||||
"vX c #D497B3",
|
|
||||||
"bX c #D5C6B1",
|
|
||||||
"nX c #FEC4A6",
|
|
||||||
"mX c #EAD0B2",
|
|
||||||
"MX c #EDD1A4",
|
|
||||||
"NX c #8399C8",
|
|
||||||
"BX c #B2B4CD",
|
|
||||||
"VX c #C7BBC7",
|
|
||||||
"CX c #D3CBCF",
|
|
||||||
"ZX c #ECDAD1",
|
|
||||||
"AX c #F6E6DA",
|
|
||||||
"SX c #F7EACF",
|
|
||||||
"DX c #D1D1E9",
|
|
||||||
"FX c #E7DDE4",
|
|
||||||
"GX c #E9E5E8",
|
|
||||||
"HX c #F7EAE6",
|
|
||||||
"JX c #FDF6E9",
|
|
||||||
"KX c #FEFCFE",
|
|
||||||
"LX c #FAF7F7",
|
|
||||||
"PX c #F1EBF6",
|
|
||||||
"IX c #DCE2E5",
|
|
||||||
"UX c #BEC5DF",
|
|
||||||
/* pixels */
|
|
||||||
"L k f k P l y j T R I I U U L U R Q T L E E E R R R E U j } GX9XfXpXxXR.j ~ ~ = V Z.G > b R.DXPXLXHXHXHXHXCX~ / T.Y.T.T.W.T.W.E.Q.I.E.I.I.E.E.I.I.I.I.I.Y.I.Q.^.Q.E.E.E.E.Q.Q.~.U.U.U.U.U.U.Q.Q.U.U.U.U.U.U.Q.Q.Q.Q.U.U.U.Q.~.~.Q.U.Q.~.^._._._._._._._._.(.(.(.",
|
|
||||||
"L k f L L k y h T R I L U U L U R R T L E E E R I R I U l XuX' fXV v [ / P h z V Z.G a y l [ 7XCXHXJXHXHXCXb ! {.{.T.{._ _ {.T.W.W.T.T.W.I.I.U.U.I.I.E.W.I.I.Q.Q.E.E.E.Q.Q.~.~.~.U.U.U.U.Q.Q.Q.Q.U.U.U.U.U.Q.~.~.~.U.U.U.U.U.Q.~.Q.Q.Q.~.~._._._.'.`._._._._._.",
|
|
||||||
"L k f L L k 0 h T T I E U U L T T T U L h h E U R R E U W R.{ D pXF z l L U ^ p F fXD i P W Y ~ n CXHXHXHXFX8Xl W ~ ~ l ^ b b ^ ^ / [ T.W._.U.^.U.U.Q.E.W.W.~.^.E.E.E.~.~.Q.~.~.~.~.~.~.~.~.Q.Q.Q.Q.U.U.U.U.U.U.~.Q.U.U.U.U.U.U.^.~.~.Q.~.~._._.`.`.`.`._._.|.|.",
|
|
||||||
"k k f L L k 0 h U T L h I U I T T T U k h k E U Q I E U k ` m ' hXV z k U I Q d V fX( j L U W W z VXLX8X XuX( z b x d ` X X` n n b b ! {.W.~.I.Q.Q.Q.E.W.].~.I.~.~.~.~.~.~.~.Q.~.~.~.~.~.~.~.~.~.Q.Q.Q.U.U.U.U.U.Q.U.U.~.~.Q.Q.Q.Q.Q.Q.Q.~._._._._._._._._.|.|.",
|
|
||||||
"k k f L L k q j U T L h U U I T R T U k h h E I E R I I k b p ' Z.V z k ! T U p H Z.c k U L U W n CXCXn z = c c v 7X8X` 8XPX} c R.tX` n b / {.].W.~.~.E.W.E.~.^.~.~.~.~.^.~.~.~.~.~.E.E.~.~.~.~.~.~.~.~.~.~.U.U.~.U.~.~.~.~.~.Q.U.Q.~.~.E.~.~./././.(.(.(.(.(.(.",
|
|
||||||
"h k h P L k q j U T L h U U I T R T U h h h E E I R I E k d p ' dXV x P U L L z J fXv l L L P j n IX` m = = 7 ' HXLXKXCX7XKXtXrXLXKXJXqXv n ^ {.T.T.T.W.].E.Q.^.~.~.~.~.^.^.~.~.E.E.E.E.E.~.~.~.~.~.~.~.~.~.U.U.~.~.~.~.U.U.U.U.Q.Q.~.~.E.~.~.E.~.~.~./././.(.(.",
|
|
||||||
"j k k P Y k q h U U k h U R I R R T U h h h E E R R E I Y d d ' Z.V p L ! ! Y = H Z.v j h ! l b n iXtX7Xa p t.LXZX0XHXPXKXKXPXLXLXCXbXAXVXn m 8XVXeX[.T.W.W.^.^.~.~.~.^.^.^.^.~.E.E.E.E.E.~.U.U.~.~.~.~.~.~.~.~.~.~.~.U.I.I.I.~.~.Q.Q.~.~.~.~.E.~.~.~./.(.(.(.(.",
|
|
||||||
"j k k U P k 0 y L U k h U R I R T Q T E f E E E E I I I f k z ` Z.V d U T L P z >.B.c j l l l } IXKXKX8Xp ` t.` t.' G ] tXIXIXwX] ' z.t.` { c n PXKXLXUX+X].E.~.~.~.~.~.^.^.^.~.Q.E.E.E.E.U.U.U.~.~.~.~.~.~.~.~.~.~.I.I.I.I.~.~.~.Q.Q.Q.~.~.~.~.~.~.~./.(.(.(.(.",
|
|
||||||
"j k R.~ k k q q Y T k f Q T I I I Q I L E L E E R I I E f d x ` dXV d T T T U z -.Z.c b s b CXLXKXLXKX} z 7 7 z.hXSXSXz.AXbXmXbX0XJXmXmX` 1 n b iXKXLXLXLXDX@XT.].W.E.(.U.|.^.^.~.~.W.E.~.~.~.~.~.~.U.~.~.~.~.~.~.U.I.I.I.U.~.~.Q.~.~.~.~.E.~.~.~.~.~.~.~.~.^.^.",
|
|
||||||
"j ~ DX[ W q s q Q I f h Q L R R R R I I L f E I I I I L P d x ` dXV d R R T Y z -.Z.7 0 ` GXLXKXJXLXJX` 7 7 7 t.hXMXmXJXLXJXJXJXJXSXSXmX' n z b 7XKXKXPXKXLXPXBX].T.W./.^.^.U.|.~.~.~.~.~.~.~.^.~.U.U.~.~.~.~.~.~.~.U.U.I.U.~.~.~.~.~.~.E.E.~.~.~.~.~.~.~.~.^.^.",
|
|
||||||
"r x DXIX~ s $ b L U L L Y Q L I I I T L f L U E T T L k k d x ` dXV x T R U L p 9.Z.7 | KXKXLXLXJXSXZXD v 7 7 D mXMXmXSXZXZXCXZXAXZXdXmXG v n n 7XKXLXKXKXKXLXKXDX[.T.]./.I.}.U.~.~.~.~.~.~.~.U.~.U.U.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.U.~.~.~.~.^.^.^.^.",
|
|
||||||
"r b CXPX X[ iX[ Y U L k P [.~ k U T U L f f f L I U U k f d x ` dXV z T T U L z 9.x.D LXHXJXJXZXqXqXmXD @ 7 7 9 ] mXbXJXKXKXKXLXJXJXMXv.9 7 7 7 } HXKXKXHXLXJXLXKXDX[.T.W.(.~.^.Q.Q.E.E.E.~.U.U.~.U.U.U.~.U.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.U.~.~.~.~.~.^.^.^.",
|
|
||||||
"d x VXKXPXGXCX` P U L Y ~ BX| l k P k k k P w k h L L P j d d ( dXZ z P ! L k z 9.B.mXJXJXSX9Xz.t.D 5 5 5 7 7 9 hXmXv.mXLXKXKXKXJXSXv.mX] v c v D t.xXZXJXJXJXLXPXKXUXT.W.E.~.~.Q.Q.E.E.E.E.Q.Q.~.I.I.~.~.E.E.~.~.~.~.~.~.~.~.~.~.~.~.I.~.~.U.U.~.~.~.~.^.^.^.(.",
|
|
||||||
"x 8XGXPXHXHXtXb k U U k l CXtXd b ~ | {.j q k f P / h k k d d ( dXF < k ! L k z 7.zXSXJXSXt.] V 3 3 X 5 @ 2 c 7 z.v.bXSXAXKXLXLXZXmXhXMX' 7 n 7 9 3 8 ] qXZXJXLXLXKXPX@X].W.I.^.~.~.~.E.E.~.~.~.E.I.E.~.~.E.E.~.~.~.~.~.~.~.~.~.~.~.~.~.~.U.U.U.~.~.~.~.^.^.(.(.",
|
|
||||||
"uXGXHXLXJXAX} & W Q g g ~ DXCX` [ VXDX[ s j s y ^ eX~ j j d l ( pXF 7 k ! L L z 7.nXJXAX] D 3 3 3 X ' ] 7 1 = 9 t.SXSXMX9XZXJXJXxXmXSXSXJ v v 7 9 ] 9 9 5 ' 9XxXJXHXGXDX{.'.).~.~.~.E.E.E.E.~.~.~.~.~.~.~.E.I.~.~.~.~.~.~.I.I.~.~.~.~.~.~.~.U.~.U.U.~.~.^.(.(.(.",
|
|
||||||
"iXFXPXLXLXLXyX( k W k ~ b CXGXFXPXGXtXl l s 0 j ^ DX` d d d x D pXF z P T L P z ' AXAXz.5 X 3 9.] 9 5 v.5 G ` 9 J hXhXhXmX9X' ] qXhXhXMX] 9 D 9 G z.5 ] t.8 8 G wXHXPXIX[.T.W.].~.~.~.~.E.E.~.~.~.~.~.~.~.E.E.~.I.~.~.~.~.I.I.I.~.~.~.~.U.U.U.~.U.U.U.~.^.(.(.(.",
|
|
||||||
"d n } LXLXCXVX[ W W d ` tXHXAXAXHXIX^ x j l w s ` GX7X7 n } ~ D dXH p k ! P k l ` xX8X2 @ 5 7 gXbXhXhXv.hXmXSXmXMX9.J 5 5 V 9 9 9 V G dXhXSXSXdXhXl.MXMXdXV J V 9 wXLXFXtXR.T.T.W.~.^.~./.E.E.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.).~.~.~.^.^.^.^.~.^.(.(.(.",
|
|
||||||
"d d [ LXVX( ^ ~ k ^ 7XFXLXHXJXHXAX} x l k w l i ` GXCX8XbX Xx v Z.H z k ! P d d i . & @ . 2 7 v z.v.V dXmXdXZ.mXSXSXSXbXt.` 7 D ] bXJXSXSXSXMXSXSXl.hXMXhXmXMXV 5 v xXxX} ^ ! {.W.~.^.U.).E.E.E.~.~.E.E.~.~.~.E.~.~.~.~.~.~.~.~.~.~.).).).).(.(.(.(.(.(.(.(.(.(.",
|
|
||||||
"f ~ ` PXR.l l j Y ~ { uXFXLXJXHXFXuX~ W f f d a } HXZXxXyXn d n Z.H 7 j P l j r p & o @ @ @ o 7 X 9 D ] V 5 hXbXqXv.] G D ` n ` G ' 0X9XmXmXz.G 9.9.3 8 ] hXgX9XwXv D z > $ l ! W.~.^.U.).E.~.E.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.^.~.)./.(././.(.(.(.(.(.(.(.(.(.(.",
|
|
||||||
"g W ^ DX( l l q L W r b ` CXLXLXPXPXR.k k ^ | 8XCXHXbXxX{ < d v Z.J 7 j l d r * . > 2 o . @ 2 = 7 X X 5 D 5 5 5 9 9 9 @ 7 7 2 v 7 7 v 9 v V D G qXgXxXD 3 3 ' z.D 9 2 > 1 # d u Y.W.~.~.).E.W.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.^.~.)././././.(.(.(.(.(.(.(.(.(.(.",
|
|
||||||
"U U / eXP P l f L L d r b CXPXR. XUXDX/ k ~ ` 7XCXZXZXyXv p k v B.-.o d l i * * & o o 2 @ . & . < & o 7 o 7 2 @ @ @ 7 2 v < z < z 7 2 7 9 7 5 9 ] z.ZXCX` 7 5 X @ @ & . o # % u _ W.E.E.E.E.E././././././.~.~.~.~.~.~.~.~.~.~.~././.(.(./.(.(.(.(.(.(.(.(.(.(.(.",
|
|
||||||
"f U ~ / L U k f U Y k x d DXVX~ x W {.[ f d 2 7 t.ZXZXxX} x k z x.-.3 d a $ & & . 2 o . @ . # p # , & . > & o z 7 2 2 2 o & < & < . > 7 > 7 7 7 v ' m 7 @ 2 . @ . + . > . > % y _ W.E.E.E.E.~./././.(.(././.~.~.(.(.~./.~.~.~.~.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.",
|
|
||||||
"I T P P ^ ~ k k L U q l ~ DX{.W W Q Q ~ d * * o { HXxXVXCX^ q z x.>.5 i , # & & > o > . + + > . # . * * . < & . o o 2 7 & 2 2 2 > > < > 2 7 o o @ . @ . o . . + . . # & . . ; u / ].W././././.(././.(.(././././.(.(.(.(.(.(././.(.(.(.(.(.(.(.(.(.(.(.(.(.(.}.}.",
|
|
||||||
"E Q L P Q Q P f f L k k ^ BXU ~ P W T Y j i * * XFX` b 7XR.l 7 l.>.7 , # # < o o . > . - - - $ # # . & , . & . o o o . . o . o o . . . . . o o o @ . . . . 2 . + . - . > > . w _ ].W./././.~.(./.(.(.(.(././.(.(.(.(.(.(.(.(.(.(./.(.(.).).(.(.(.(.(.(.(.(.(.}.",
|
|
||||||
"I U U U T Q k h L L h P Q / T L U T T U j 0 0 r 7XuXd r d ^ l < r.0.5 ; - - - & . > # # - + % # . . + . # # . . . . . . . . . . & # . . o o o o . o o . . . . . + . # # . > ; w _ ].]./.E.(.(.}.(.(.(.(./././././.(.(.(.(.(.(.(././././.(.(.(.(._.(.(.(.(.(.(.(.",
|
|
||||||
"L U U U T Q k q k L k P U Q U U U T T U k q q r X( j d 0 t y 7 r.0.@ ; + - - & . > & . . - - , - + + + . . + > . . . . . . . . . . . . o o o o o o o . . . . . . . % . . . - t / ].].]./.`.(.|.(.(._._.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.",
|
|
||||||
"L U U T T Q k q k k k P I I I T R R T U L f q f / L W q w s s 2 0.r.X ; % - # # > > . # > + . . . . . @ @ o . o o o o o o o o o o o o o o o X X o o o o o . # # - . # > o . # w ^ ].].'./.`.(.}.(._.`.`.`._._._.`.`.`.`._.(.(.(._._.(.(.(.(.(.(.(.(.(.(.(.(.(.(.",
|
|
||||||
"L U I T R Q j q k k h L I I R T R R T U L f q f E T U f j j 0 7 0.l.X ; % - # . . # . . . . o @ X X X X X X X 3 3 3 3 3 o o 3 3 o o 3 3 3 3 3 3 3 3 X X o X o o . . . & o o - % ! ].].'./.(.(.}.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.(.`.`._.(.(.(.(.(.(.(.(.(.(.(.(.(.",
|
|
||||||
"k U U T R Q k q l k f L T I T T R R T U k f 0 q I R E L q q q 7 >.l.X , % + . . . & = o @ X X X 3 4 N N N V V V V N N N N N N N N N V V F F H H H H F V 8 3 3 3 o . & o . . > % P ].].'./.'._.}.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.(.(.(._._.`.(.(.(.(.(.(._._.",
|
|
||||||
"k P U T R Q k q k k k L T I T T R R T U k q 0 q I I T f w j j 6 >.r.3 - . + + . > . X @ X X 3 N F 6.r.y.y.y.y.y.y.r.r.0.6.7.6.7.7.6.6.0.r.y.B.B.y.y.x.x.y.7.V 3 X . & & @ . # % h ].].'.'.'.`.}.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`._._._._.(._._.}.",
|
|
||||||
"k P U T Q Q k q f l k L T E T T R R R U j 0 0 y k E I L k j q 7 0.<.3 # . + . . o o X X 3 9 ' c.Z.A.aXaXaXaXjXjXjXA.A.A.S.B.S.B.S.S.A.A.G.K.K.G.A.C.C.Z.A.Z.r.' 9 o X o o @ - ; u ].].'.'.'.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.}.}.`.`.`.`.`._._._.}.}.",
|
|
||||||
"d W U R R Q k q f k g L T I Q R T R R U j 0 0 y k L I I f f f 6 r.>.3 # . . . . X 7 7 8 G t.pXaXaXA.A.fXzXzXzXlXzXjXzXlXzXzXzXzXkXzXkXzXlXlXzXjXK.K.K.A.A.K.Z.c.t.G 5 3 X o . t u '.'.'.'.'.'.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.}.`.}.}.`.`.`.`.`.`.}.}.}.}.",
|
|
||||||
"` b U Q R Q k q q l L L L T T R T T R U k 0 0 t j U I E L f f 7 r.r.X . . @ o o v ' F H y.Z.fXfXK.jXjXzXzXzXzXlXcXlXzXlXzXzXnXcXzXlXlXlXzXnXnXcXlXjXzXA.jXA.J.B.c.t.-.D 3 X & % K '.'.].'.'.oX`.oX`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.}.}.`.}.}.}.#X#X",
|
|
||||||
"xXz W Q I _ ~ y j j f U I I U U U R T U k q 0 t k U I L L f f = 0.l.X @ @ . . 9 ' ' H 0.B.A.fXfXjXjXzXzXzXlXcXcXzXzXlXnXcXzXzXzXcXcXlXcXzXzXzXzXzXcXjXA.G.A.C.B.Z.y.e.-.D o @ % K '.'./.'.'.'.oXoXoX`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.}.}.}.}.}.}.}.}.}.}.",
|
|
||||||
"HX7Xx ^ eXBXM $ l x Y U R R I R I I T U k q 0 y k U I I k j j = 0.l.X > o o 7 D ' H 7.y.B.A.fXfXjXzXzXzXzXzXjXjXzXzXlXnXlXzXzXzXjXzXzXsXsXD.B.e.x.x.S.A.B.B.S.Z.Z.c.l.e.' 7 @ , ! [.'.`.'.'.oX#XoXoXoXoXoXoXoXoXoXoXoXoXoX`.`.`.`.}.}.#X#X}.#X#X}.}.}.#X}.#X}.}.",
|
|
||||||
"AXZX{ CXPX| d 0 ` R.d Y U R I U E L R U k q q y L U U U k h l o r.l.X > . o v D H H r.x.l.B.A.A.B.B.B.e.e.e.B.S.jXzXzXlXzXzXcXzXfXjXjXD.D.a.q.e.r.e.Z.A.jXA.Z.Z.Z.c.e.e.9.G 5 # ^ [.'.`.'.'.'.'.oXoXoXoX#X#XoXoX#XoXoXoXoXoXoXoX#X#X#X#X#X#X#X#X}.}.#X#X#X#X#X#X",
|
|
||||||
"ZXHXHXGXVXb i i ` FX^ W Y g ~ P k L U I k q q q L U I U k q y @ >.l.X $ & 7 9 F ' 7.r.e.x.Z.A.A.A.V.a.a.a.f.B.A.A.jXzXzXzXzXlXzXzXfXA.D.D.8.*.=.*.6.r.B.fXaXfXc.c.Z.B.9.t.` v 7 ^ @XoX'.'.#X%X}.#XoXoXoX#X#X#XoXoXoXoXoX#X#X#XoX#X#X#X#X#X#X}.}.#X#X}.}.#X#X$X$X",
|
|
||||||
"HXAXZXFX{ x b # { FXrXx x {.eX^ k L U L k q 0 q f L E E f 0 t @ >.<.X , & 7 G 7.7.9.r.x.Z.Z.S.S.B.e.0.6.6.0.0.0.B.A.jXK.A.jXlXzXjXfXA.g.i.:.%.*.O.Z F Z Z F F F H ' -.7.t.` v c [ @X@X'.oX=X#X#XoXoXoX#X#X#X#XoX#XoXoX#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X;X;X",
|
|
||||||
"ZXAXZXGX` b & & ` ZXHX} uXGX8Xl k L U L j r r 0 r W Y f q 0 i 5 w.>.5 , . 9 7.9.-.-.9.c.c.x.B.B.x.r.9.7.7.6.r.y.r.B.A.jXG.jXlXlXzXK.B.e.0.=.C N Z &.6.*.&.H N V t.' V F ' { v v [ @XoX'.oX#X`.#X#X#XoX#X#X#X#XoX#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X$X",
|
|
||||||
"AXJXHXFXIX^ x = ] ZXAXAXCXVXb j k L U Y d i & & x ^ ~ f q q i X 0.<.5 & 7 D 9.9.-.J H ' G V V N 4 8 N N N N V Z $.r.G.lXlXzXlXnXlXK.b.0.C C 6.B.r.y.y.S.r.c.SX9.8 V A D ` ' D D R.eX+X%X$XoXoX$X#X#X#X#X#X#X#XoX&X#X#X#X#X#X#X#X#X#X#X#X%X%X#X#X#X#X#X#X#X#X#X#X",
|
|
||||||
"gXAXCXFXPXuXz D bXAXSXZXCX{ b k L L Y W r ` n v 7XtXx j w r r 3 0.>.8 2 9 ] y.9.H F 8 D D V N 0.cXaXy.r.r.B.S.*.O.Z <.n.kXkXL.L.F.p.;.0.jXy.9.V N N F F r.r.c.MXD V ' F D ' u.' XR.+X%X$X$XoX#X#X#X#X#X#X#X#X#X#X#X%X&X&X%X#X#X#X#X#X%X%X%X#X#X%X#X#X#X#X#X;X;X",
|
|
||||||
"z.ZX` ( { eX{ n CXZXZXZXxXm x k L U Y W r ` } z.iX` r w r r 0 3 0.>.8 D G 9.r.-.F V 3 8 3 N r.y.y.7.F V V N &.B.a.w.p.p.F.F.F.b.p.,.,.q.0.6.V H N V V N C $.H C H F V N V H r.9XgXrX[.*X&XOX&X=X%X%X%X#X#X#X#X#X&X&X&X&X&X&X%X%X%X%X%X%X%X%X%X#X#X#X#X%X%X;X=X=X",
|
|
||||||
"z.xXx ~ f x x z t.ZXAXAXCX} x Y U T U k p v ] ] } z r r 0 r s 6 r.r.8 D 9.r.6.C V V D D 8 7.9.r.' V N N N N Z F 0.;.;.s.n.p.a.p.3.1.p.p.;.Z O.V 4 N N N B o.o.%.0.-.H H &.r.f.6.y.yX@X:X'.oX-X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X%X%X%X%X#X%X%X%X&X=X=X=X",
|
|
||||||
"} } k W U k 0 & v CXAXCXGXCX~ f L T U k z D t.] 9 o p d w r d = >.l.N D c.e.0.6.F H V F V H F 6.V N V 4 4 N &.6.C O.%.s.i.F.zXkXF.n.M.s.;.i.8.=.&.O.F O.%.%.;.q.B.e.b.w.;.;.q.o.Z 0XeX:X[.@X-X'.&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X%X=X=X=X=X=X%X%X",
|
|
||||||
"[ ( Q L I U r * 7 CX8Xv } iXR.j L T U k r ( } t.{ . r r s 0 r 6 >.w.N ' y.$.$.=.6.6.6.r.6.$.O.O.O.C O.O.=.=.=.w.d.n.n.M.:.G.lXlXL.,.H.H.D.d.q.g.a.q.0.,.q.d.s.p.a.b.C.w.<.;.d.s.Z t. X[.:X;X;X=X&X&X&X&X&X&X&X&X=X=X=X=X&X&X&X&X&X&X&X=X=X=X=X=X&X=X=X=X=X;X;X%X",
|
|
||||||
"~ k L T T U 0 $ b CX` x x x ^ k L L U P d ( ' } 7X` r r s s 0 o 0.w.4 7.6.O.8.8.0.6.B.B.0.;.o.o.o.o.:.s.G.V.s.V.s.H.kXF.%.G.lXlXlXF.H.L.D.s.H.G.kXzXsXD.s.D.F.n.V.V.V.w.<.n.V.a.O.y. X[.:X;X;X2X=X=X=X=X=X=X=X=X=X=X=X=X=X&X&X&X&X&X=X=X=X=X=X=X%X=X=X=X=X=X=X=X",
|
|
||||||
"f k Y U L k 0 $ b 7Xj W Q L k q L U U Y r p 2 7 [ } d d 0 s t o r.r.4 F &.o.q.8.=.;.a.C.w.w.:.O.O.;.d.sXsXkXH.s.i.L.lXs.q.kXlXzXlXK.a.kXkXV.a.G.L.H.D.M.p.D.F.V.A.A.A.B.q.D.kXV.%.y.eXoX@X*X$X=X=X=X=X=X=X=X=X-X=X=X=X=X=X=X&X&X&X&X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
|
|
||||||
"k j L k P P q 0 x ^ Y Q R R L k h U U k j * # * p x k l q 0 t @ >.w.8 V 6.C a.g.q.%.w.n.p.p.d.q.:.i.i.V.s.i.q.d.lXkXH.,.V.lXlXlXzXlXs.G.K.lXkXn.n.i.p.i.p.p.G.C.B.V.B.B.a.q.V.A.=..X@X*XoX-X=X$X=X=X=X=X>X-X-X>X-X-X-X-X-X=X=X&X-X-X-X=X=X=X&X&X=X=X=X=X=X=X=X=X",
|
|
||||||
"j k L U U k q 0 j j Y U U L L L Y W L k y w ; $ 0 q h k q y y o >.w.4 8 r.O.V.s.8.%.d.s.n.p.n.q.%.i.p.a.a.f.sXlXlXzXF.q.kXlXnXcXnXnXjXB.zXlXlXnXlXkXG.V.V.G.L.F.V.n.b.b.8.o.i.D.r.t.@X+X@X*X-X>X>X-X*X*X*X-X*X*X*X*X-X>X-X*X&X*X-X-X-X-X=X=X&X&X=X=X=X=X=X=X=X=X",
|
|
||||||
"j k L U U k q 0 j f k Y Y k k L U W L k y u t 0 w j f f k y s 3 0.l.3 V r.=.D.s.:.%.i.i.n.n.V.q.,.s.G.kXlXnXnXcXlXnXb.C.zXlXcXnXnXlXnXS.G.zXlXlXlXlXzXK.K.K.F.V.V.n.,.C.d.o.;.S.c.8XeX:X@X;X-X=X>X-X*X*X*X-X*X*X>X-X-X-X-X*X*X*X-X-X-X-X=X=X=X=X=X=X=X=X=X-X-X=X",
|
|
||||||
"j k L L P j 0 0 j k L P Y k k L U U L h y 0 r r f f f f k w i 5 >.w.V 9XcXe.V.V.%.q.s.i.p.n.b.w.:.,.L.nXnXnXnXnXnXlXq.jXlXlXcXnXnXlXlXjXq.sXzXzXlXlXK.F.G.F.V.n.V.p.w.C.sX8.q.f.9X8X+X*X*X-X2X-X>X-X-X-X-X-X-X-X>X-X-X-X-X-X*X>X-X-X-X-X-X=X=X=X=X=X-X-X-X-X-X-X",
|
|
||||||
"h k L L P j 0 0 j k Y U P Y k Y Y U k h y w r r j r j f y t r X C C.c.hXcXA.K.p.w.A.C.q.<.p.a.b.p.i.F.lXcXnXlXzXjXq.q.G.kXlXcXlXnXnXnXzX0.:.s.H.G.G.G.K.kXkXF.n.a.e.b.C.kXD.q.y.0XeX+X*X*X-X-X=X>X>X-X-X-X-X-X-X>X-X-X-X>X-X-X>X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
|
|
||||||
"h k L L k s $ $ y j L Y Y L L Y Y U k h y 0 r r r f k r r d & 9 w.C.c.hXcXA.G.n.C.jXG.q.<.p.w.b.D.i.p.D.kXkXV.i.;.:.D.H.kXlXnXcXcXlXlXlXsXi.8.8.:.;.a.G.G.G.F.a.a.a.l.C.kXs.q.S.8X@X:X>X-X-X>X=X>X-X-X-X-X>X-X-X-X-X*X>X>X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
|
|
||||||
"k k L L l t $ $ y k L Y L L L Y Y P k h y 0 r r r f f s r # 7 t.J.P.c.hXMXfXC.G.C.K.K.a.q.i.w.p.F.M.i.:.%.;.;.:.o.s.kXH.kXzXcXlXlXlXzXzXsXH.8.H.H.H.sXkXD.V.V.a.b.e.B.A.G.q.V.B.8X@X*X-X-X-X2X2X>X>X-X-X>X>X>X-X-X-X-X>X>X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
|
|
||||||
"k L L L l t % $ y k L I P P L L L Y h h y y s q r r r s * & ' hXK.J.x.hXcXx.B.K.C.A.J.b.i.i.p.b.a.F.D.s.V.H.V.i.:.H.D.V.G.sXzXzXjXG.sXV.s.s.:.q.H.kXkXH.D.n.n.V.b.e.B.A.b.V.G.c.eX:X>X-X&X*X*X&X>X>X-X-X>X>X>X>X>X-X>X>X>X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
|
|
||||||
"k k L k j t # ; y k L I L L L k g L f h y y s 0 q r s r * D wXgXJ.P.x.cXMXl.b.C.jXA.C.e.q.i.a.b.p.n.V.H.sXkXV.%.o.;.O.%.q.q.f.B.B.f.8.:.Z O.B O.s.G.H.D.H.V.V.C.B.e.B.0.C.K.s.pXeX&X=X-X,X,X<X*X>X>X-X-X>X>X>X>X>X>X>X>X>X-X-X>X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
|
|
||||||
"f P k f ~ 0 $ ; j w I T L L f L Y P k y y y y % 0 w y i ` 0XgXhXP.P.x.cXhXl.x.A.b.b.%.w.p.i.a.n.p.n.V.D.G.V.:.o.V.q.Z Z C o.$.$.$.O.=.o.%.g.:.B :.s.g.s.V.n.V.C.V.B.e.q.q.w.A.9X+X-X=X>X*X*X*X,X*X>X>X>X>X-X>X>X<X>X>X-X-X*X*X*X-X-X-X-X-X-X-X-X-X-X-X-X-X2X3X3X",
|
|
||||||
"d j f W s s $ % s k g L L k h g g k f y t t t t w y t | tXwXgXfXP.P.B.cXhXc.x.A.C.B.C.K.V.i.p.n.n.a.F.V.V.i.o.i.G.G.V.V.V.0.o.N C 8.g.V.g.D.i.Z B ;.d.s.s.s.V.C.B.C.kXG.K.C.fX0X+X=X=X-X*X*X*X:X*X>X>X>X>X-X>X>X>X>X>X-X*X*X*X*X-X-X-X-X-X-X-X-X-X-X-X-X-X-X>X>X",
|
|
||||||
"p d W / d $ i i 0 k P U P k L k g f q q i i $ i $ d 8XiXrXgXgXfXP.P.B.cXhXZ.x.S.jXA.jXkXsXa.p.n.F.n.n.V.i.O.:.D.H.D.H.V.H.H.g.q.a.V.s.V.s.a.V.q.B o.:.,.i.s.V.C.V.C.jXzXC.fXgX8X+X*X-X>X,X*X:X,X*X>X>X>X-X-X>X>X>X-X-X*X*X*X*X*X*X*X-X-X-X-X-X-X-X-X-X-X-X-X-X>X",
|
|
||||||
"( m X[ d s $ $ l q j k k k h f g k j 0 i , & * x 7XiXtXyXqXgXdXP.P.B.cXhXZ.r.e.jXzXjXlXjXa.b.V.C.n.a.p.%.o.s.D.H.H.G.H.G.G.sXH.sXH.V.V.D.V.H.s.O.B O.;.a.V.s.b.b.A.zXjXK.dX0X8X+X*X-X>X,X:X:X,X*X>X>X>X-X-X-X>X-X-X-X*X*X*X*X*X-X*X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
|
|
||||||
"qX0X8Xx r r * $ 0 s j j j f g k g j j r * & 6 D XrXuXyXyXgXgXfXP.P.B.zXhXZ.9.=.A.jXjXzXr.e.V.b.F.b.n.<.o.:.s.D.G.sXsXkXsXkXlXzXzXsXsXD.H.G.G.V.s.O.o.:.i.s.V.C.B.B.zXjXB.c.7XeX+X*X-X>X>X*X*X-X-X>X>X>X-X-X-X>X-X-X*X*X*X*X-X-X-X*X*X*X-X-X-X-X-X-X-X-X-X-X-X-X",
|
|
||||||
"mXqX} z p z $ * b ` b j l w k k h f s i = 6 A u.rXrXyXxXqXqXxXfXJ.P.B.zXhXZ.-.H >.B.A.0.N -.e.C.C.C.n.:.o.p.d.H.G.sXG.kXsXkXlXzXzXkXsXsXsXG.G.V.V.i.o.d.n.V.F.b.B.*.r.B.e.9XeX@X+X*X-X-X-X*X*X-X-X-X>X>X-X-X-X>X-X-X-X-X-X-X-X-X*X*X*X*X-X-X*X*X-X-X-X-X-X-X-X-X",
|
|
||||||
"hXqXD z z e * ( R.[ d $ d s q q h h j r 6 c A u..XvXxXyXqXqXxXdXP.P.x.hXzXZ.7.H -.0.0.Z 4 H w.V.V.G.V.,.:.s.s.D.s.a.q.d.i.d.H.H.g.s.i.s.s.a.s.D.s.V.;.s.H.F.G.V.e.C F 6.fXwX+X+X+X+X-X-X-X*X-X-X-X-X>X-X-X*X-X>X>X>X-X-X-X-X>X>X*X*X*X*X*X*X*X*X-X-X-X-X-X-X-X-X",
|
|
||||||
"bXqX( z = p & ` } p d d 0 s q k q h j $ 6 c A &.y.gXxXxXyXqXgXhXP.P.B.fXzXZ.9.H H =.x.9.V V e.C.C.F.kXs.i.d.s.d.%.o.o.o.o.o.:.:.o.o.o.o.o.o.o.:.q.d.D.F.kXF.n.B.B.C *.c.c.z.eX+X:X:X-X5X-X-X>X>X-X-X>X-X-X-X-X>X>X>X>X-X-X>X>X>X-X*X*X*X*X*X-X*X*X-X-X-X-X-X-X-X",
|
|
||||||
"ZXxX.Xz z = . ` n x d s l q q h f j s r = A S S r.9XgXyXxXqXgXfXC.F.m.fXfXe.6.H F V D D V N 0.b.V.G.L.L.i.i.:.O.o.%.:.;.8.8.+.+.:.d.H.D.s.D.n.a.i.s.n.L.L.F.S.Z.e.H -.y.qXtX@X,X*X-X5X5X5X>X>X>X>X,X,X,X,X,X-X-X<X>X,X*X>X>X*X*X-X-X-X>X-X-X-X*X*X-X-X-X-X-X-X2X",
|
|
||||||
"0XyXuX( = p . { ^ * d j j h y s r j s r 6 A S B 6.pXgXyXgXgXgXfXF.F.m.jXZ.0.>.;.Z N 3 9 v V =.b.b.n.G.L.V.p.a.p.s.s.g.H.sXsXH.sXsXH.G.sXH.D.s.n.V.p.F.L.F.n.A.B.9.H 9.c.yXtX+X+X-X2X5X5X5X-X>X>X>X>X,X,X>X>X-X-X>X,X,X*X*X*X*X>X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X>X",
|
|
||||||
"` = { } z & < 7X{ * d r q j 0 s s r y r 6 A S B ..g.gXgXgXgXgXfXF.P.B.fXZ.>.;.,.<.Z N N N N F w.p.n.L.F.n.p.M.n.s.n.n.V.H.sXsXH.H.D.H.V.d.p.n.F.F.p.F.L.n.n.B.x.-.H 9.0XtXeX+X<X2X>X>X>X*X,X>X>X>X>X>X>X>X-X-X-X*X*X,X*X*X*X*X,X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X>X",
|
|
||||||
"z p r z r * & } Xx d r r s 0 s s s t * 6 N S B B r.gXgXgXgXhXfXP.P.B.J.Z.0.,.<.3.3.<.Z N N Z 0.a.b.V.F.M.3.n.M.s.p.p.p.i.q.8.;.:.:.8.q.p.D.F.V.V.a.M.M.M.a.B.r.J -.t.8X7X@X:X<X2X>X>X,X,X,X>X>X<X>X>X>X>X>X-X-X*X*X*X*X*X*X*X*X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
|
|
||||||
"i d r s r * $ < } b d r d r 0 d y s i & 3 N B B B O.aXgXgXgXhXA.P.P.l.J.Z.0.,.<.3.2.k.k.<.Z N *.w.p.p.F.n.p.n.n.F.D.n.d.,.;.;.;.;.:.;.<.p.n.n.p.V.V.n.n.s.a.y.7.7.9.} 8XeX:X<X-X<X>X>X>X>X>X<X5X<X<X>X>X>X>X>X>X<X>X*X*X*X*X*X*X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
|
|
||||||
"y q j q $ r * * b x d r d q i i t i = 6 N B B B B ..h.aXgXgXhXZ.P.m.b.J.A.>.<.<.3.2.2.2.3.1.B *.q.n.p.p.,.n.D.s.p.s.s.a.V.G.G.G.D.V.V.a.p.p.p.n.C.V.s.D.i.a.y.H 9.t.} eX+X1X<X>X>X>X,X>X>X<X3X5X<X<X<X>X>X>X>X>X<X>X>X*X>X>X>X*X>X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
|
|
||||||
"l w h l s $ . & $ i s q j q y 0 t * 6 A B B B B B .+.aXaXaXgXZ.P.m.b.K.A.<.,.3.4.2.2.2.4.1...O.d.w.q.a.n.n.D.F.F.D.V.H.zXzXzXzXzXL.kXkXL.L.L.L.C.a.n.d.s.q.B.' } 8XeX+X+X,X,X,X,X,X,X>X2X3X3X3X<X<X<X<X>X<X<X<X<X<X>X>X>X>X>X>X>X>X>X-X-X-X-X-X-X-X-X-X-X-X-X-X",
|
|
||||||
"y l h s $ $ * & i 0 j f h q t ; , o 4 A S .B B B .. .g.aXaXgXZ.m.P.m.G.C.q.3.4.4.2.2.2.4.4.o.o.s.q.p.p.V.a.n.V.s.D.D.D.L.lXlXlXzXH.kXkXL.L.F.L.B.b.a.;.a.e.c.t.} eXeX+X>X>X,X,X,X,X,X2X2X3X3X3X<X<X<X<X<X<X<X<X>X>X<X>X>X>X>X<X>X>X>X>X-X-X-X-X-X-X-X-X-X-X-X-X",
|
|
||||||
"y h j s r $ # # i t q y h q t , = c A S . .B B .X...+.aXpXpXx.k.N.m.n.n.,.p.4.4.2.2.2.4.3.Z B e.b.q.w.p.b.p.n.n.M.n.n.F.F.L.kXH.G.kXzXkXL.C.C.e.0.;.q.q.r.y.t. XeX:X1X3X2X1X,X,X,X,X>X2X2X3X3X<X<X<X<X<X<X<X<X>X>X<X<X>X>X>X>X<X>X>X>X>X-X-X-X-X-X-X-X-X-X-X-X",
|
|
||||||
"y s s s r $ # # $ d l q q q i = c A S ..X.X.B B .X...@.f.S.aXe.k.N.k.p.p.<.3.4.3.2.2.2.3.,.Z F A.b.;.;.w.p.,.p.n.n.n.p.n.n.F.V.V.D.G.A.F.F.n.e.0.$.%.o.%.x.y.D 7X[.+X5X3X3X-X>X,X,X,X,X>X>X<X3X<X<X<X<X<X<X<X<X<X<X<X>X>X>X>X<X<X>X>X>X-X-X-X-X-X-X-X-X-X-X-X-X",
|
|
||||||
"r s s i r $ # # ; d j q r d = 6 A S S ..X.X. .X. .....B :.S.aXe.k.N.k.<.<.<.3.<.2.2.2.k.<.$.8 gXaXB.r.%.$.%.%.;.a.n.b.a.s.e.e.q.e.g.B.f.a.a.q.=.F C Z C r.Z.t.o ^ R.+X5X3X6X6X2X>X,X,X,X>X>X<X<X<X<X<X<X<X<X<X<X<X<X<X>X>X>X<X<X<X<X>X>X-X-X-X-X-X-X-X-X-X-X-X-X",
|
|
||||||
"r s s r r $ # - ; i q r r 6 6 A S S ....X.X. . . ..... .o.g.S.b.k.N.k.<.<.1.3.3.k.2.2.3.;.4 9 AXc.S.f.*.Z N Z C =.0.q.0.=.$.&.=.6.6.6.=.=.%.%.o.Z N Z r.B.Z.t.X < M T.:X5X3X3X4X3X<X,X,X,X,X<X<X<X<X<X<X<X<X<X<X<X<X<X>X>X>X>X<X<X<X>X>X-X-X-X-X-X-X-X-X-X-X-X-X",
|
|
||||||
"s s s r r $ # - ; i r r 6 6 N S S .X.X.X.X. .B . . . .B i.V.b.k.N.k.<.<.:.3.3.3.4.k.<.4 X t.bX9.S.f.e.$.N N N Z F F Z V N V F F V N N Z Z C o.Z Z 0.B.B.Z.t.@ > $ y {.NX3X3X-X3X3X<X,X1X1X1X<X<X<X<X<X<X<X<X<X<X<X<X>X>X>X>X>X<X<X>X>X>X-X-X-X-X-X-X-X-X-X-X-X",
|
|
||||||
"j j j r 0 $ # ; i p p 6 8 A S .. .X.X.X.X. . .B B B ..B X.:.D.,.k.N.k.1.:.%.p.<.,.<.-.8 X X wXgXH S.f.f.r.C C Z Z Z N 4 4 8 8 4 4 4 4 4 N C $.$.F 6.f.a.Z.Z.t.o . - $ y [ +X1X6X3X4X4X<X1X1X<X>X<X<X<X<X<X<X<X<X<X<X<X<X<X>X>X>X<X<X<X>X>X>X>X-X>X>X>X>X2X2X2X2X",
|
|
||||||
"j j j q 0 $ # ; , * c c A S .. . .X.X.X.X. .B B B B .. .X.+.D.;.k.N.N.1.1.%.w.%.0.V 3 3 = & xXgXZ A.B.e.r.*.&.&.&.H V N 8 8 3 3 3 4 N V F =.6.*.*.0.e.B.B.pXz.X < # # ; % ^ @X,X>X3X4X3X1X<X>X>X<X<X<X<X<X<X<X<X1X<X<X<X<X<X>X>X<X<X<X<X>X>X>X>X>X>X>X>X2X2X2X2X",
|
|
||||||
"j j j q 0 $ # - , z ( ) S S ..X. .X.X.X.X.X.B B B S B ..X.X.g.;.m.N.P.1.%.$.r.H 3 3 @ o * . CXmXV C.B.e.e.;.$.6.=.7.F V N 8 8 8 4 N V F &.6.6.*.6.f.e.B.B.mXt.o # , & . - + h _ @X:X1XNX1X<X4X4X<X<X<X<X<X3X<X<X4X4X4X4X1X<X>X>X<X<X<X<X<X<X3X3X>X>X>X>X>X2X2X2X",
|
|
||||||
"s s d w r $ # . 7 } vXXXS ..X.X.X.X.X.X.X.B B B B B B X.....f.;.m.L.P.-.Z N 3 X o o # # # & CXZXF e.B.e.e.;.;.=.6.6.&.F Z V N 8 N N Z C =.6.*.*.0.f.e.B.hXZX} ; # # & & # # ; u w ! {.+XNX,X,X4X1X<X>X<X4X4X3X>X3X4X4X1X<X<X<X<X<X<X<X3X3X3X3X<X>X*X*X*X-X<X5X5X",
|
|
||||||
"i r s r s $ . v 8XxXgXy.*...X.X. . .X.X.X. .B B B B X.X. .B y.r.0.>.Z 3 X X . . # # # # > @ CXZXF 0.A.e.0.q.;.=.;.=.O.O.C Z V V F C O.%.6.;.%.;.e.e.B.Z.SXAX| % # # # # # # # # ; t u h _ +XNX+X<X<X<X<X<X<X4X4X4X4X4X4X<X<X<X<X<X<X<X3X3X3X3X<X<X,X,X,X<X5X5X5X",
|
|
||||||
"i r s s 0 # 2 } yXxX9Xy.g.O.....B ....X.X. .B B B B .X...S F V 3 3 X X X @ & # # # # # & @ CXZXV -.B.C.a.<.;.;.;.*.O.&.F F F H &.O.$.=.8.=.%.0.q.e.B.hXAXAX` # # # # # # # # # ; % t l h u / [.1X1X1X1X1X1X<X<X1X>X>X4X4X<X1X4X<X<X3X3X3X3X3X>X<X<X,X,X<X<X5X5X",
|
|
||||||
"d r s t % # 7 qXyXgX9Xc.aXr.@...B B ... .B B B B B S B N 4 3 X X o o o . . # - # # # & = X xXHXD F S.V.w.w.;.<.;.=.$.&.F F F =.=.*.*.;.0.;.;.q.e.e.pXAXZXGXn # # # # # # . # # > , i t t y h h ^ T.+X+X+X1X1X<X4X1X4X4X4X>X>X>X<X<X3X3X3X3X3X2X<X<X,X,X<X<X5X5X",
|
|
||||||
"d r 0 t ; , 7 qXxXgXqX9XgXaX8... . .....S B N 8 8 8 4 3 3 3 . . # # $ ; $ ; ; # # . . & = o tXHXhXV e.V.a.q.<.w.0.6.*.*.&.$.*.8.;.;.;.8.0.;.;.w.b.r.mXHXGXFX= > # # # # # # # # & # # i d i r t h w h {.eXNX1X1X,X,X1X1X1X<X>X4X<X<X3X3X3X3X3X3X<X>X,X,X<X<X5X5X",
|
|
||||||
"r r y t ; 2 7 9XqXxXqXqXxXcXaXO.S S B N N 4 3 X @ X o o o & % % $ $ $ % % # - . . . o > & o XFXHXt.&.f.a.,.w.<.q.0.=.&.*.*.=.8.;.:.;.0.q.;.;.e.0.pXAXZXPXVXo & # # # # # # # # & & < < , * , a i d y y l / T.+XNX1X1X1X,X,X1X4X<X<X3X3X3X2X2X2X>X>X>X-X5X<X5X5X",
|
|
||||||
"r s y 0 # o 9 gXgXxXqXqXxXbXcX7.N 8 4 3 X @ . + - . . . . . # # . # > > > + + + . . . & # # | CXHXZXF 0.s.,.<.w.w.;.=.&.=.*.;.8.;.:.;.w.q.;.0.r.r.ZXAXGXGX} = o # # # # # # # # & & & < < < , < , i i i t y h h ^ _ ].+X1XNX1X,X1X<X<X<X3X3X2X>X2X>X-X-X5X5X5X5X",
|
|
||||||
"s q q 0 , o 9 9XgXgXxXyXxXCXgXD 3 o o @ + + + . - . # - > # , . > . . . @ . . . . . . # # , | IXHXHXt.F e.a.,.<.w.;.=.&.=.%.;.8.;.;.;.q.;.=.=.-.hXAXHXGXGX` o & . # # . . . # # & < < * , < < > < < , , i d s y h l h h ! [ @XNX1X1X1X1X<X<X>X-X3X2X>X-X5X-X5X-X",
|
|
||||||
"j q s 0 * o 9 9XgXxXxXyXtX X7 o o o . + . . . . & # # - - - - + + . . . o o . . > . # . # # ` IXFXLXZXF =.e.p.<.w.q.=.*.*.o.;.;.;.=.,.q.;.*.F c.ZXJXHXGXFX< & . . . # . . # # # # # * , i i , , < < < p i i i i s d l l y q l ! T.NX1X,X,X1X*X<X>X>X2X2X-X-X5X5X",
|
|
||||||
"y y r r = o 5 9XqXbXwX7 2 2 . 2 & & & > # # & o & & # + + . . . . . . . o & & & # # , > - # n GXFXHXJXmX&.r.w.p.w.e.=.$.=.C $.$.$.=.%.w.;.C 9.ZXHXHXLXGX7X& $ # . . # . . . # # * , , , i i i i < < < < < p p p a i i d d s s j h ! T.NX1X,X,X*X<X>X2X2X-X-X5X5X",
|
|
||||||
"0 s r r p & @ qXbXyX7 2 o & > & & = & & & # & # . . . . o o o o . . . # # & * * * * * , # & z FXPXHXLXAXZX6.a.s.e.e.6.*.=.C $.*.$.O.0.0.$.7.AXHXKXPXPXGXD . $ # . . . # # # # # * ; ; ; i i i i , < p p < < < < z < < p a p i r y h L _ @XeX1X,X<X<X3X>X-X-X-X-X",
|
|
||||||
"i i $ r * & o wXxX` o < . # # # = = & & & & # - . . . . o o o o # # # # $ $ $ * * * * & . & 2 tXFXLXPXLXJXcX6.g.A.e.r.0.%.C *.&.$.&.e.0.H SXHXKXKXLXPXCX2 . # # & # # # . # # - # $ ; ; i t i i i i i i < < < < 7 < < < < < < p d s y h h ^ [.1X:X5X5X5X-X-X-X-X",
|
|
||||||
"p = * * * & o 0XyXo 7 . $ 1 # > & & & & & > - - . . . . o o o o # # # $ $ $ $ $ $ # * * & & & ` FXGXKXKXLXJXpX6.B.B.b.e.=.$.r.&.&.y.r.H SXLXLXKXKXKXLX X& & & & > # # # # - - - # - ; i i i i i i i i i , , < < < < < < < < p a a x i t y h / NX:X5X5X5X-X-X-X-X",
|
|
||||||
"v = * i # & = 0X' o . 1 , . & > - - & & & > & - . . . . . . . . # # # # # # # # # # & & , & < < xXFXPXKXKXLXJXc.r.B.A.B.e.0.y.0.r.y.7.AXLXLXKXKXKXKXPXn , > & > > > # # - - > > > , , i i i i i i i i i i , p < p , < , p i , , & & z i t y u [.:X<X5X5X5X-X-X-X",
|
|
||||||
"{ 7 & , # # = 8Xv o & . - > > . + - & & & & & & # # # # . . . . . o o . . . . + + + + . - # p * t.GXPXKXKXKXJXJXx.e.B.B.x.e.y.e.e.c.AXLXLXKXKXKXKXKXtX# , > > > , ; # # - > > > > > > , , , i i i i i i i i i p i i , i i i t $ 7 o 7 > $ s u _ :X5X5X5X5X-X-X-X",
|
|
||||||
"yXD & > # # o } o X > > - # o @ + + o o & & & & . # # # # # # . o o o o . . . . + . . . - # , p ` GXGXKXKXLXLXJXAXx.Z.fXMXnXcXcXcX9XAXKXKXKXKXKXKXLX| , , # < & , ; # - - > > > > > > > , , , i i i i i i i i i , i i i * t i i = 2 & > a % y K :X5X5X5X-X-X-X-X",
|
|
||||||
"xX8X3 o o o 2 n o o > > > > & & > - # & o . & # . . . # # # # . # o & o . . . . . . # # # & , , m IXGXLXKXKXKXKXLXJXHXAXAXZXxXwXD 5 D FXKXKXKXKXLXCX, , 1 > . > > > > > > > , , , , , , , , , , i i i i i i , , , , , , , , , , # > , , > - $ q @X:X5X3X-X>X*X>X",
|
|
||||||
"xXqXG X o o = z & & o > > & & # & # # . # # # # . . # # # # # . . # # - # # # # # # # # # # & & < tXPXPXLXKXKXKXKX8X` ` n v z < < < & m CXKXKXKXKX} , - > > > > > > > > , , , , , , , i , , , , i i i i i i , , i i i i , , * $ $ ; , , > & # 0 {.:X3X-X>X,X*X<X",
|
|
||||||
"gXgXt.D X 3 7 & & & o & & & # # & > # # # . . . - - - # # # . . . . # # # # # # # # # # # # # & < } FXPXKXLXKXLX} < . a > & < > & > z > m IXKXLXGXb 1 , > < > > , , , , , , , , , , i i i i , , p i p p p p i i p p i , , * $ $ $ , , , & & - t ! 1X3X*X>X*X>X>X",
|
|
||||||
"gXgXgXt.3 7 7 & & & o & & & # # # - # # # # # . > > > # . . . # . . # # # # # # . # # # # # # & > ` FXKXKXKXLX{ > & 1 1 < a < & 1 o . . a n GXKX8X< , 1 > < > > , , , , , , , , p p p p i , , , i i i p p p i i i i , , * * * $ $ , * * & & - t h +X*X<X*X*X3X-X",
|
|
||||||
"hX9XhX9Xv 3 o o o o o & & & & & # # # # # # . . > > # # . . . . . . - - # # # # . # # # # # # & , b CXPXLXKX| # & , , . > , > 1 > 2 < < > & ` GXn , > , > > < > , , , , , , , , a a p p p , , , , i i i i i i i i i , , , , * $ , * * * & # # $ q {.+X<X*X>X3X-X",
|
|
||||||
"hXpXgX0X' 7 X o o o o & & & & & # # # - > # # . > > # # # # . . . # - # # # . . # # # # # # # # & a R.PXKX| , , , # & & & > & > & & & & . z # ` 1 # 1 > > > 1 > < < , , , , , , p p p p p i , , , i i i i i i i i i i i , , , * * * * * & # # $ q ! 1X:X,X<X-X3X",
|
|
||||||
"fXpXpXc.t.5 o o o o & # # # & & # . > > > > . . # . . . - # # . . . # # # # # # # # # # # # # & # a ` PX} , # # & . > > . > > # > 2 < & a . , 1 a > z , > , < > , , , , , , , , p p p p i , , , i i i i i i i p i i i , i , , * $ $ * * & # # $ t u [.+X,X<X-X3X",
|
|
||||||
"hXpXpX9Xt.3 7 . o . # # # # # # # # - > > > . . . . . . - - # . . . # . # # # # . # # # # # > , , # z | & , > . # # > # . # . > & & < > # a , 1 , , , , & 1 > > , , , , , , , , p p p p i , , , , , , , , , , i , * , * , , , , $ $ * & & # # # % u _ +X,X-X3X3X",
|
|
||||||
"fXpXpX9Xt.9 X o o . . # # # & > # . . . . # # - > # . # # # . . . . . . # # # # # # # # # # # > , , a # - 1 . > 1 > > > < . > m 7 z m , , , , < , , , , , , , > , , , , , , i p p i , i p p , , , , , * * , , i , , , , , , , * $ $ $ # & & & - ; u P +X1X5X3X2X",
|
|
||||||
"fXpXpX9Xt.5 X o o . # # # # # # # - . . # # > > # . . # # # # . . . . . # # # # # # # # # # # & , , 1 > # # . > # # # 8XtXCXCXCXCXCXiX7Xa > , > , , , , , , , > , > > > , , , , , , , i p p < , , , , * * , , i i , , , , , * * $ $ $ # # # # # # % y [.:X<X3X3X",
|
|
||||||
"fXdXpX9Xt.3 X o o # # - # # # . # - - - # > > > - # . . . # # # # # . . # # # # # # # # # # # # # ; , , & , 1 & 1 , | CXPXKXKXKXKXKXPXIX| 1 > # > > > , , , , > , , > > & > , , , , , p p p , , , , , * * , , , i , , , * * * $ , , ; - # # # # # % % [ +X1X3X3X",
|
|
||||||
"fXdXpX9Xt.3 o o o # # # # # # . - - - - # > > > # . . . . # - # # # # # # # # # # & # # # # # # # ; ; , > , 1 # > 1 uXIXKXKXLXKXKXKXPXIX} 1 # , > > > , , , > > , , > > , , , , , , , p p i , , , , , * * * , , , , , * * * * $ , # # # # # # # # # % ^ :X1X2X3X",
|
|
||||||
"fXdX9X9Xt.X o o o # . . # # # # . . . # # # # # - # . . . # # # # - - - # # # # # # # # # # # # , # # , , > < a < { CXLXKXKXKXKXKXKXPXGX( > , ; , , , , , , , < , , , , , , , , , i p p i , & # , , , * $ $ * , , , * * * * * $ # # # # # $ $ # o . $ P NX1X3X2X",
|
|
||||||
"fXdXpX9X' X o o # # . . # # # & . . # # # # # # > > # . . # # # - - # - # # # # # # # # # # # # # ; , , a 1 > > n tXFXKXKXKXKXKXKXPXGXtX, , a # , , , , , , , < , , , , , , , , p p p i , * # # , , * * $ $ * , , * * * * * * # # # . # # $ * # o . ; u +X1X3X2X",
|
|
||||||
"fXpXpX9XG X o o # # # # # # # # . . . . - # # # > > - . # . . . . . # # # # # # # # # # # # # # # , , # , , & m 7XCXLXKXKXKXKXKXKXPXCX` , , 1 , , , 1 1 , , , , , < , , , , i i p p i , * $ & & , , , , * $ * , , , * * * * $ # # # . . # $ * & o . # w [.1X<X3X",
|
|
||||||
"fXpXpX9XD o o & # # # # # # # # . . # @ > @ - . > > - # # . . . . . # # # # # # # # # # # # # & , # , a a # m 7XCXGXKXKXLXKXKXKXPXCXuX< 1 a , i 1 1 1 1 , > > , 1 1 1 < 1 , p a p p < , $ # & * , , , , , ; , , , , , * & & # # # # . # # $ $ # & & # y {.1X<X3X",
|
|
||||||
"Z.pXpX9XD @ & . > & # . . # # # . . > . 1 @ . @ > . . > . . . . . 2 & . # # > . > > & # # # # & , # a , a , 7XCXGXKXLXKXKXKXKXLXCXVX( z a 1 , i a 1 , , > > > > 1 - 1 , , 1 , , , & = o , # * = < & , $ , , ; , , - ; & & & # # $ # & # # # $ $ ; # $ t [ NX4X3X",
|
|
||||||
"aXpXpX9X9 X & # & & & o . . # # > . . 1 . . 1 . @ @ o 2 . o > > . . . & , < . 1 & & & # # # # # # , , , i M R.CXFXKXKXKXKXKXPXIXrX} z < < a , 1 1 1 , < , > > > < > < a 1 , a < < = = = . & = 6 7 & a # - % ; , , # # # & & & - # # # & # # $ $ $ $ $ 0 _ NX4X3X",
|
|
||||||
"fXZ.9X9X5 X & # # # & o . . # # . o 8X8X8X} } | ` ` n m 2 > o . 2 & > & . < . # # & # # # # # # # 1 # , , a ` iXIXPXLXKXKXLXCX7X} n , , , a , , < < < < < > > , , a < < , , < = 6 6 6 c 6 c 6 6 6 6 , ; t : & & = * & & & & . # # # # & # # $ $ $ ; * 0 ^ NX4X4X",
|
|
||||||
"fXZ.9X9XX o & # # . o o # . # # 7 . 8XxXKXKXLX7X7X7XrXuXiXxXtXrX8X X{ ` & . 1 > # & # # # # # # # , # , , , a 7XVXHXKXLXLXFXrX{ ` i i a i a i , i < p < < , , , * x p p p < 1 ` D ) ) ) ) ) ) ) ) u.2 + + ; o = & & o > * # # - # # # o # # $ $ $ ; * 0 ! NX3X4X",
|
|
||||||
"dXZ.9Xz.X o & # . # o o & # # # . z 8XCXLXKXCXt.8X7X7XrXtXiXxXxXiXiXtXtX{ > . . & & > # # # # # & # , a i i , | iXFXLXHXZX7X} } n t i i a $ i p i p p p p , , , d r * < z & o 8X5.5.5.5.5.5.5.5.5.vX7 + ; , = = 2 > @ > $ % . . # # # & # # $ $ # ; # $ l +X<X3X",
|
|
||||||
"pXpXpXt.X o o # # . o o . # # # . v tXxXIXFXCXrX8XtXuXiXiXxXiXxXiXuXtXuX7X` > & & & & & # # - > , # , , i a , m uXVXZXFXtX X8X8Xi t i i a * p p p p p i i 1 , , ; i x = < < 6 0X5.5.5.5.5.5.5.5.5.vXv @ = = 8 3 3 3 X 2 , % # . # # # & & & ; ; ; - , $ h [.1X4X",
|
|
||||||
"pXpXpX' o o . # & & o o . . # # < D yXCXCXVXFX7X8XuXVXCXCXCXVXCXCXVXxXiXVX7X` . & & & & # & > > , , , , , i a & 8XCXFXxX8XrXVX` , i p , p p p p i a i i , 1 , , 1 > 6 7 { rXu.u.u.) .Xu.u.u.XXu..X7X' t.u.7.O.@.O.7.9.] ( r o o # # & & > > ; ; ; , < , y {.1X4X",
|
|
||||||
"pXpX9XD o o . & > o o o . . # # & ` XuXFXFX7Xt.8XrXrXrXtXuXuXiXiXuXyXtXuXtX7Xz & & & & # # > > # , # a i * a < ` VXxXrX8X8X7X= < * < * * p , , i a i 1 , , , > @ 5 A ' yXPXvXu..X} uX X.Xu.vX{ BX} ] cXXXh.+.j.+.h.pX9X' = o = & - & > > > ; ; - # , $ y [ 1X4X",
|
|
||||||
"dX9X9X9 o > # # . . o o . . # # & n { } } } X7X7X7X7XrXtXtXuXuXtXtXtXtXrXrX7Xz # & # & # # # # > , ; ; , , , < & uXyX} ` 8Xv & < * * * * , , , i , , , < < < 7 4 V O.u.vXPXvXu..X{ VX X7Xt.vX} BXR.9.aXg.h.j.#.#.h.g.pX' z & > & > > > > $ ; ; ; > , $ y / 1X4X",
|
|
||||||
"dXpX9X9 @ > . # # . o o o o & > . & & # . . < z m n n ` ` { } } 8X7X8X7X7X7X7Xz # # # # # # # # > > , , , * , * < ' 8X` D { & = , , , , , , , , ; ; , < = 6 6 8 Z *.8.8.5.h.5.u. XrX8X X X7Xu.t.8X} ' 8.5.j.#.#.#.#.+.r.A & . > # > > > , ; ; ; ; > > , y ^ NXNX",
|
|
||||||
"pXpXz.5 @ > . - . . o o o . # # # # . # & & # # & & & # . . # & & & 2 z m n n & # . # # # # # > > & # # $ * * & = 7 ` D ( c & & # - - - , , 1 1 1 1 , 2 6 c A F 0.G.G.D.+.j.5.XXrXVX` 7XiXGX( { uXrXu.5.j.#.#.#.#.#.+.h.c * # > # & > > , , ; ; ; - > i t h NX4X",
|
|
||||||
"pXpXt.X @ > . > . . . o . . # # . . . # # - # # # # # # # # # & & . o & . . # & # # . # # # # & > & # # $ $ # & & & 7 ( D . < & # - - - - ; 1 1 1 1 , = 6 c D F e.K.A.B.+.+.5.u.rXVX| 7XrXCX' t.uX.Xu.5.j.+.+.+.+.+.+.y.v ; . . # , > > , ; ; ; ; > > i t u NX4X",
|
|
||||||
"pX9X] X o & . # # . o o o . # # - > > . . . . # . . # # # # # # o o 2 . # < & . # # # # # # # # & & # # # # # # & & > m < > # , - - - - - - , , 1 , > 2 7 c A A F H F D A A A A ( ( a M b ` c v n m c 4 N N 4 4 N 4 N N O . - , ; , > & & $ ; ; ; , , , t u NX1X",
|
|
||||||
"pX9X' X o & . . . . o o o o . # # + - > > > > # # > > > > > > & > & < . . & . # # # # # # # # # & & & # # # # - > & > & . < # - - - - - > , < 1 , ; - > < 7 6 6 6 7 o 7 6 6 7 z z < i a z < , 1 < < 6 c o 2 @ @ 7 3 3 X = . - - ; , * & * $ ; ; ; , , * t u @X1X",
|
|
||||||
"pX9XD X o . . . . . . . . . . . > . . . . . # & # & # # . . . . . . > & , . . > # # # # # # # # & # # # # - - , & , > > # - , # - - , * < < p < , ; ; - , > < < p < z z a < = 7 z z a , p x d - , < < z < , , p = < z = = o . # , * * * * $ ; ; ; - , # t u {.NX",
|
|
||||||
"pXc.D X o . # # . . o o o o # & # . @ > - > & & & & & & & & & & > . > . > # , # # # # . # # # # & . # # # ; ; , , . # > . - , , , , , < z 6 = * # ; : : : , 1 1 i i p p ; a 7 7 < < < z z = i i , 1 < & , p i r r r * * o & & > $ * , , * , ; ; ; # , # i q _ NX"
|
|
||||||
};
|
|
Before Width: | Height: | Size: 533 B After Width: | Height: | Size: 486 B |