Skip to content

Commit ed382b2

Browse files
committed
Compression user arguments general tiff availability
1 parent 1928214 commit ed382b2

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed

tiledb/bioimg/converters/ome_tiff.py

+19-20
Original file line numberDiff line numberDiff line change
@@ -487,26 +487,25 @@ def compute_level_metadata(
487487
"timeIncrementUnit", "s"
488488
)
489489

490-
writer_metadata.update(writer_kwargs.get("tiff_options", {}))
491-
492-
if (
493-
"C" in original_axes
494-
and original_shape[original_axes.index("C")] == 3
495-
and image_dtype == np.dtype(np.uint8)
496-
):
497-
writer_metadata.setdefault("compression", tifffile.COMPRESSION.JPEG)
498-
writer_metadata.setdefault("compressionargs", {"level": 70})
499-
writer_metadata.setdefault("photometric", tifffile.PHOTOMETRIC.RGB)
500-
else:
501-
writer_metadata.setdefault(
502-
"compression", tifffile.COMPRESSION.ADOBE_DEFLATE
503-
)
504-
writer_metadata.setdefault(
505-
"photometric",
506-
json.loads(array_metadata.get("json_write_kwargs", "{}")).get(
507-
"photometric", tifffile.PHOTOMETRIC.MINISBLACK
508-
),
509-
)
490+
if (
491+
"C" in original_axes
492+
and original_shape[original_axes.index("C")] == 3
493+
and image_dtype == np.dtype(np.uint8)
494+
):
495+
writer_metadata.setdefault("compression", tifffile.COMPRESSION.JPEG)
496+
writer_metadata.setdefault("compressionargs", {"level": 70})
497+
writer_metadata.setdefault("photometric", tifffile.PHOTOMETRIC.RGB)
498+
else:
499+
writer_metadata.setdefault(
500+
"compression", tifffile.COMPRESSION.ADOBE_DEFLATE
501+
)
502+
writer_metadata.setdefault(
503+
"photometric",
504+
json.loads(array_metadata.get("json_write_kwargs", "{}")).get(
505+
"photometric", tifffile.PHOTOMETRIC.MINISBLACK
506+
),
507+
)
508+
writer_metadata.update(writer_kwargs.get("tiff_options", {}))
510509
self._logger.debug(f"Writer metadata: {writer_metadata}")
511510
return writer_metadata
512511

0 commit comments

Comments
 (0)