From aa7cef1891f1aa42a7e6182f68c096810e95aed8 Mon Sep 17 00:00:00 2001 From: Dave Hoover Date: Sat, 1 Jan 2011 05:03:05 +0000 Subject: [PATCH] We're depending on at least java 1.5 at this point. git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1102 ed5b42cb-e716-0410-a449-f6a68f950b19 --- src/main/java/com/threerings/resource/ResourceManager.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/com/threerings/resource/ResourceManager.java b/src/main/java/com/threerings/resource/ResourceManager.java index c8b597c6..9b6441b0 100644 --- a/src/main/java/com/threerings/resource/ResourceManager.java +++ b/src/main/java/com/threerings/resource/ResourceManager.java @@ -886,11 +886,7 @@ public class ResourceManager { BufferedImage image; - // Java 1.4.2 and below can't deal with the MemoryCacheImageInputStream without throwing - // a hissy fit. - if (iis instanceof ImageInputStream || - getNumericJavaVersion(System.getProperty("java.version")) < - getNumericJavaVersion("1.5.0")) { + if (iis instanceof ImageInputStream) { image = ImageIO.read(iis); } else {