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

Leave preload code in SQImageCompressor.

parent 5b67cd0e
No related branches found
No related tags found
No related merge requests found
......@@ -5,7 +5,7 @@ import cz.it4i.qcmp.cache.QuantizationCacheManager;
import cz.it4i.qcmp.cli.CliConstants;
import cz.it4i.qcmp.cli.CompressionOptionsCLIParser;
import cz.it4i.qcmp.cli.CustomFunctionBase;
import cz.it4i.qcmp.cli.functions.EntropyCalculation;
import cz.it4i.qcmp.cli.functions.CalculateDifference;
import cz.it4i.qcmp.compression.ImageCompressor;
import cz.it4i.qcmp.compression.ImageDecompressor;
import cz.it4i.qcmp.fileformat.FileExtensions;
......@@ -93,7 +93,7 @@ public class DataCompressor {
// V
//CustomFunctionBase customFunction = new MeasurePlaneErrorFunction(parsedCliOptions);
// final CustomFunctionBase customFunction = new EntropyCalculation(compressionOptionsCLIParsed);
final CustomFunctionBase cf = new EntropyCalculation(compressionOptionsCLIParsed);
final CustomFunctionBase cf = new CalculateDifference(compressionOptionsCLIParsed);
if (!cf.run()) {
System.err.println("Errors occurred during custom function.");
}
......
......@@ -148,10 +148,21 @@ public class SQImageCompressor extends CompressorDecompressorBase implements IIm
final int[] planeIndices = getPlaneIndicesForCompression(options.getInputDataInfo());
final long[] planeDataSizes = new long[planeIndices.length];
int planeCounter = 0;
// final int[][] preloadedPlaneData;
// try {
// preloadedPlaneData = planeLoader.loadPlanesU16DataTo2dArray(planeIndices);
// } catch (final IOException ex) {
// throw new ImageCompressionException("Unable to preload plane data.", ex);
// }
// final int index = 0;
for (final int planeIndex : planeIndices) {
stopwatch.restart();
final int[] planeData;
// planeData = preloadedPlaneData[index++];
try {
planeData = planeLoader.loadPlaneData(planeIndex);
} catch (final IOException ex) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment