From e2ca1c0589a40b700a042e3fcfc9b5455376f536 Mon Sep 17 00:00:00 2001 From: Vojtech Moravec <vojtech.moravec.st@vsb.cz> Date: Sun, 29 Mar 2020 10:19:59 +0200 Subject: [PATCH] Don't report MB if file is less than 1MB in size. --- .../compression/ImageDecompressor.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/azgracompress/compression/ImageDecompressor.java b/src/main/java/azgracompress/compression/ImageDecompressor.java index 9ca804f..8f29716 100644 --- a/src/main/java/azgracompress/compression/ImageDecompressor.java +++ b/src/main/java/azgracompress/compression/ImageDecompressor.java @@ -122,13 +122,22 @@ public class ImageDecompressor extends CompressorDecompressorBase { if (decompressor != null) { final long expectedDataSize = decompressor.getExpectedDataSize(header); validFile = (dataSize == expectedDataSize); - logBuilder.append(String.format("File size:\t\t%d B (%d kB) (%d MB)\n", - fileSize, - (fileSize / 1000), - ((fileSize / 1000) / 1000))); + + logBuilder.append("File size:\t\t").append(fileSize).append(" B"); + + final long KB = (fileSize / 1000); + if (KB > 0) { + logBuilder.append(" (").append(KB).append(" KB)"); + final long MB = (KB / 1000); + if (MB > 0) { + logBuilder.append(" (").append(MB).append(" MB)"); + } + } + logBuilder.append('\n'); logBuilder.append("Header size:\t\t").append(headerSize).append(" Bytes\n"); - 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"); final long pixelCount = header.getImageDims().multiplyTogether(); final long uncompressedSize = 2 * pixelCount; // We assert 16 bit (2 byte) pixel. -- GitLab