From 6258d6e28e4c423b0dc8ad4a8ec940bb6254107c Mon Sep 17 00:00:00 2001
From: Matt Jensen <matt@threerings.net>
Date: Tue, 20 Jan 2009 01:24:45 +0000
Subject: [PATCH] Allowing raw images to be read from a stream.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@759 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 .../com/threerings/resource/ResourceManager.java   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/java/com/threerings/resource/ResourceManager.java b/src/java/com/threerings/resource/ResourceManager.java
index 61020e29..79651859 100644
--- a/src/java/com/threerings/resource/ResourceManager.java
+++ b/src/java/com/threerings/resource/ResourceManager.java
@@ -868,9 +868,19 @@ public class ResourceManager
             return null;
         } else if (useFastIO) {
             return FastImageIO.read(file);
-        } else {
-            return ImageIO.read(file);
         }
+        return ImageIO.read(file);
+    }
+
+    protected static BufferedImage loadImage (InputStream iis, boolean useFastIO)
+        throws IOException
+    {
+        if (iis == null) {
+            return null;
+        } else if (useFastIO) {
+            return FastImageIO.read(iis);
+        }
+        return ImageIO.read(iis);
     }
 
     /**