AfflictionNetworks/nenya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Whoops added scale caching to the wrong method.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@98 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
Michael Bayne
2006-12-18 04:24:23 +00:00
parent 7b47faa5ed
commit bf6eb30ef6
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/jme/util/ImageCache.java
+7 -7
View File
@@ -201,11 +201,10 @@ public class ImageCache
* @param scale a scale factor to apply to the image. As with the flip setting, the scale * @param scale a scale factor to apply to the image. As with the flip setting, the scale
* factor is not cached. * factor is not cached.
*/ */
public Image getImage (String rsrcPath, float scale, boolean flip) public Image getImage (String rsrcPath, float scale, boolean flip)
{ {
// first check the cache // first check the cache
String key = rsrcPath + ":" + scale; WeakReference<Image> iref = _imgcache.get(rsrcPath);
WeakReference<Image> iref = _imgcache.get(key);
Image image; Image image;
if (iref != null && (image = iref.get()) != null) { if (iref != null && (image = iref.get()) != null) {
return image; return image;
@@ -225,7 +224,7 @@ public class ImageCache
// create and cache a new JME image with the appropriate data // create and cache a new JME image with the appropriate data
image = createImage(bufimg, scale, flip); image = createImage(bufimg, scale, flip);
_imgcache.put(key, new WeakReference<Image>(image)); _imgcache.put(rsrcPath, new WeakReference<Image>(image));
return image; return image;
} }
@@ -252,7 +251,8 @@ public class ImageCache
public BImage getBImage (String rsrcPath, float scale, boolean returnNull) public BImage getBImage (String rsrcPath, float scale, boolean returnNull)
{ {
// first check the cache // first check the cache
WeakReference<BImage> iref = _buicache.get(rsrcPath); String key = rsrcPath + ":" + scale;
WeakReference<BImage> iref = _buicache.get(key);
BImage image; BImage image;
if (iref != null && (image = iref.get()) != null) { if (iref != null && (image = iref.get()) != null) {
return image; return image;
@@ -277,7 +277,7 @@ public class ImageCache
bufimg.getScaledInstance(Math.round(bufimg.getWidth()*scale), bufimg.getScaledInstance(Math.round(bufimg.getWidth()*scale),
Math.round(bufimg.getHeight()*scale), Math.round(bufimg.getHeight()*scale),
BufferedImage.SCALE_SMOOTH), true); BufferedImage.SCALE_SMOOTH), true);
_buicache.put(rsrcPath, new WeakReference<BImage>(image)); _buicache.put(key, new WeakReference<BImage>(image));
return image; return image;
} }