external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

check in quick fix to imagecache exception -- Max plz review

Browse Source
This commit is contained in:
myk
2013-02-21 04:27:50 +00:00
parent 1667590fe2
commit b399a6518d
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/forge/ImageCache.java
View File

@@ -76,13 +76,12 @@ public class ImageCache {
rsKey.append("#").append(width).append('x').append(height); rsKey.append("#").append(width).append('x').append(height);
String resizedKey = rsKey.toString(); String resizedKey = rsKey.toString();
final BufferedImage ready = CACHE.getIfPresent(resizedKey); final BufferedImage ready = CACHE.getIfPresent(resizedKey);
if ( null != ready ) if (null != ready) {
return ready; return ready;
}
BufferedImage original = getImage(key); BufferedImage original = getImage(key);
//return original;
double scale = Math.min((double) width / original.getWidth(), (double) height / original.getHeight()); double scale = Math.min((double) width / original.getWidth(), (double) height / original.getHeight());
// here would be the place to limit the scaling option in menu ? // here would be the place to limit the scaling option in menu ?
@@ -96,6 +95,12 @@ public class ImageCache {
} else { } else {
int destWidth = (int) (original.getWidth() * scale); int destWidth = (int) (original.getWidth() * scale);
int destHeight = (int) (original.getHeight() * scale); int destHeight = (int) (original.getHeight() * scale);
if (3 > width || 3 > height) {
// picture too small; return a blank
return null;
}
ResampleOp resampler = new ResampleOp(destWidth, destHeight); ResampleOp resampler = new ResampleOp(destWidth, destHeight);
result = resampler.filter(original, null); result = resampler.filter(original, null);