From 7752cca5b00fc398d19968ccde39e28518bb6b48 Mon Sep 17 00:00:00 2001 From: Dave Hoover Date: Fri, 2 Jul 2010 23:20:28 +0000 Subject: [PATCH] Document + change name. "keepRawPngs" is a bit confusing since we tend to refer to the FastImageIO format as "raw" git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@933 ed5b42cb-e716-0410-a449-f6a68f950b19 --- .../media/tile/bundle/tools/TileSetBundler.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java b/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java index e3da19cd..394cff4f 100644 --- a/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java +++ b/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java @@ -361,12 +361,13 @@ public class TileSetBundler * @param target the tileset bundle file that will be created. * @param bundle contains the tilesets we'd like to save out to the bundle. * @param improv the image provider. - * @param imageBase the base directory for getting images for non - * ObjectTileSet tilesets. + * @param imageBase the base directory for getting images for non-ObjectTileSet tilesets. + * @param keepOriginalPngs bundle up the original PNGs as PNGs instead of converting to the + * FastImageIO raw format */ public static boolean createBundleJar ( File target, TileSetBundle bundle, ImageProvider improv, String imageBase, - boolean keepRawPngs) + boolean keepOriginalPngs) throws IOException { // now we have to create the actual bundle file @@ -396,7 +397,7 @@ public class TileSetBundler } // if this is an object tileset, trim it - if (!keepRawPngs && (set instanceof ObjectTileSet)) { + if (!keepOriginalPngs && (set instanceof ObjectTileSet)) { // set the tileset up with an image provider; we // need to do this so that we can trim it! set.setImageProvider(improv); @@ -431,7 +432,7 @@ public class TileSetBundler File ifile = new File(imageBase, imagePath); try { BufferedImage image = ImageIO.read(ifile); - if (!keepRawPngs && FastImageIO.canWrite(image)) { + if (!keepOriginalPngs && FastImageIO.canWrite(image)) { imagePath = adjustImagePath(imagePath); jar.putNextEntry(new JarEntry(imagePath)); set.setImagePath(imagePath);