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

Clean up some places where get was needless used. #1428

Merged
merged 1 commit into from
Jan 9, 2024
Merged

Clean up some places where get was needless used. #1428

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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
- Better filter DICOM adjacent files to ensure they share series instance IDs ([#1424](../../pull/1424))
- Optimizing small getRegion calls and some tiff tile fetches ([#1427](../../pull/1427)

### Changed
- Cleanup some places where get was needlessly used ([#1428](../../pull/1428)

## 1.27.0

### Features
Expand Down
37 changes: 19 additions & 18 deletions large_image/tilesource/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,23 +487,23 @@ def _getRegionBounds(self, metadata, left=None, top=None, right=None,
region[key] = region[key] * scale
# convert negative references to right or bottom offsets
for key in ('left', 'right', 'top', 'bottom'):
if key in region and region.get(key) < 0:
if key in region and region[key] < 0:
region[key] += metadata[
'sizeX' if key in ('left', 'right') else 'sizeY']
# Calculate the region we need to fetch
left = region.get(
'left',
(region.get('right') - region.get('width'))
if ('right' in region and 'width' in region) else 0)
(region['right'] - region['width'])
if 'right' in region and 'width' in region else 0)
right = region.get(
'right',
(left + region.get('width'))
if ('width' in region) else metadata['sizeX'])
(left + region['width'])
if 'width' in region else metadata['sizeX'])
top = region.get(
'top', region.get('bottom') - region.get('height')
'top', region['bottom'] - region['height']
if 'bottom' in region and 'height' in region else 0)
bottom = region.get(
'bottom', top + region.get('height')
'bottom', top + region['height']
if 'height' in region else metadata['sizeY'])
if cropToImage:
# Crop the bounds to integer pixels within the actual source data
Expand Down Expand Up @@ -659,18 +659,18 @@ def _tileIteratorInfo(self, **kwargs): # noqa
metadata, desiredMagnification=mag, **kwargs.get('region', {}))
regionWidth = right - left
regionHeight = bottom - top
requestedScale = None
if maxWidth is None and maxHeight is None:
magRequestedScale = None
if maxWidth is None and maxHeight is None and mag:
if mag.get('scale') in (1.0, None):
maxWidth, maxHeight = regionWidth, regionHeight
requestedScale = 1
magRequestedScale = 1
else:
maxWidth = regionWidth / mag['scale']
maxHeight = regionHeight / mag['scale']
requestedScale = mag['scale']
magRequestedScale = mag['scale']
outWidth, outHeight, calcScale = self._calculateWidthHeight(
maxWidth, maxHeight, regionWidth, regionHeight)
requestedScale = calcScale if requestedScale is None else requestedScale
requestedScale = calcScale if magRequestedScale is None else magRequestedScale
if (regionWidth < 0 or regionHeight < 0 or outWidth == 0 or
outHeight == 0):
return None
Expand Down Expand Up @@ -1016,7 +1016,7 @@ def _pilFormatMatches(self, image, match=True, **kwargs):
originalQuality = int(5000.0 / 2.5 / image.quantization[0][15])
except Exception:
return False
return abs(originalQuality - self.jpegQuality) <= 1
return bool(originalQuality and abs(originalQuality - self.jpegQuality) <= 1)
# We fail for the TIFF file format; it is general enough that ensuring
# compatibility could be an issue.
return False
Expand Down Expand Up @@ -2189,8 +2189,8 @@ def getRegion(self, format=(TILE_FORMAT_IMAGE, ), **kwargs):
kwargs['tile_offset'] = {'auto': True}
iterInfo = self._tileIteratorInfo(**kwargs)
if iterInfo is None:
image = PIL.Image.new('RGB', (0, 0))
return _encodeImage(image, format=format, **kwargs)
pilimage = PIL.Image.new('RGB', (0, 0))
return _encodeImage(pilimage, format=format, **kwargs)
regionWidth = iterInfo['region']['width']
regionHeight = iterInfo['region']['height']
top = iterInfo['region']['top']
Expand All @@ -2199,13 +2199,14 @@ def getRegion(self, format=(TILE_FORMAT_IMAGE, ), **kwargs):
outWidth = iterInfo['output']['width']
outHeight = iterInfo['output']['height']
image = None
tiledimage = None
for tile in self._tileIterator(iterInfo):
# Add each tile to the image
subimage, _ = _imageToNumpy(tile['tile'])
x0, y0 = tile['x'] - left, tile['y'] - top
if tiled:
image = self._addRegionTileToTiled(
image, subimage, x0, y0, regionWidth, regionHeight, tile, **kwargs)
tiledimage = self._addRegionTileToTiled(
tiledimage, subimage, x0, y0, regionWidth, regionHeight, tile, **kwargs)
else:
image = _addSubimageToImage(
image, subimage, x0, y0, regionWidth, regionHeight)
Expand All @@ -2216,7 +2217,7 @@ def getRegion(self, format=(TILE_FORMAT_IMAGE, ), **kwargs):
outWidth = int(math.floor(outWidth))
outHeight = int(math.floor(outHeight))
if tiled:
return self._encodeTiledImage(image, outWidth, outHeight, iterInfo, **kwargs)
return self._encodeTiledImage(tiledimage, outWidth, outHeight, iterInfo, **kwargs)
if outWidth != regionWidth or outHeight != regionHeight:
dtype = image.dtype
image = _imageToPIL(image, mode).resize(
Expand Down