Skip to content

Commit 43540db

Browse files
committed
Merge branch 'feature/graph' into develop
2 parents 07b4956 + 1e8e4e2 commit 43540db

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

colour_hdri/network/graphs.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
9494
self.add_input_port("orientation")
9595
self.add_input_port("bypass_input_transform", False)
9696
self.add_input_port("bypass_correct_lens_aberration", False)
97+
self.add_input_port("bit_depth", "float32")
9798
self.add_input_port("bypass_watermark", False)
9899
self.add_input_port("bypass_orient", False)
99100

@@ -334,6 +335,11 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
334335
self.nodes["WriteImage"],
335336
"path",
336337
)
338+
self.connect(
339+
"bit_depth",
340+
self.nodes["WriteImage"],
341+
"bit_depth",
342+
)
337343

338344
@notify_process_state
339345
def process(self, **kwargs: Any) -> None:
@@ -386,6 +392,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
386392
self.add_input_port("correct_distortion", True)
387393
self.add_input_port("downsample", 1)
388394
self.add_input_port("orientation")
395+
self.add_input_port("bit_depth", "float32")
389396
self.add_input_port("bypass_input_transform", False)
390397
self.add_input_port("bypass_correct_lens_aberration", False)
391398
self.add_input_port("bypass_watermark", False)
@@ -637,6 +644,11 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
637644
self.nodes["WriteImage"],
638645
"path",
639646
)
647+
self.connect(
648+
"bit_depth",
649+
self.nodes["WriteImage"],
650+
"bit_depth",
651+
)
640652

641653
@notify_process_state
642654
def process(self, **kwargs: Any) -> None:
@@ -1146,6 +1158,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
11461158
self.add_input_port("correct_chromatic_aberration", True)
11471159
self.add_input_port("correct_distortion", True)
11481160
self.add_input_port("orientation", None)
1161+
self.add_input_port("bit_depth", "float32")
11491162
self.add_input_port("bypass_input_transform", False)
11501163
self.add_input_port("bypass_correct_lens_aberration", False)
11511164
self.add_input_port("bypass_watermark", False)
@@ -1251,6 +1264,11 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
12511264
self.nodes["GraphRawProcessingCameraSensitivities"],
12521265
"orientation",
12531266
)
1267+
self.connect(
1268+
"bit_depth",
1269+
self.nodes["GraphRawProcessingCameraSensitivities"],
1270+
"bit_depth",
1271+
)
12541272
self.connect(
12551273
"bypass_input_transform",
12561274
self.nodes["GraphRawProcessingCameraSensitivities"],

colour_hdri/network/nodes.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
335335
self.add_input_port("path")
336336
self.add_input_port("exif_tags")
337337
self.add_input_port("output_colourspace")
338+
self.add_input_port("bit_depth", "float32")
338339
self.add_input_port("bypass", False)
339340

340341
@required("OpenImageIO")
@@ -374,7 +375,9 @@ def process(self, **kwargs: Any) -> None: # noqa: ARG002
374375
if not _is_linear_file_format(path):
375376
image = output_colourspace.cctf_encoding(image)
376377

377-
write_image_OpenImageIO(image, path, attributes=attributes)
378+
bit_depth = self.get_input("bit_depth")
379+
380+
write_image_OpenImageIO(image, path, bit_depth=bit_depth, attributes=attributes)
378381

379382
self.dirty = False
380383

0 commit comments

Comments
 (0)