Skip to content
Snippets Groups Projects
Commit 0a2190c6 authored by Vojtech Moravec's avatar Vojtech Moravec
Browse files

Fixed bug in getImageDecompressor.

parent 9ffbddbd
No related branches found
No related tags found
No related merge requests found
...@@ -34,8 +34,8 @@ public class ImageDecompressor extends CompressorDecompressorBase { ...@@ -34,8 +34,8 @@ public class ImageDecompressor extends CompressorDecompressorBase {
* *
* @return Correct implementation of image decompressor. * @return Correct implementation of image decompressor.
*/ */
private IImageDecompressor getImageDecompressor() { private IImageDecompressor getImageDecompressor(final QCMPFileHeader header) {
switch (options.getQuantizationType()) { switch (header.getQuantizationType()) {
case Scalar: case Scalar:
return new SQImageDecompressor(options); return new SQImageDecompressor(options);
case Vector1D: case Vector1D:
...@@ -109,9 +109,9 @@ public class ImageDecompressor extends CompressorDecompressorBase { ...@@ -109,9 +109,9 @@ public class ImageDecompressor extends CompressorDecompressorBase {
final long fileSize = new File(options.getInputFile()).length(); final long fileSize = new File(options.getInputFile()).length();
final long dataSize = fileSize - QCMPFileHeader.QCMP_HEADER_SIZE; final long dataSize = fileSize - QCMPFileHeader.QCMP_HEADER_SIZE;
final var decompressor = getImageDecompressor(); final var decompressor = getImageDecompressor(header);
if (decompressor != null) { if (decompressor != null) {
final long expectedDataSize = getImageDecompressor().getExpectedDataSize(header); final long expectedDataSize = decompressor.getExpectedDataSize(header);
validFile = (dataSize == expectedDataSize); validFile = (dataSize == expectedDataSize);
logBuilder.append("Data size:\t\t").append(dataSize).append(" Bytes ").append(dataSize == expectedDataSize ? "(correct)\n" : "(INVALID)\n"); logBuilder.append("Data size:\t\t").append(dataSize).append(" Bytes ").append(dataSize == expectedDataSize ? "(correct)\n" : "(INVALID)\n");
} }
...@@ -137,7 +137,7 @@ public class ImageDecompressor extends CompressorDecompressorBase { ...@@ -137,7 +137,7 @@ public class ImageDecompressor extends CompressorDecompressorBase {
return false; return false;
} }
IImageDecompressor imageDecompressor = getImageDecompressor(); IImageDecompressor imageDecompressor = getImageDecompressor(header);
if (imageDecompressor == null) { if (imageDecompressor == null) {
System.err.println("Unable to create correct decompressor."); System.err.println("Unable to create correct decompressor.");
return false; return false;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment