antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Added more possible parameters for the Image() constructor: BufferedImage, Image

Browse source
This commit is contained in:
lehni 2005-08-12 11:32:03 +00:00
parent 5050abc53d
commit a878d5919a
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/helma/scripting/rhino/extensions/ImageObject.java
View file

@ -19,6 +19,7 @@ package helma.scripting.rhino.extensions;
import helma.image.*; import helma.image.*;
import helma.util.MimePart; import helma.util.MimePart;
import java.awt.Image;
import java.awt.image.*; import java.awt.image.*;
import org.mozilla.javascript.Context; import org.mozilla.javascript.Context;
import org.mozilla.javascript.Function; import org.mozilla.javascript.Function;
@ -90,10 +91,23 @@ public class ImageObject {
img = generator.createImage(str); img = generator.createImage(str);
} }
} else if (args[0] instanceof NativeJavaObject) { } else if (args[0] instanceof NativeJavaObject) {
// see wether a standard java image object is wrapped in a helma image:
Object arg = ((NativeJavaObject) args[0]).unwrap(); Object arg = ((NativeJavaObject) args[0]).unwrap();
if (arg instanceof MimePart) { if (arg instanceof MimePart) {
img = generator.createImage(((MimePart) arg).getContent()); img = generator.createImage(((MimePart) arg).getContent());
} } else {
Image image = null;
if (arg instanceof BufferedImage) {
// no need to wait for buffered images:
image = (Image) arg;
} else if (arg instanceof Image) {
// wait for all the other image types:
image = ImageWaiter.waitForImage((Image) arg);
}
if (image != null) {
img = new ImageWrapper(image, image.getWidth(null), image.getHeight(null), generator);
}
}
} }
} else if (args.length == 2) { } else if (args.length == 2) {
if (args[0] instanceof Number && if (args[0] instanceof Number &&