diff --git a/src/main/java/azgracompress/benchmark/VQBenchmark.java b/src/main/java/azgracompress/benchmark/VQBenchmark.java index d4847493d32ad617eae7fc2a51e6e6d842c6db4e..1be7eb4e6b08c64024737322dfbf36c4321c56db 100644 --- a/src/main/java/azgracompress/benchmark/VQBenchmark.java +++ b/src/main/java/azgracompress/benchmark/VQBenchmark.java @@ -32,7 +32,7 @@ public class VQBenchmark extends BenchmarkBase { private ImageU16 reconstructImageFromQuantizedVectors(final ImageU16 plane, final int[][] vectors, final V2i qVector) { - Chunk2D reconstructedChunk = new Chunk2D(new V2i(rawImageDims.getX(), rawImageDims.getY()), new V2l(0, 0)); + Chunk2D reconstructedChunk = new Chunk2D(new V2i(rawImageDims.getX(), rawImageDims.getY())); if (qVector.getY() > 1) { reconstructedChunk.reconstructFrom2DVectors(vectors, qVector); } else { diff --git a/src/main/java/azgracompress/compression/VQImageCompressor.java b/src/main/java/azgracompress/compression/VQImageCompressor.java index 4543ed9b2e6702f01f81d612dbea4bafe76317d1..1bb960b73be19b3b997b52514badcf29622d147f 100644 --- a/src/main/java/azgracompress/compression/VQImageCompressor.java +++ b/src/main/java/azgracompress/compression/VQImageCompressor.java @@ -215,7 +215,7 @@ public class VQImageCompressor extends CompressorDecompressorBase implements IIm reportStatusToListeners(inputDataInfo.isPlaneRangeSet() ? "VQ: Loading plane range data." : "VQ: Loading all planes data."); final int[] planeIndices = getPlaneIndicesForCompression(); - final int chunkCountPerPlane = Chunk2D.calculateRequiredChunkCountPerPlane( + final int chunkCountPerPlane = Chunk2D.calculateRequiredChunkCount( inputDataInfo.getDimensions().toV2i(), options.getVectorDimension()); final int totalChunkCount = chunkCountPerPlane * planeIndices.length; diff --git a/src/main/java/azgracompress/compression/VQImageDecompressor.java b/src/main/java/azgracompress/compression/VQImageDecompressor.java index 064372278ab10f3f9bcab485eec1bc8fa62edcce..dafcb05d003e9e5ad9ae9a22d706816546d0691c 100644 --- a/src/main/java/azgracompress/compression/VQImageDecompressor.java +++ b/src/main/java/azgracompress/compression/VQImageDecompressor.java @@ -64,7 +64,7 @@ public class VQImageDecompressor extends CompressorDecompressorBase implements I final V2i qVector, final V3i imageDims) { - Chunk2D reconstructedChunk = new Chunk2D(new V2i(imageDims.getX(), imageDims.getY()), new V2l(0, 0)); + Chunk2D reconstructedChunk = new Chunk2D(new V2i(imageDims.getX(), imageDims.getY())); if (qVector.getY() > 1) { reconstructedChunk.reconstructFrom2DVectors(vectors, qVector); } else { @@ -205,7 +205,6 @@ public class VQImageDecompressor extends CompressorDecompressorBase implements I assert (codebook != null && huffman != null); - final int planeDataSize = (int) header.getPlaneDataSizes()[planeIndex]; try (InBitStream inBitStream = new InBitStream(compressedStream, header.getBitsPerCodebookIndex(), diff --git a/src/main/java/azgracompress/data/Chunk2D.java b/src/main/java/azgracompress/data/Chunk2D.java index 6242ad33380a0d5230cb5bb32a520f9a8c91b16c..e562d437d6798ce225d61cc651eef3d77e824a2f 100644 --- a/src/main/java/azgracompress/data/Chunk2D.java +++ b/src/main/java/azgracompress/data/Chunk2D.java @@ -5,30 +5,26 @@ public class Chunk2D { private int[] data; private final V2i dims; - private final V2l offset; /** * Create the Chunk2D of given dimensions, offset and initialize it with data. * - * @param dims Dimensions of the chunk. - * @param offset Offset of the chunk. - * @param data Chunk data. + * @param dims Dimensions of the chunk. + * @param data Chunk data. */ - public Chunk2D(final V2i dims, final V2l offset, final int[] data) { + public Chunk2D(final V2i dims, final int[] data) { this.dims = dims; this.data = data; - this.offset = offset; assert (data.length == (dims.getX() * dims.getY())) : "Wrong box data."; } /** * Create Chunk2D of given dimensions and offset. Allocates the data. * - * @param dims Dimensions of the chunk. - * @param offset Offset of the chunk. + * @param dims Dimensions of the chunk. */ - public Chunk2D(final V2i dims, final V2l offset) { - this(dims, offset, new int[dims.getX() * dims.getY()]); + public Chunk2D(final V2i dims) { + this(dims, new int[dims.getX() * dims.getY()]); } /** @@ -69,10 +65,6 @@ public class Chunk2D { return dims; } - public V2l getOffset() { - return offset; - } - @Override public String toString() { return String.format("2D shape %s %d values", dims.toString(), data.length); @@ -273,8 +265,6 @@ public class Chunk2D { final Chunk2D otherChunk = (Chunk2D) obj; if (data.length != otherChunk.data.length) { return false; - } else if (!(offset.equals(otherChunk.offset))) { - return false; } else { for (int i = 0; i < data.length; i++) { if (data[i] != otherChunk.data[i]) { diff --git a/src/main/java/azgracompress/data/ImageU16.java b/src/main/java/azgracompress/data/ImageU16.java index 8c5f7a53020ebcab62013f79f6e8e7e6608d9b5a..65e9afbff0f1dcbaa8bef18845520e2382600a06 100644 --- a/src/main/java/azgracompress/data/ImageU16.java +++ b/src/main/java/azgracompress/data/ImageU16.java @@ -25,7 +25,7 @@ public class ImageU16 { } public Chunk2D as2dChunk() { - return new Chunk2D(new V2i(width, height), new V2l(0, 0), data); + return new Chunk2D(new V2i(width, height), data); } public ImageU16 difference(final ImageU16 other) {