fix renderVarblocks with lossless input

Traneptora · Oct 29, 2024 · de1fb07 · de1fb07
1 parent 52b08d2
commit de1fb07
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/java/com/traneptora/jxlatte/JXLCodestreamDecoder.java b/java/com/traneptora/jxlatte/JXLCodestreamDecoder.java
@@ -27,7 +27,8 @@
 
 public class JXLCodestreamDecoder {
 
-    private static void copyToCanvas(ImageBuffer canvas, Point start, Point off, Dimension size, ImageBuffer frameBuffer) {
+    private static void copyToCanvas(ImageBuffer canvas, Point start, Point off,
+            Dimension size, ImageBuffer frameBuffer) {
         Object[] canvasB = canvas.isInt() ? canvas.getIntBuffer() : canvas.getFloatBuffer();
         Object[] frameB = frameBuffer.isInt() ? frameBuffer.getIntBuffer() : frameBuffer.getFloatBuffer();
         for (int y = 0; y < size.height; y++) {

diff --git a/java/com/traneptora/jxlatte/bundle/BitDepthHeader.java b/java/com/traneptora/jxlatte/bundle/BitDepthHeader.java
@@ -27,6 +27,10 @@ public BitDepthHeader(Bitreader reader) throws IOException {
         }
     }
 
+    public int getMaxValue() {
+        return ~(~0 << bitsPerSample);
+    }
+
     @Override
     public int hashCode() {
         return Objects.hash(usesFloatSamples, bitsPerSample, expBits);

diff --git a/java/com/traneptora/jxlatte/frame/Frame.java b/java/com/traneptora/jxlatte/frame/Frame.java
@@ -467,11 +467,14 @@ public void decodeFrame(ImageBuffer[] lfBuffer) throws IOException {
 
     // do this in RGB
     public void drawVarblocks() {
+        float[][][] buff = Stream.of(buffer[0], buffer[1], buffer[2]).map(b -> {
+            b.castToFloatIfInt(globalMetadata.getBitDepthHeader().getMaxValue());
+            return b.getFloatBuffer();
+        }).toArray(float[][][]::new);
         for (LFGroup lfg : lfGroups) {
             Point pixelPos = getLFGroupLocation(lfg.lfGroupID);
             pixelPos.y <<= 11;
             pixelPos.x <<= 11;
-            float[][][] buff = Stream.of(buffer).map(ImageBuffer::getFloatBuffer).toArray(float[][][]::new);
             for (int i = 0; i < lfg.hfMetadata.blockList.length; i++) {
                 Point block = lfg.hfMetadata.blockList[i];
                 TransformType tt = lfg.hfMetadata.dctSelect[block.y][block.x];