Reverted TiffSource: legacy support providing executer for nested mul…

…ti-threading
FrancisCrickInstitute · Mar 4, 2024 · 8259aeb · 8259aeb
1 parent 86cb13b
commit 8259aeb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/OmeSliCC/OmeSource.py b/OmeSliCC/OmeSource.py
@@ -263,7 +263,7 @@ def render(self, image: np.ndarray, source_dimension_order: str, t: int = 0, z:
         tot_alpha = 0
         n = len(self.channels)
 
-        is_rgb = (self.get_nchannels() == 3 and (n <= 1 or n == 3))
+        is_rgb = (self.get_nchannels() in (3, 4) and (n <= 1 or n == 3))
         do_normalisation = (image.dtype.itemsize == 2)
 
         if not is_rgb:

diff --git a/OmeSliCC/TiffSource.py b/OmeSliCC/TiffSource.py
@@ -34,12 +34,13 @@ def __init__(self,
                  filename: str,
                  source_pixel_size: list = None,
                  target_pixel_size: list = None,
-                 source_info_required: bool = False):
+                 source_info_required: bool = False,
+                 executor: ThreadPoolExecutor = None):
 
         super().__init__()
         self.compressed = False
         self.decompressed = False
-        self.executor = None
+        self.executor = executor
         self.data = bytes()
         self.arrays = []