Mercurial > hg > digilib-old
annotate servlet/src/digilib/image/ImageLoaderDocuImage.java @ 857:456408791331 stream
rendering code cleanup.
author | robcast |
---|---|
date | Tue, 08 Mar 2011 13:13:44 +0100 |
parents | 1e2e9599d84c |
children | fe58284a8dd9 |
rev | line source |
---|---|
1 | 1 /* ImageLoaderDocuImage -- Image class implementation using JDK 1.4 ImageLoader |
2 | |
279 | 3 Digital Image Library servlet components |
1 | 4 |
819
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
5 Copyright (C) 2002 - 2011 Robert Casties (robcast@mail.berlios.de) |
1 | 6 |
279 | 7 This program is free software; you can redistribute it and/or modify it |
8 under the terms of the GNU General Public License as published by the | |
9 Free Software Foundation; either version 2 of the License, or (at your | |
10 option) any later version. | |
11 | |
12 Please read license.txt for the full details. A copy of the GPL | |
13 may be found at http://www.gnu.org/copyleft/lgpl.html | |
1 | 14 |
279 | 15 You should have received a copy of the GNU General Public License |
16 along with this program; if not, write to the Free Software | |
17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
18 */ | |
1 | 19 |
20 package digilib.image; | |
21 | |
496 | 22 import java.awt.Image; |
85 | 23 import java.awt.Rectangle; |
207 | 24 import java.awt.RenderingHints; |
829 | 25 import java.awt.color.ColorSpace; |
73 | 26 import java.awt.geom.AffineTransform; |
101 | 27 import java.awt.geom.Rectangle2D; |
73 | 28 import java.awt.image.AffineTransformOp; |
29 import java.awt.image.BufferedImage; | |
834
c07c21ac78f9
color invert operation. doesn't work with all image types yet...
robcast
parents:
831
diff
changeset
|
30 import java.awt.image.ByteLookupTable; |
829 | 31 import java.awt.image.ColorConvertOp; |
838 | 32 import java.awt.image.ColorModel; |
144 | 33 import java.awt.image.ConvolveOp; |
34 import java.awt.image.Kernel; | |
834
c07c21ac78f9
color invert operation. doesn't work with all image types yet...
robcast
parents:
831
diff
changeset
|
35 import java.awt.image.LookupOp; |
c07c21ac78f9
color invert operation. doesn't work with all image types yet...
robcast
parents:
831
diff
changeset
|
36 import java.awt.image.LookupTable; |
85 | 37 import java.awt.image.RescaleOp; |
73 | 38 import java.io.IOException; |
79
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
39 import java.io.OutputStream; |
89 | 40 import java.io.RandomAccessFile; |
464 | 41 import java.util.Arrays; |
85 | 42 import java.util.Iterator; |
1 | 43 |
352 | 44 import javax.imageio.IIOImage; |
73 | 45 import javax.imageio.ImageIO; |
85 | 46 import javax.imageio.ImageReadParam; |
47 import javax.imageio.ImageReader; | |
352 | 48 import javax.imageio.ImageWriteParam; |
49 import javax.imageio.ImageWriter; | |
220 | 50 import javax.imageio.stream.FileImageInputStream; |
85 | 51 import javax.imageio.stream.ImageInputStream; |
352 | 52 import javax.imageio.stream.ImageOutputStream; |
570 | 53 import javax.servlet.ServletException; |
1 | 54 |
207 | 55 import digilib.io.FileOpException; |
464 | 56 import digilib.io.FileOps; |
579
efd7a223f819
try: ImageInput as interface, ImageFile inherits from Dirent and implements ImageInput
robcast
parents:
574
diff
changeset
|
57 import digilib.io.ImageInput; |
596 | 58 import digilib.util.ImageSize; |
1 | 59 |
73 | 60 /** Implementation of DocuImage using the ImageLoader API of Java 1.4 and Java2D. */ |
564 | 61 public class ImageLoaderDocuImage extends ImageInfoDocuImage { |
590 | 62 |
86 | 63 /** image object */ |
64 protected BufferedImage img; | |
570 | 65 |
86 | 66 /** interpolation type */ |
838 | 67 protected RenderingHints renderHint = null; |
279 | 68 |
834
c07c21ac78f9
color invert operation. doesn't work with all image types yet...
robcast
parents:
831
diff
changeset
|
69 /** convolution kernels for blur() */ |
590 | 70 protected static Kernel[] convolutionKernels = { |
71 null, | |
72 new Kernel(1, 1, new float[] {1f}), | |
73 new Kernel(2, 2, new float[] {0.25f, 0.25f, 0.25f, 0.25f}), | |
74 new Kernel(3, 3, new float[] {1f/9f, 1f/9f, 1f/9f, 1f/9f, 1f/9f, 1f/9f, 1f/9f, 1f/9f, 1f/9f}) | |
75 }; | |
279 | 76 |
854 | 77 /* lookup tables for inverting images (byte) */ |
841
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
78 protected static LookupTable invertSingleByteTable; |
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
79 protected static LookupTable invertRgbaByteTable; |
854 | 80 protected static boolean needsInvertRgba = false; |
81 /* RescaleOps for contrast/brightness operation */ | |
82 protected static boolean needsRescaleRgba = false; | |
83 | |
834
c07c21ac78f9
color invert operation. doesn't work with all image types yet...
robcast
parents:
831
diff
changeset
|
84 static { |
c07c21ac78f9
color invert operation. doesn't work with all image types yet...
robcast
parents:
831
diff
changeset
|
85 byte[] invertByte = new byte[256]; |
c07c21ac78f9
color invert operation. doesn't work with all image types yet...
robcast
parents:
831
diff
changeset
|
86 byte[] orderedByte = new byte[256]; |
841
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
87 byte[] nullByte = new byte[256]; |
834
c07c21ac78f9
color invert operation. doesn't work with all image types yet...
robcast
parents:
831
diff
changeset
|
88 for (int i = 0; i < 256; ++i) { |
c07c21ac78f9
color invert operation. doesn't work with all image types yet...
robcast
parents:
831
diff
changeset
|
89 invertByte[i] = (byte) (256 - i); |
c07c21ac78f9
color invert operation. doesn't work with all image types yet...
robcast
parents:
831
diff
changeset
|
90 orderedByte[i] = (byte) i; |
841
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
91 nullByte[i] = 0; |
834
c07c21ac78f9
color invert operation. doesn't work with all image types yet...
robcast
parents:
831
diff
changeset
|
92 } |
841
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
93 // should(!) work for all color models |
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
94 invertSingleByteTable = new ByteLookupTable(0, invertByte); |
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
95 // but doesn't work with alpha channel on all platforms |
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
96 String ver = System.getProperty("java.version"); |
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
97 String os = System.getProperty("os.name"); |
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
98 logger.debug("os="+os+" ver="+ver); |
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
99 if (os.startsWith("Linux") && ver.startsWith("1.6")) { |
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
100 // GRAB(WTF?) works in Linux JDK1.6 with transparency |
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
101 invertRgbaByteTable = new ByteLookupTable(0, new byte[][] { |
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
102 invertByte, invertByte, orderedByte, invertByte}); |
854 | 103 needsInvertRgba = true; |
104 needsRescaleRgba = true; | |
841
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
105 } else { |
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
106 invertRgbaByteTable = invertSingleByteTable; |
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
107 } |
834
c07c21ac78f9
color invert operation. doesn't work with all image types yet...
robcast
parents:
831
diff
changeset
|
108 } |
c07c21ac78f9
color invert operation. doesn't work with all image types yet...
robcast
parents:
831
diff
changeset
|
109 |
819
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
110 /** the size of the current image */ |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
111 protected ImageSize imageSize; |
590 | 112 |
113 | |
85 | 114 /* loadSubimage is supported. */ |
115 public boolean isSubimageSupported() { | |
116 return true; | |
79
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
117 } |
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
118 |
85 | 119 public void setQuality(int qual) { |
120 quality = qual; | |
207 | 121 renderHint = new RenderingHints(null); |
352 | 122 // hint.put(RenderingHints.KEY_ANTIALIASING, |
279 | 123 // RenderingHints.VALUE_ANTIALIAS_OFF); |
85 | 124 // setup interpolation quality |
125 if (qual > 0) { | |
181 | 126 logger.debug("quality q1"); |
279 | 127 renderHint.put(RenderingHints.KEY_INTERPOLATION, |
128 RenderingHints.VALUE_INTERPOLATION_BICUBIC); | |
85 | 129 } else { |
181 | 130 logger.debug("quality q0"); |
279 | 131 renderHint.put(RenderingHints.KEY_INTERPOLATION, |
132 RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR); | |
85 | 133 } |
134 } | |
86 | 135 |
570 | 136 /* returns the size of the current image */ |
137 public ImageSize getSize() { | |
819
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
138 if (imageSize == null) { |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
139 int h = 0; |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
140 int w = 0; |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
141 try { |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
142 if (img == null) { |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
143 ImageReader reader = getReader(input); |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
144 // get size from ImageReader |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
145 h = reader.getHeight(0); |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
146 w = reader.getWidth(0); |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
147 } else { |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
148 // get size from image |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
149 h = img.getHeight(); |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
150 w = img.getWidth(); |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
151 } |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
152 imageSize = new ImageSize(w, h); |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
153 } catch (IOException e) { |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
154 logger.debug("error in getSize:", e); |
570 | 155 } |
156 } | |
819
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
157 return imageSize; |
570 | 158 } |
1 | 159 |
464 | 160 /* returns a list of supported image formats */ |
531 | 161 public Iterator<String> getSupportedFormats() { |
464 | 162 String[] formats = ImageIO.getReaderFormatNames(); |
163 return Arrays.asList(formats).iterator(); | |
164 } | |
165 | |
588 | 166 /* Check image size and type and store in ImageInput */ |
167 public ImageInput identify(ImageInput input) throws IOException { | |
462
03ff7238c9d4
second try for flashpix support (doesn't work currently...)
robcast
parents:
402
diff
changeset
|
168 // try parent method first |
588 | 169 ImageInput ii = super.identify(input); |
170 if (ii != null) { | |
171 return ii; | |
462
03ff7238c9d4
second try for flashpix support (doesn't work currently...)
robcast
parents:
402
diff
changeset
|
172 } |
588 | 173 logger.debug("identifying (ImageIO) " + input); |
819
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
174 ImageReader reader = null; |
590 | 175 try { |
819
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
176 /* |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
177 * try ImageReader |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
178 */ |
590 | 179 reader = getReader(input); |
819
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
180 // set size |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
181 ImageSize d = new ImageSize(reader.getWidth(0), reader.getHeight(0)); |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
182 input.setSize(d); |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
183 // set mime type |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
184 if (input.getMimetype() == null) { |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
185 if (input.hasFile()) { |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
186 String t = FileOps.mimeForFile(input.getFile()); |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
187 input.setMimetype(t); |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
188 } else { |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
189 // FIXME: is format name a mime type??? |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
190 String t = reader.getFormatName(); |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
191 input.setMimetype(t); |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
192 } |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
193 } |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
194 return input; |
590 | 195 } catch (FileOpException e) { |
196 // maybe just our class doesn't know what to do | |
819
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
197 logger.error("ImageLoaderDocuimage unable to identify:", e); |
590 | 198 return null; |
819
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
199 } finally { |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
200 if (reader != null) { |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
201 reader.dispose(); |
588 | 202 } |
462
03ff7238c9d4
second try for flashpix support (doesn't work currently...)
robcast
parents:
402
diff
changeset
|
203 } |
03ff7238c9d4
second try for flashpix support (doesn't work currently...)
robcast
parents:
402
diff
changeset
|
204 } |
03ff7238c9d4
second try for flashpix support (doesn't work currently...)
robcast
parents:
402
diff
changeset
|
205 |
03ff7238c9d4
second try for flashpix support (doesn't work currently...)
robcast
parents:
402
diff
changeset
|
206 /* load image file */ |
588 | 207 public void loadImage(ImageInput ii) throws FileOpException { |
208 logger.debug("loadImage: " + ii); | |
209 this.input = ii; | |
79
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
210 try { |
588 | 211 if (ii.hasImageInputStream()) { |
212 img = ImageIO.read(ii.getImageInputStream()); | |
213 } else if (ii.hasFile()) { | |
214 img = ImageIO.read(ii.getFile()); | |
215 } | |
79
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
216 } catch (IOException e) { |
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
217 throw new FileOpException("Error reading image."); |
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
218 } |
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
219 } |
1 | 220 |
279 | 221 /** |
222 * Get an ImageReader for the image file. | |
223 * | |
224 * @return | |
225 */ | |
587 | 226 public ImageReader getReader(ImageInput input) throws IOException { |
227 logger.debug("get ImageReader for " + input); | |
228 ImageInputStream istream = null; | |
229 if (input.hasImageInputStream()) { | |
230 // stream input | |
231 istream = input.getImageInputStream(); | |
232 } else if (input.hasFile()) { | |
233 // file only input | |
234 RandomAccessFile rf = new RandomAccessFile(input.getFile(), "r"); | |
235 istream = new FileImageInputStream(rf); | |
236 } else { | |
237 throw new FileOpException("Unable to get data from ImageInput"); | |
148 | 238 } |
565 | 239 Iterator<ImageReader> readers; |
819
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
240 String mt = null; |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
241 if (input.hasMimetype()) { |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
242 // check hasMimetype first or we might get into a loop |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
243 mt = input.getMimetype(); |
821 | 244 } else { |
245 // try file extension | |
246 mt = FileOps.mimeForFile(input.getFile()); | |
819
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
247 } |
565 | 248 if (mt == null) { |
249 logger.debug("No mime-type. Trying automagic."); | |
250 readers = ImageIO.getImageReaders(istream); | |
251 } else { | |
252 logger.debug("File type:" + mt); | |
253 readers = ImageIO.getImageReadersByMIMEType(mt); | |
254 } | |
279 | 255 if (!readers.hasNext()) { |
565 | 256 throw new FileOpException("Can't find Reader to load File!"); |
279 | 257 } |
819
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
258 ImageReader reader = readers.next(); |
149 | 259 /* are there more readers? */ |
207 | 260 logger.debug("ImageIO: this reader: " + reader.getClass()); |
564 | 261 /* while (readers.hasNext()) { |
207 | 262 logger.debug("ImageIO: next reader: " + readers.next().getClass()); |
564 | 263 } */ |
89 | 264 reader.setInput(istream); |
279 | 265 return reader; |
85 | 266 } |
267 | |
268 /* Load an image file into the Object. */ | |
588 | 269 public void loadSubimage(ImageInput ii, Rectangle region, int prescale) |
279 | 270 throws FileOpException { |
207 | 271 logger.debug("loadSubimage"); |
819
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
272 this.input = ii; |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
273 ImageReader reader = null; |
85 | 274 try { |
590 | 275 reader = getReader(ii); |
85 | 276 // set up reader parameters |
277 ImageReadParam readParam = reader.getDefaultReadParam(); | |
278 readParam.setSourceRegion(region); | |
220 | 279 if (prescale > 1) { |
280 readParam.setSourceSubsampling(prescale, prescale, 0, 0); | |
281 } | |
85 | 282 // read image |
207 | 283 logger.debug("loading.."); |
85 | 284 img = reader.read(0, readParam); |
207 | 285 logger.debug("loaded"); |
85 | 286 } catch (IOException e) { |
287 throw new FileOpException("Unable to load File!"); | |
819
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
288 } finally { |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
289 if (reader != null) { |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
290 reader.dispose(); |
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
291 } |
85 | 292 } |
293 } | |
170
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
294 |
86 | 295 /* write image of type mt to Stream */ |
79
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
296 public void writeImage(String mt, OutputStream ostream) |
570 | 297 throws ImageOpException, ServletException { |
207 | 298 logger.debug("writeImage"); |
353 | 299 // setup output |
300 ImageWriter writer = null; | |
301 ImageOutputStream imgout = null; | |
79
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
302 try { |
353 | 303 imgout = ImageIO.createImageOutputStream(ostream); |
79
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
304 if (mt == "image/jpeg") { |
352 | 305 /* |
306 * JPEG doesn't do transparency so we have to convert any RGBA | |
307 * image to RGB :-( *Java2D BUG* | |
308 */ | |
309 if (img.getColorModel().hasAlpha()) { | |
310 logger.debug("BARF: JPEG with transparency!!"); | |
311 int w = img.getWidth(); | |
312 int h = img.getHeight(); | |
313 // BufferedImage.TYPE_INT_RGB seems to be fastest (JDK1.4.1, | |
314 // OSX) | |
315 int destType = BufferedImage.TYPE_INT_RGB; | |
316 BufferedImage img2 = new BufferedImage(w, h, destType); | |
317 img2.createGraphics().drawImage(img, null, 0, 0); | |
318 img = img2; | |
319 } | |
320 writer = (ImageWriter) ImageIO.getImageWritersByFormatName( | |
321 "jpeg").next(); | |
322 if (writer == null) { | |
570 | 323 throw new ImageOpException("Unable to get JPEG writer"); |
352 | 324 } |
325 ImageWriteParam param = writer.getDefaultWriteParam(); | |
326 if (quality > 1) { | |
327 // change JPEG compression quality | |
353 | 328 param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT); |
469
11e11fe4d680
Improved performance of JAIDocuImage for large images
robcast
parents:
464
diff
changeset
|
329 //logger.debug("JPEG qual before: " |
11e11fe4d680
Improved performance of JAIDocuImage for large images
robcast
parents:
464
diff
changeset
|
330 // + Float.toString(param.getCompressionQuality())); |
352 | 331 param.setCompressionQuality(0.9f); |
469
11e11fe4d680
Improved performance of JAIDocuImage for large images
robcast
parents:
464
diff
changeset
|
332 //logger.debug("JPEG qual now: " |
11e11fe4d680
Improved performance of JAIDocuImage for large images
robcast
parents:
464
diff
changeset
|
333 // + Float.toString(param.getCompressionQuality())); |
352 | 334 } |
335 writer.setOutput(imgout); | |
336 // render output | |
337 logger.debug("writing"); | |
338 writer.write(null, new IIOImage(img, null, null), param); | |
79
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
339 } else if (mt == "image/png") { |
352 | 340 // render output |
341 writer = (ImageWriter) ImageIO.getImageWritersByFormatName( | |
342 "png").next(); | |
343 if (writer == null) { | |
570 | 344 throw new ImageOpException("Unable to get PNG writer"); |
352 | 345 } |
346 writer.setOutput(imgout); | |
347 logger.debug("writing"); | |
348 writer.write(img); | |
79
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
349 } else { |
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
350 // unknown mime type |
570 | 351 throw new ImageOpException("Unknown mime type: " + mt); |
79
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
352 } |
140 | 353 |
79
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
354 } catch (IOException e) { |
570 | 355 logger.error("Error writing image:", e); |
356 throw new ServletException("Error writing image:", e); | |
79
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
357 } |
801
72662bb585ba
remove all ServletOutputStream.flush(). (stupid me ;-)
robcast
parents:
596
diff
changeset
|
358 // TODO: should we: finally { writer.dispose(); } |
79
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
359 } |
1 | 360 |
149 | 361 public void scale(double scale, double scaleY) throws ImageOpException { |
819
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
362 logger.debug("scale: " + scale); |
170
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
363 /* for downscaling in high quality the image is blurred first */ |
144 | 364 if ((scale <= 0.5) && (quality > 1)) { |
365 int bl = (int) Math.floor(1 / scale); | |
366 blur(bl); | |
367 } | |
207 | 368 /* then scaled */ |
279 | 369 AffineTransformOp scaleOp = new AffineTransformOp(AffineTransform |
370 .getScaleInstance(scale, scale), renderHint); | |
207 | 371 logger.debug("scaling..."); |
857 | 372 img = scaleOp.filter(img, null); |
373 logger.debug("SCALE: " + scale + " ->" + img.getWidth() + "x" | |
374 + img.getHeight() + " type=" + img.getType()); | |
79
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
375 } |
1 | 376 |
144 | 377 public void blur(int radius) throws ImageOpException { |
181 | 378 logger.debug("blur: " + radius); |
144 | 379 // minimum radius is 2 |
380 int klen = Math.max(radius, 2); | |
590 | 381 Kernel blur = null; |
382 if (klen < convolutionKernels.length) { | |
383 blur = convolutionKernels[klen]; | |
384 } else { | |
385 // calculate our own kernel | |
386 int ksize = klen * klen; | |
387 // kernel is constant 1/k | |
388 float f = 1f / ksize; | |
389 float[] kern = new float[ksize]; | |
390 for (int i = 0; i < ksize; ++i) { | |
391 kern[i] = f; | |
392 } | |
393 blur = new Kernel(klen, klen, kern); | |
144 | 394 } |
395 // blur with convolve operation | |
279 | 396 ConvolveOp blurOp = new ConvolveOp(blur, ConvolveOp.EDGE_NO_OP, |
397 renderHint); | |
857 | 398 /* blur needs explicit destination image type for color *Java2D BUG* |
145 | 399 if (img.getType() == BufferedImage.TYPE_3BYTE_BGR) { |
565 | 400 logger.debug("blur: fixing destination image type"); |
279 | 401 blurredImg = new BufferedImage(img.getWidth(), img.getHeight(), img |
402 .getType()); | |
857 | 403 } */ |
404 img = blurOp.filter(img, null); | |
144 | 405 } |
406 | |
79
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
407 public void crop(int x_off, int y_off, int width, int height) |
279 | 408 throws ImageOpException { |
79
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
409 // setup Crop |
857 | 410 img = img.getSubimage(x_off, y_off, width, height); |
411 logger.debug("CROP:" + img.getWidth() + "x" | |
412 + img.getHeight()); | |
79
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
413 } |
1 | 414 |
170
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
415 public void enhance(float mult, float add) throws ImageOpException { |
843
7718c6e832b0
enhance (cont, brgt) operation now with just one float.
robcast
parents:
841
diff
changeset
|
416 RescaleOp op = null; |
854 | 417 logger.debug("enhance: cm=" + img.getColorModel()); |
418 if (needsRescaleRgba) { | |
857 | 419 /* |
420 * Only one constant should work regardless of the number of bands | |
421 * according to the JDK spec. Doesn't work on JDK 1.4 for OSX and | |
422 * Linux (at least). | |
423 * | |
854 | 424 * The number of constants must match the number of bands in the |
425 * image. | |
426 */ | |
427 int ncol = img.getColorModel().getNumComponents(); | |
428 float[] dm = new float[ncol]; | |
429 float[] da = new float[ncol]; | |
430 for (int i = 0; i < ncol; i++) { | |
431 dm[i] = (float) mult; | |
432 da[i] = (float) add; | |
433 } | |
434 op = new RescaleOp(dm, da, null); | |
435 } else { | |
436 op = new RescaleOp(mult, add, renderHint); | |
85 | 437 } |
843
7718c6e832b0
enhance (cont, brgt) operation now with just one float.
robcast
parents:
841
diff
changeset
|
438 op.filter(img, img); |
85 | 439 } |
440 | |
279 | 441 public void enhanceRGB(float[] rgbm, float[] rgba) throws ImageOpException { |
170
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
442 /* |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
443 * The number of constants must match the number of bands in the image. |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
444 * We do only 3 (RGB) bands. |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
445 */ |
86 | 446 int ncol = img.getColorModel().getNumColorComponents(); |
447 if ((ncol != 3) || (rgbm.length != 3) || (rgba.length != 3)) { | |
829 | 448 logger.debug("ERROR(enhance): unknown number of color bands or coefficients (" |
279 | 449 + ncol + ")"); |
86 | 450 return; |
79
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
451 } |
279 | 452 RescaleOp scaleOp = new RescaleOp(rgbOrdered(rgbm), rgbOrdered(rgba), |
453 null); | |
86 | 454 scaleOp.filter(img, img); |
170
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
455 } |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
456 |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
457 /** |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
458 * Ensures that the array f is in the right order to map the images RGB |
590 | 459 * components. (not sure what happens otherwise) |
170
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
460 */ |
86 | 461 public float[] rgbOrdered(float[] fa) { |
170
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
462 /* |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
463 * TODO: this is UGLY, UGLY!! |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
464 */ |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
465 float[] fb; |
86 | 466 int t = img.getType(); |
170
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
467 if (img.getColorModel().hasAlpha()) { |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
468 fb = new float[4]; |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
469 if ((t == BufferedImage.TYPE_INT_ARGB) |
279 | 470 || (t == BufferedImage.TYPE_INT_ARGB_PRE)) { |
170
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
471 // RGB Type |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
472 fb[0] = fa[0]; |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
473 fb[1] = fa[1]; |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
474 fb[2] = fa[2]; |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
475 fb[3] = 1f; |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
476 } else { |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
477 // this isn't tested :-( |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
478 fb[0] = 1f; |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
479 fb[1] = fa[0]; |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
480 fb[2] = fa[1]; |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
481 fb[3] = fa[2]; |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
482 } |
86 | 483 } else { |
170
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
484 fb = new float[3]; |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
485 if (t == BufferedImage.TYPE_3BYTE_BGR) { |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
486 // BGR Type (actually it looks like RBG...) |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
487 fb[0] = fa[0]; |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
488 fb[1] = fa[2]; |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
489 fb[2] = fa[1]; |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
490 } else { |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
491 fb[0] = fa[0]; |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
492 fb[1] = fa[1]; |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
493 fb[2] = fa[2]; |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
494 } |
86 | 495 } |
496 return fb; | |
85 | 497 } |
498 | |
829 | 499 /* |
500 * (non-Javadoc) | |
501 * | |
502 * @see | |
503 * digilib.image.DocuImageImpl#colorOp(digilib.image.DocuImage.ColorOps) | |
504 */ | |
505 public void colorOp(ColorOp op) throws ImageOpException { | |
506 if (op == ColorOp.GRAYSCALE) { | |
507 // convert image to grayscale | |
834
c07c21ac78f9
color invert operation. doesn't work with all image types yet...
robcast
parents:
831
diff
changeset
|
508 logger.debug("Color op: grayscaling"); |
829 | 509 ColorConvertOp colop = new ColorConvertOp( |
838 | 510 ColorSpace.getInstance(ColorSpace.CS_GRAY), renderHint); |
857 | 511 // let filter create new image |
829 | 512 img = colop.filter(img, null); |
834
c07c21ac78f9
color invert operation. doesn't work with all image types yet...
robcast
parents:
831
diff
changeset
|
513 } else if (op == ColorOp.INVERT) { |
c07c21ac78f9
color invert operation. doesn't work with all image types yet...
robcast
parents:
831
diff
changeset
|
514 // invert colors i.e. invert every channel |
c07c21ac78f9
color invert operation. doesn't work with all image types yet...
robcast
parents:
831
diff
changeset
|
515 logger.debug("Color op: inverting"); |
c07c21ac78f9
color invert operation. doesn't work with all image types yet...
robcast
parents:
831
diff
changeset
|
516 // TODO: is this enough for all image types? |
841
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
517 LookupTable invtbl = null; |
838 | 518 ColorModel cm = img.getColorModel(); |
854 | 519 if (needsInvertRgba && cm.hasAlpha()) { |
857 | 520 /* should work with one array for all channels, but |
521 * JDK 1.6 in Linux (at least) is broken :-( | |
522 */ | |
841
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
523 invtbl = invertRgbaByteTable; |
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
524 } else { |
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
525 invtbl = invertSingleByteTable; |
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
526 } |
3519cfa11a0b
organised special juju for invert on linux jdk 1.6.
robcast
parents:
839
diff
changeset
|
527 LookupOp colop = new LookupOp(invtbl, renderHint); |
839 | 528 logger.debug("colop: image="+img+" colormodel="+cm); |
857 | 529 colop.filter(img, img); |
829 | 530 } |
834
c07c21ac78f9
color invert operation. doesn't work with all image types yet...
robcast
parents:
831
diff
changeset
|
531 |
829 | 532 } |
533 | |
140 | 534 public void rotate(double angle) throws ImageOpException { |
89 | 535 // setup rotation |
536 double rangle = Math.toRadians(angle); | |
170
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
537 // create offset to make shure the rotated image has no negative |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
538 // coordinates |
101 | 539 double w = img.getWidth(); |
540 double h = img.getHeight(); | |
103 | 541 AffineTransform trafo = new AffineTransform(); |
170
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
542 // center of rotation |
103 | 543 double x = (w / 2); |
544 double y = (h / 2); | |
101 | 545 trafo.rotate(rangle, x, y); |
103 | 546 // try rotation to see how far we're out of bounds |
207 | 547 AffineTransformOp rotOp = new AffineTransformOp(trafo, renderHint); |
103 | 548 Rectangle2D rotbounds = rotOp.getBounds2D(img); |
549 double xoff = rotbounds.getX(); | |
550 double yoff = rotbounds.getY(); | |
551 // move image back in line | |
565 | 552 trafo.preConcatenate(AffineTransform.getTranslateInstance(-xoff, -yoff)); |
101 | 553 // transform image |
207 | 554 rotOp = new AffineTransformOp(trafo, renderHint); |
857 | 555 rotOp.filter(img, img); |
101 | 556 // calculate new bounding box |
352 | 557 // Rectangle2D bounds = rotOp.getBounds2D(img); |
101 | 558 // crop new image (with self-made rounding) |
170
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
559 /* |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
560 * img = rotImg.getSubimage( (int) (bounds.getX()+0.5), (int) |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
561 * (bounds.getY()+0.5), (int) (bounds.getWidth()+0.5), (int) |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
562 * (bounds.getHeight()+0.5)); |
d40922628e4a
Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents:
159
diff
changeset
|
563 */ |
86 | 564 } |
85 | 565 |
89 | 566 public void mirror(double angle) throws ImageOpException { |
567 // setup mirror | |
568 double mx = 1; | |
569 double my = 1; | |
570 double tx = 0; | |
571 double ty = 0; | |
144 | 572 if (Math.abs(angle - 0) < epsilon) { // 0 degree |
89 | 573 mx = -1; |
574 tx = getWidth(); | |
144 | 575 } else if (Math.abs(angle - 90) < epsilon) { // 90 degree |
89 | 576 my = -1; |
577 ty = getHeight(); | |
144 | 578 } else if (Math.abs(angle - 180) < epsilon) { // 180 degree |
89 | 579 mx = -1; |
580 tx = getWidth(); | |
144 | 581 } else if (Math.abs(angle - 270) < epsilon) { // 270 degree |
89 | 582 my = -1; |
583 ty = getHeight(); | |
144 | 584 } else if (Math.abs(angle - 360) < epsilon) { // 360 degree |
89 | 585 mx = -1; |
586 tx = getWidth(); | |
587 } | |
279 | 588 AffineTransformOp mirOp = new AffineTransformOp(new AffineTransform(mx, |
589 0, 0, my, tx, ty), renderHint); | |
857 | 590 mirOp.filter(img, img); |
79
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
591 } |
86 | 592 |
207 | 593 public void dispose() { |
819
a23c4c15a6a8
clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents:
801
diff
changeset
|
594 // is this necessary? |
148 | 595 img = null; |
596 } | |
597 | |
533 | 598 public Image getAwtImage(){ |
496 | 599 return (Image) img; |
600 } | |
601 | |
602 | |
1 | 603 } |