Skip to content

Commit

Permalink
Merge pull request #982 from girder/fix-multi-frame-composite
Browse files Browse the repository at this point in the history
Fix an issue when compositing multiple frames.
  • Loading branch information
manthey committed Oct 18, 2022
2 parents 560b1e7 + 215126b commit 1a7ba44
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
- Thumbnail maintenance endpoints ([#980](../../pull/980))
- Handle lif file extensions ([#981](../../pull/981))

### Bug Fixes
- Fixed an issue with compositing multiple frames ([#982](../../pull/982))

## 1.17.0

### Features
Expand Down
3 changes: 2 additions & 1 deletion large_image/tilesource/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -1603,7 +1603,8 @@ def _getFrame(self, frame=None, **kwargs):
:returns: an integer frame number.
"""
frame = int(frame or 0)
if (hasattr(self, 'style') and 'bands' in self.style and
if (not getattr(self, '_skipStyle', None) and
hasattr(self, 'style') and 'bands' in self.style and
len(self.style['bands']) and
all(entry.get('frame') is not None for entry in self.style['bands'])):
frame = int(self.style['bands'][0]['frame'])
Expand Down

0 comments on commit 1a7ba44

Please sign in to comment.