From 872e10f11da83b3d75c5c8a34667c1d43589b1d9 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Sun, 28 Apr 2002 01:19:11 +0000
Subject: [PATCH] Catch IllegalArgumentException if it's thrown while we're
 loading our images. The PNG loader seems to be kind enough to throw fucking
 runtime exceptions when it encounters file format problems instead of
 throwing IOException or some other declared exception.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1310 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../threerings/media/image/ImageManager.java  | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/java/com/threerings/media/image/ImageManager.java b/src/java/com/threerings/media/image/ImageManager.java
index 007fe7135..9fe47d881 100644
--- a/src/java/com/threerings/media/image/ImageManager.java
+++ b/src/java/com/threerings/media/image/ImageManager.java
@@ -1,5 +1,5 @@
 //
-// $Id: ImageManager.java,v 1.15 2002/03/08 09:34:42 mdb Exp $
+// $Id: ImageManager.java,v 1.16 2002/04/28 01:19:11 mdb Exp $
 
 package com.threerings.media;
 
@@ -20,6 +20,8 @@ import javax.imageio.ImageReader;
 import javax.imageio.stream.ImageInputStream;
 import javax.imageio.stream.MemoryCacheImageInputStream;
 
+import com.samskivert.io.NestableIOException;
+
 import com.threerings.resource.ResourceManager;
 import com.threerings.media.Log;
 import com.threerings.media.util.ImageUtil;
@@ -79,7 +81,12 @@ public class ImageManager
     public Image loadImage (String path)
         throws IOException
     {
-        return _loader.loadImage(_rmgr.getResource(path));
+        try {
+            return _loader.loadImage(_rmgr.getResource(path));
+        } catch (IllegalArgumentException iae) {
+            String errmsg = "Error loading image [path=" + path + "]";
+            throw new NestableIOException(errmsg, iae);
+        }
     }
 
     /**
@@ -91,7 +98,12 @@ public class ImageManager
     public Image loadImage (InputStream source)
         throws IOException
     {
-        return _loader.loadImage(source);
+        try {
+            return _loader.loadImage(source);
+        } catch (IllegalArgumentException iae) {
+            String errmsg = "Error loading image";
+            throw new NestableIOException(errmsg, iae);
+        }
     }
 
     /**
@@ -102,7 +114,7 @@ public class ImageManager
     public Image createImage (InputStream source)
         throws IOException
     {
-        Image src = _loader.loadImage(source);
+        Image src = loadImage(source);
         int swidth = src.getWidth(null);
         int sheight = src.getHeight(null);