From 9c113eb8dcf6e1638e3d5f98811340d0c23d7abc Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Wed, 9 Apr 2003 22:02:20 +0000
Subject: [PATCH] Not to choke if we get passed a null image.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2394 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 src/java/com/threerings/media/image/ImageUtil.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/java/com/threerings/media/image/ImageUtil.java b/src/java/com/threerings/media/image/ImageUtil.java
index 38ade4354..b9b383846 100644
--- a/src/java/com/threerings/media/image/ImageUtil.java
+++ b/src/java/com/threerings/media/image/ImageUtil.java
@@ -1,5 +1,5 @@
 //
-// $Id: ImageUtil.java,v 1.29 2003/01/24 22:54:08 mdb Exp $
+// $Id: ImageUtil.java,v 1.30 2003/04/09 22:02:20 mdb Exp $
 
 package com.threerings.media.image;
 
@@ -523,7 +523,11 @@ public class ImageUtil
      */
     public static long getEstimatedMemoryUsage (BufferedImage image)
     {
-        return getEstimatedMemoryUsage(image.getRaster());
+        if (image != null) {
+            return getEstimatedMemoryUsage(image.getRaster());
+        } else {
+            return 0;
+        }
     }
 
     /**