From c0113da92aa3bff546fae83efbaeaa7ff85b63e6 Mon Sep 17 00:00:00 2001 From: Eric Trautman Date: Sat, 23 Nov 2024 20:30:37 -0500 Subject: [PATCH] use the ARGB converter if it is explicitly requested or if masks are included --- .../org/janelia/render/client/RenderTilesClient.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/render-ws-java-client/src/main/java/org/janelia/render/client/RenderTilesClient.java b/render-ws-java-client/src/main/java/org/janelia/render/client/RenderTilesClient.java index 1bfe69a83..1c28a9a88 100644 --- a/render-ws-java-client/src/main/java/org/janelia/render/client/RenderTilesClient.java +++ b/render-ws-java-client/src/main/java/org/janelia/render/client/RenderTilesClient.java @@ -405,18 +405,18 @@ private void renderTile(final String tileId) final File tileFile = getTileFile(tileSpec); final BufferedImage bufferedImage; - if (clientParameters.excludeMask) { - // skip conversion step if we don't need to worry about mask - bufferedImage = imageProcessorWithMasks.ip.getBufferedImage(); + if ((clientParameters.renderType == RenderType.ARGB) || (! clientParameters.excludeMask)) { + // this incorporates the mask if it exists into the rendered image + bufferedImage = ArgbRenderer.CONVERTER.convertProcessorWithMasksToImage(renderParameters, + imageProcessorWithMasks); } else if (clientParameters.renderType == RenderType.EIGHT_BIT) { + // this only converts the image processor and ignores the mask bufferedImage = ByteRenderer.CONVERTER.convertProcessorWithMasksToImage(renderParameters, imageProcessorWithMasks); } else if (clientParameters.renderType == RenderType.SIXTEEN_BIT) { + // this only converts the image processor and ignores the mask bufferedImage = ShortRenderer.CONVERTER.convertProcessorWithMasksToImage(renderParameters, imageProcessorWithMasks); - } else if (clientParameters.renderType == RenderType.ARGB) { - bufferedImage = ArgbRenderer.CONVERTER.convertProcessorWithMasksToImage(renderParameters, - imageProcessorWithMasks); } else { throw new IllegalArgumentException("unsupported render type: " + clientParameters.renderType); }