From 09573b52acb390c5a322e2f2ffee4c5bd04d8a89 Mon Sep 17 00:00:00 2001 From: Harald Kuhr Date: Tue, 7 Sep 2021 09:24:27 +0200 Subject: [PATCH] #624: Added metadata support for 16 bit USHORT gray. (cherry picked from commit 060b6cf852109cdf5e56225b3f5f9f0865ca9f5f) --- .../com/twelvemonkeys/imageio/plugins/tga/TGAMetadata.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/imageio/imageio-tga/src/main/java/com/twelvemonkeys/imageio/plugins/tga/TGAMetadata.java b/imageio/imageio-tga/src/main/java/com/twelvemonkeys/imageio/plugins/tga/TGAMetadata.java index f3755c9c..a6abd54a 100755 --- a/imageio/imageio-tga/src/main/java/com/twelvemonkeys/imageio/plugins/tga/TGAMetadata.java +++ b/imageio/imageio-tga/src/main/java/com/twelvemonkeys/imageio/plugins/tga/TGAMetadata.java @@ -193,10 +193,13 @@ final class TGAMetadata extends AbstractMetadata { switch (header.getPixelDepth()) { case 8: - bitsPerSample.setAttribute("value", createListValue(1, Integer.toString(header.getPixelDepth()))); + bitsPerSample.setAttribute("value", createListValue(1, "8")); break; case 16: - if (header.getAttributeBits() > 0 && extensions != null && extensions.hasAlpha()) { + if (header.getImageType() == TGA.IMAGETYPE_MONOCHROME || header.getImageType() == TGA.IMAGETYPE_MONOCHROME_RLE) { + bitsPerSample.setAttribute("value", "16"); + } + else if (header.getAttributeBits() > 0 && extensions != null && extensions.hasAlpha()) { bitsPerSample.setAttribute("value", "5, 5, 5, 1"); } else {