Revision 44924 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/java/org/gvsig/expressionevaluator/impl/function/image/ImageReadFunction.java

View differences:

ImageReadFunction.java
1 1
package org.gvsig.expressionevaluator.impl.function.image;
2 2

  
3
import java.awt.Graphics2D;
4
import java.awt.Image;
5
import java.awt.RenderingHints;
6
import java.awt.geom.AffineTransform;
7
import java.awt.image.BufferedImage;
8
import java.io.ByteArrayInputStream;
9
import java.io.File;
10
import java.io.IOException;
11
import java.net.URL;
12
import javax.imageio.ImageIO;
13
import org.apache.commons.codec.DecoderException;
14
import org.apache.commons.codec.binary.Base64;
15
import org.apache.commons.codec.binary.Hex;
16 3
import org.apache.commons.lang3.Range;
17 4
import org.gvsig.expressionevaluator.Interpreter;
18 5
import org.gvsig.expressionevaluator.spi.AbstractFunction;
......
22 9
    public ImageReadFunction() {
23 10
        super(
24 11
                "Image", "IMAGEREAD", Range.is(1),
25
                "Read an image from a data source and return it as a 'Java BufferedImage' object.\n"
12
                "Read an image from a data source and return it as a SimpleImage object.\n"
26 13
                + "The data source of the image can be:\n<ul>"
27 14
                + "<li>A byte array</li>"
28 15
                + "<li>A URL</li>"
......
34 21
                new String[]{
35 22
                    "Value from which to load the image"
36 23
                },
37
                "BufferedImage",
24
                "SimpleImage",
38 25
                false
39 26
        );
40 27
    }
......
51 38
        if( image.isEmpty() ) {
52 39
            return null;
53 40
        }
54
        return image.getBufferedImage();
41
        return image;
55 42
    }
56 43

  
57 44
    public static SimpleImage createSimpleImage(Object source) {
45
        if( source instanceof SimpleImage ) {
46
          return (SimpleImage) source;
47
        }
58 48
        SimpleImage image = new SimpleImage(source);
59 49
        return image;
60 50
    }

Also available in: Unified diff