From 9103590534c71593d7233fdf29f6d6cec4f8bc7a Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Fri, 26 Oct 2007 19:52:52 +0000
Subject: [PATCH] Load our images directly. Yay.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@311 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 src/java/com/threerings/jme/util/ImageCache.java | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/java/com/threerings/jme/util/ImageCache.java b/src/java/com/threerings/jme/util/ImageCache.java
index d9bcecc8..b4ebe17a 100644
--- a/src/java/com/threerings/jme/util/ImageCache.java
+++ b/src/java/com/threerings/jme/util/ImageCache.java
@@ -21,7 +21,6 @@
 
 package com.threerings.jme.util;
 
-import java.io.File;
 import java.lang.ref.WeakReference;
 import java.util.HashMap;
 import java.util.logging.Level;
@@ -39,8 +38,6 @@ import java.awt.image.DataBuffer;
 import java.awt.image.DataBufferByte;
 import java.awt.image.Raster;
 
-import javax.imageio.ImageIO;
-
 import com.jme.image.Image;
 import com.jmex.bui.BImage;
 
@@ -230,9 +227,8 @@ public class ImageCache
 
         // load the image data from the resource manager
         BufferedImage bufimg;
-        File ifile = _rsrcmgr.getResourceFile(rsrcPath);
         try {
-            bufimg = ImageIO.read(ifile);
+            bufimg = _rsrcmgr.getImageResource(rsrcPath);
         } catch (Throwable t) {
             log.log(Level.WARNING, "Unable to load image resource " +
                     "[path=" + ifile + "].", t);
@@ -278,9 +274,8 @@ public class ImageCache
 
         // load the image data from the resource manager
         BufferedImage bufimg;
-        File ifile = _rsrcmgr.getResourceFile(rsrcPath);
         try {
-            bufimg = ImageIO.read(ifile);
+            bufimg = _rsrcmgr.getImageResource(rsrcPath);
         } catch (Throwable t) {
             if (returnNull) {
                 return null;
@@ -316,9 +311,8 @@ public class ImageCache
 
         // load the image data from the resource manager
         BufferedImage bufimg, silimg;
-        File ifile = _rsrcmgr.getResourceFile(rsrcPath);
         try {
-            bufimg = ImageIO.read(ifile);
+            bufimg = _rsrcmgr.getImageResource(rsrcPath);
 
             // now turn it into a silhouette
             silimg = new BufferedImage(bufimg.getWidth(), bufimg.getHeight(),
@@ -365,9 +359,8 @@ public class ImageCache
         }
 
         // load the image data from the resource manager
-        File ifile = _rsrcmgr.getResourceFile(rsrcPath);
         try {
-            image = ImageIO.read(ifile);
+            image = _rsrcmgr.getImageResource(rsrcPath);
         } catch (Throwable t) {
             log.log(Level.WARNING, "Unable to load image resource [path=" + ifile + "].", t);
             // cope; return an error image of abitrary size