AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If our image has been converted to fast format; load it up fast and propah!

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2478 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2003-04-27 06:35:09 +00:00
parent cab6cfb131
commit b84f62e35d
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/media/tile/bundle/TileSetBundle.java
+10 -7
View File
@@ -1,12 +1,9 @@
// //
// $Id: TileSetBundle.java,v 1.13 2003/01/13 22:49:47 mdb Exp $ // $Id: TileSetBundle.java,v 1.14 2003/04/27 06:35:09 mdb Exp $
package com.threerings.media.tile.bundle; package com.threerings.media.tile.bundle;
import java.awt.Image; import java.awt.image.BufferedImage;
import javax.imageio.ImageIO;
import javax.imageio.stream.FileImageInputStream;
import javax.imageio.stream.ImageInputStream;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
@@ -17,11 +14,13 @@ import java.io.ObjectOutputStream;
import java.io.Serializable; import java.io.Serializable;
import java.util.Iterator; import java.util.Iterator;
import javax.imageio.ImageIO;
import com.samskivert.util.HashIntMap; import com.samskivert.util.HashIntMap;
import com.threerings.resource.ResourceBundle; import com.threerings.resource.ResourceBundle;
import com.threerings.media.image.FastImageIO;
import com.threerings.media.image.ImageDataProvider; import com.threerings.media.image.ImageDataProvider;
import com.threerings.media.tile.TileSet; import com.threerings.media.tile.TileSet;
@@ -89,10 +88,14 @@ public class TileSetBundle extends HashIntMap
} }
// documentation inherited from interface // documentation inherited from interface
public ImageInputStream loadImageData (String path) public BufferedImage loadImage (String path)
throws IOException throws IOException
{ {
return new FileImageInputStream(_bundle.getResourceFile(path)); if (path.endsWith(FastImageIO.FILE_SUFFIX)) {
return FastImageIO.read(_bundle.getResourceFile(path));
} else {
return ImageIO.read(_bundle.getResourceFile(path));
}
} }
// custom serialization process // custom serialization process