Skip to content

Commit

Permalink
Merge pull request #1596 from girder/tile-frames-redirect
Browse files Browse the repository at this point in the history
Don't redirect tile frame images via 303
  • Loading branch information
manthey authored Aug 2, 2024
2 parents 3877bee + cd468fd commit c777d2b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
- Speed up checks for old annotations ([#1591](../../pull/1591))
- Improve plottable data endpoint to better fetch folder data ([#1594](../../pull/1594))

### Bug Fixes

- Don't redirect tile frame images via 303; they aren't rendered correctly ([#1596](../../pull/1596))

## 1.29.4

### Improvements
Expand Down
5 changes: 3 additions & 2 deletions girder/girder_large_image/models/image_item.py
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,8 @@ def _getAndCacheImageOrData(
if pickleCache:
data = File().open(existing).read()
return pickle.loads(data), 'application/octet-stream'
return File().download(existing, contentDisposition=contentDisposition)
return File().download(existing, contentDisposition=contentDisposition,
headers=kwargs.get('headers', True))
if checkAndCreate == 'check':
return False
return self.getAndCacheImageOrDataRun(
Expand Down Expand Up @@ -563,7 +564,7 @@ def tileFrames(self, item, checkAndCreate='nosave', **kwargs):
imageKey = 'tileFrames'
return self._getAndCacheImageOrData(
item, 'tileFrames', checkAndCreate,
dict(kwargs, imageKey=imageKey), **kwargs)
dict(kwargs, imageKey=imageKey), headers=False, **kwargs)

def getPixel(self, item, **kwargs):
"""
Expand Down

0 comments on commit c777d2b

Please sign in to comment.