Skip to content

Commit db0c710

Browse files
authored
Fix failure to decode subsampled J2K files (#37)
1 parent b7330e7 commit db0c710

File tree

14 files changed

+1778
-2449
lines changed

14 files changed

+1778
-2449
lines changed

.github/workflows/pytest-builds.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
python-version: [3.6, 3.7, 3.8]
15+
python-version: [3.7, 3.8, 3.9]
1616
arch: ['x64', 'x86']
1717

1818
steps:
@@ -29,8 +29,8 @@ jobs:
2929
- name: Install package and dependencies
3030
run: |
3131
python -m pip install -U pip
32-
python -m pip install pytest coverage pytest-cov cython numpy
33-
python -m pip install . -v
32+
python -m pip install pytest coverage pytest-cov cython numpy wheel
33+
python -m pip install .
3434
python -m pip install git+https://github.com/pydicom/pylibjpeg-data
3535
3636
- name: Run pytest
@@ -48,7 +48,7 @@ jobs:
4848
strategy:
4949
fail-fast: false
5050
matrix:
51-
python-version: [3.6, 3.7, 3.8]
51+
python-version: [3.7, 3.8, 3.9]
5252

5353
steps:
5454
- uses: actions/checkout@v2
@@ -63,7 +63,8 @@ jobs:
6363
- name: Install package and dependencies
6464
run: |
6565
python -m pip install -U pip
66-
python -m pip install . -v
66+
python -m pip install wheel
67+
python -m pip install .
6768
python -m pip install pytest coverage pytest-cov
6869
python -m pip install git+https://github.com/pydicom/pylibjpeg-data
6970
@@ -82,7 +83,7 @@ jobs:
8283
strategy:
8384
fail-fast: false
8485
matrix:
85-
python-version: [3.6, 3.7, 3.8]
86+
python-version: [3.7, 3.8, 3.9]
8687

8788
steps:
8889
- uses: actions/checkout@v2
@@ -97,6 +98,7 @@ jobs:
9798
- name: Install package and dependencies
9899
run: |
99100
python -m pip install -U pip
101+
python -m pip install wheel
100102
python -m pip install .
101103
python -m pip install pytest coverage pytest-cov
102104
python -m pip install git+https://github.com/pydicom/pylibjpeg-data

.github/workflows/wheel-builds.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: Build wheels for ${{ matrix.os }}
1010
runs-on: ${{ matrix.os }}
1111
env:
12-
CIBW_BUILD: "cp36-* cp37-* cp38-*"
12+
CIBW_BUILD: "cp37-* cp38-* cp39-*"
1313
strategy:
1414
matrix:
1515
os: [ubuntu-latest, windows-latest, macos-latest]
@@ -28,7 +28,7 @@ jobs:
2828
- name: Install cibuildwheel
2929

3030
run: |
31-
python -m pip install cibuildwheel==1.4.2
31+
python -m pip install cibuildwheel==1.10.0
3232
3333
- name: Build wheel
3434
run: |

docs/changes/v1.1.0.rst

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
.. _v1.1.0:
2+
3+
1.1.0
4+
=====
5+
6+
Changes
7+
.......
8+
9+
* Removed support for Python 3.6
10+
* Added support for Python 3.9
11+
12+
13+
Enhancements
14+
............
15+
16+
* Add support for passing the path to the JPEG 2000 file to
17+
:func:`~openjpeg.utils.decode` and :func:`~openjpeg.utils.get_parameters`
18+
as either :class:`str` or :class:`pathlib.Path`
19+
20+
21+
Fixes
22+
.....
23+
24+
* Fixed handling subsampled images (:issues:`36`)

0 commit comments

Comments
 (0)