Skip to content

Commit

Permalink
Merge pull request #1158 from girder/deepzoom-tile-type
Browse files Browse the repository at this point in the history
The deepzoom tile source misreported the format of its tile output.
  • Loading branch information
manthey authored May 16, 2023
2 parents 1e6c103 + 653d495 commit 06609ed
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

### Improvements
- getPixel method and endpoint now returns rawer values ([#1155](../../pull/1155))
- Allow more sophisticated filtering on item lists from the Girder client ([#1157](../../pull/1157))

### Bug Fixes
- The deepzoom tile source misreported the format of its tile output ([#1158](../../pull/1158))

## 1.20.6

Expand Down
4 changes: 2 additions & 2 deletions sources/deepzoom/large_image_source_deepzoom/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import PIL.Image

from large_image.cache_util import LruCacheMetaclass, methodcache
from large_image.constants import TILE_FORMAT_NUMPY, SourcePriority
from large_image.constants import TILE_FORMAT_PIL, SourcePriority
from large_image.exceptions import TileSourceError, TileSourceFileNotFoundError
from large_image.tilesource import FileTileSource, etreeToDict

Expand Down Expand Up @@ -113,7 +113,7 @@ def getTile(self, x, y, z, pilImageAllowed=False, numpyAllowed=False, **kwargs):
overlap if x else 0, overlap if y else 0,
self.tileWidth + (overlap if x else 0),
self.tileHeight + (overlap if y else 0)))
return self._outputTile(tile, TILE_FORMAT_NUMPY, x, y, z,
return self._outputTile(tile, TILE_FORMAT_PIL, x, y, z,
pilImageAllowed, numpyAllowed, **kwargs)


Expand Down

0 comments on commit 06609ed

Please sign in to comment.