diff --git a/build.xml b/build.xml index ad31e4e..c1ff87d 100644 --- a/build.xml +++ b/build.xml @@ -23,7 +23,7 @@ - + diff --git a/src/com/google/typography/font/compression/CompressionRunner.java b/src/com/google/typography/font/compression/CompressionRunner.java index cc18c15..75d6370 100644 --- a/src/com/google/typography/font/compression/CompressionRunner.java +++ b/src/com/google/typography/font/compression/CompressionRunner.java @@ -4,40 +4,26 @@ package com.google.typography.font.compression; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import com.google.common.io.Files; import com.google.typography.font.sfntly.Font; import com.google.typography.font.sfntly.FontFactory; -import com.google.typography.font.sfntly.Tag; -import com.google.typography.font.sfntly.data.ReadableFontData; -import com.google.typography.font.tools.conversion.eot.EOTWriter; -import com.google.typography.font.tools.conversion.eot.HdmxEncoder; -import com.google.typography.font.tools.conversion.woff.WoffWriter; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.PrintWriter; -import java.util.Arrays; import java.util.List; -import java.util.Map.Entry; -import java.util.Set; /** * A command-line tool for running different experimental compression code over * a corpus of fonts, and gathering statistics, particularly compression * efficiency. * - * This is not intended to be production code, and for certain codecs it will - * shell out to helper binaries, which is fine for the purposes of gathering - * statistics, but obviously not much else. + * This is not intended to be production code. * * @author Raph Levien */ public class CompressionRunner { - // private static final boolean DEBUG = false; public static void main(String[] args) throws IOException { boolean generateOutput = false; @@ -67,11 +53,11 @@ public class CompressionRunner { if (descs.isEmpty()) { descs.add("glyf/cbbox,triplet,code,reslice:woff2/lzma"); } - runTest(filenames, baseline, descs, generateOutput); + run(filenames, baseline, descs, generateOutput); } - private static void runTest(List filenames, String baseline, List descs, - boolean generateOutput) throws IOException { + private static void run(List filenames, String baseline, List descs, + boolean generateOutput) throws IOException { PrintWriter o = new PrintWriter(System.out); List stats = Lists.newArrayList(); for (int i = 0; i < descs.size(); i++) { @@ -82,10 +68,10 @@ public class CompressionRunner { for (String filename : filenames) { byte[] bytes = Files.toByteArray(new File(filename)); Font font = fontFactory.loadFonts(bytes)[0]; - byte[] baselineResult = runExperiment(font, baseline); + byte[] baselineResult = Experiment.run(font, baseline); o.printf("