From 39cf04506d6059fbedf7c4fddbcf04b6ada12413 Mon Sep 17 00:00:00 2001 From: David Manthey Date: Fri, 1 Nov 2024 15:55:56 -0400 Subject: [PATCH] Adjust one check from PR #1711. --- CHANGELOG.md | 4 ++-- sources/multi/large_image_source_multi/__init__.py | 2 +- test.Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 626a40a46..694a0575d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,11 @@ ### Improvements - Format dates in item lists ([#1707](../../pull/1707)) -- Guard dtype types ([#1710](../../pull/1710)) +- Guard dtype types ([#1711](../../pull/1711), [#1714](../../pull/1714)) ### Changes -- Openslide now requires the binary wheel on appropriate platforms ([#1709](../../pull/1709)) +- Openslide now requires the binary wheel on appropriate platforms ([#1709](../../pull/1709), [#1710](../../pull/1710)) ## 1.30.2 diff --git a/sources/multi/large_image_source_multi/__init__.py b/sources/multi/large_image_source_multi/__init__.py index 64fc977bd..890a8dd03 100644 --- a/sources/multi/large_image_source_multi/__init__.py +++ b/sources/multi/large_image_source_multi/__init__.py @@ -898,7 +898,7 @@ def _openSource(self, source, params=None): params = source.get('params', {}) ts = openFunc(source['path'], **params) if (self._dtype and np.dtype(ts.dtype).kind == 'f' and - np.dtype(self._dtype.kind) != 'f' and + np.dtype(self._dtype).kind != 'f' and 'sampleScale' not in source and 'sampleOffset' not in source): minval = maxval = 0 for f in range(ts.frames): diff --git a/test.Dockerfile b/test.Dockerfile index d68271fab..5008877d5 100644 --- a/test.Dockerfile +++ b/test.Dockerfile @@ -36,7 +36,7 @@ RUN apt-get update && \ libssl-dev \ libxml2-dev \ libxmlsec1-dev \ - llvm \ + # llvm \ make \ tk-dev \ wget \