From 168a1bdfd0d2aef46b5e6e2713d31b58992d4366 Mon Sep 17 00:00:00 2001 From: Vojtech Moravec <vojtech.moravec.st@vsb.cz> Date: Tue, 24 Nov 2020 14:57:49 +0100 Subject: [PATCH] Rename the BitStream functions. --- .../cz/it4i/qcmp/compression/SQImageDecompressor.java | 7 ++++--- .../cz/it4i/qcmp/compression/VQImageDecompressor.java | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/cz/it4i/qcmp/compression/SQImageDecompressor.java b/src/main/java/cz/it4i/qcmp/compression/SQImageDecompressor.java index 66f8d3a..f184812 100644 --- a/src/main/java/cz/it4i/qcmp/compression/SQImageDecompressor.java +++ b/src/main/java/cz/it4i/qcmp/compression/SQImageDecompressor.java @@ -95,7 +95,7 @@ public class SQImageDecompressor extends CompressorDecompressorBase implements I try (final InBitStream inBitStream = new InBitStream(compressedStream, header.getBitsPerCodebookIndex(), planeDataSize)) { - inBitStream.readToBuffer(); + inBitStream.fillEntireBuffer(); inBitStream.setAllowReadFromUnderlyingStream(false); final int[] decompressedValues = new int[planePixelCount]; @@ -166,7 +166,7 @@ public class SQImageDecompressor extends CompressorDecompressorBase implements I final int planeDataSize = (int) header.getPlaneDataSizes()[planeIndex]; try (final InBitStream inBitStream = new InBitStream(compressedStream, header.getBitsPerCodebookIndex(), planeDataSize)) { - inBitStream.readToBuffer(); + inBitStream.fillEntireBuffer(); inBitStream.setAllowReadFromUnderlyingStream(false); final int[] decompressedValues = new int[planePixelCount]; @@ -191,7 +191,8 @@ public class SQImageDecompressor extends CompressorDecompressorBase implements I } @Override - public short[] decompressStreamMode(final DataInputStream compressedStream, final QCMPFileHeader header) throws ImageDecompressionException { + public short[] decompressStreamMode(final DataInputStream compressedStream, + final QCMPFileHeader header) throws ImageDecompressionException { throw new ImageDecompressionException("Not implemented yet."); } } diff --git a/src/main/java/cz/it4i/qcmp/compression/VQImageDecompressor.java b/src/main/java/cz/it4i/qcmp/compression/VQImageDecompressor.java index 31920ff..d3b3e40 100644 --- a/src/main/java/cz/it4i/qcmp/compression/VQImageDecompressor.java +++ b/src/main/java/cz/it4i/qcmp/compression/VQImageDecompressor.java @@ -162,7 +162,7 @@ public class VQImageDecompressor extends CompressorDecompressorBase implements I try (final InBitStream inBitStream = new InBitStream(compressedStream, header.getBitsPerCodebookIndex(), planeDataSize)) { - inBitStream.readToBuffer(); + inBitStream.fillEntireBuffer(); inBitStream.setAllowReadFromUnderlyingStream(false); final int[][] decompressedVectors = new int[(int) planeVectorCount][vectorSize]; @@ -212,7 +212,7 @@ public class VQImageDecompressor extends CompressorDecompressorBase implements I try (final InBitStream inBitStream = new InBitStream(compressedStream, header.getBitsPerCodebookIndex(), planeDataSize)) { - inBitStream.readToBuffer(); + inBitStream.fillEntireBuffer(); inBitStream.setAllowReadFromUnderlyingStream(false); final int[][] decompressedVectors = new int[(int) planeVectorCount][vectorSize]; @@ -284,7 +284,7 @@ public class VQImageDecompressor extends CompressorDecompressorBase implements I final int[][] decompressedVoxels = new int[voxelLayerVoxelCount][vectorSize]; try (final InBitStream inBitStream = new InBitStream(compressedStream, header.getBitsPerCodebookIndex(), voxelLayerDataSize)) { - inBitStream.readToBuffer(); + inBitStream.fillEntireBuffer(); inBitStream.setAllowReadFromUnderlyingStream(false); for (int voxelIndex = 0; voxelIndex < voxelLayerVoxelCount; voxelIndex++) { @@ -342,7 +342,7 @@ public class VQImageDecompressor extends CompressorDecompressorBase implements I final int[][] decompressedVoxels = new int[voxelLayerVoxelCount][vectorSize]; try (final InBitStream inBitStream = new InBitStream(compressedStream, header.getBitsPerCodebookIndex(), voxelLayerDataSize)) { - inBitStream.readToBuffer(); + inBitStream.fillEntireBuffer(); inBitStream.setAllowReadFromUnderlyingStream(false); for (int voxelIndex = 0; voxelIndex < voxelLayerVoxelCount; voxelIndex++) { -- GitLab