Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

For the tiff tile source, allow decoding jp2k tiles. #514

Merged
merged 1 commit into from
Jan 15, 2021
Merged

For the tiff tile source, allow decoding jp2k tiles. #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
- Better handling of tiff files with JPEG compression and RGB colorspace (#503)
- The openjpeg tile source can decode with parallelism (#511)
- Geospatial tile sources are preferred for geospatial files (#512)
- Support decoding JP2k compressed tiles in the tiff tile source (#514)
>>>>>>> For the tiff tile source, allow decoding jp2k tiles.

### Bug Fixes
- Harden updates of the item view after making a large image (#508)
Expand Down
2 changes: 1 addition & 1 deletion sources/tiff/large_image_source_tiff/tiff_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ def getTile(self, x, y):

if (not self._tiffInfo.get('istiled') or
self._tiffInfo.get('compression') not in (
libtiff_ctypes.COMPRESSION_JPEG, 33003, 33005) or
libtiff_ctypes.COMPRESSION_JPEG, 33003, 33005, 34712) or
self._tiffInfo.get('bitspersample') != 8):
return self._getUncompressedTile(tileNum)

Expand Down