annotate servlet/src/digilib/image/ImageLoaderDocuImage.java @ 469:11e11fe4d680

Improved performance of JAIDocuImage for large images - simulated subsampling by scaling
author robcast
date Wed, 15 Feb 2006 00:09:50 +0100
parents f1f710ff14ad
children 1760b19df530
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
1 /* ImageLoaderDocuImage -- Image class implementation using JDK 1.4 ImageLoader
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
2
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
3 Digital Image Library servlet components
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
4
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
5 Copyright (C) 2002, 2003 Robert Casties (robcast@mail.berlios.de)
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
6
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
7 This program is free software; you can redistribute it and/or modify it
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
8 under the terms of the GNU General Public License as published by the
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
9 Free Software Foundation; either version 2 of the License, or (at your
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
10 option) any later version.
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
11
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
12 Please read license.txt for the full details. A copy of the GPL
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
13 may be found at http://www.gnu.org/copyleft/lgpl.html
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
14
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
15 You should have received a copy of the GNU General Public License
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
16 along with this program; if not, write to the Free Software
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
18 */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
19
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
20 package digilib.image;
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
21
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
22 import java.awt.Rectangle;
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
23 import java.awt.RenderingHints;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 1
diff changeset
24 import java.awt.geom.AffineTransform;
101
78f52a1876fe digilib V1.9b1
robcast
parents: 89
diff changeset
25 import java.awt.geom.Rectangle2D;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 1
diff changeset
26 import java.awt.image.AffineTransformOp;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 1
diff changeset
27 import java.awt.image.BufferedImage;
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
28 import java.awt.image.ConvolveOp;
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
29 import java.awt.image.Kernel;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
30 import java.awt.image.RescaleOp;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 1
diff changeset
31 import java.io.File;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 1
diff changeset
32 import java.io.IOException;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
33 import java.io.OutputStream;
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
34 import java.io.RandomAccessFile;
464
f1f710ff14ad Servlet version 1.10b
robcast
parents: 462
diff changeset
35 import java.util.Arrays;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
36 import java.util.Iterator;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
37
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
38 import javax.imageio.IIOImage;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 1
diff changeset
39 import javax.imageio.ImageIO;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
40 import javax.imageio.ImageReadParam;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
41 import javax.imageio.ImageReader;
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
42 import javax.imageio.ImageWriteParam;
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
43 import javax.imageio.ImageWriter;
220
c4ee5f0c3a77 servlet version 1.18b12
robcast
parents: 207
diff changeset
44 import javax.imageio.stream.FileImageInputStream;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
45 import javax.imageio.stream.ImageInputStream;
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
46 import javax.imageio.stream.ImageOutputStream;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
47
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
48 import digilib.io.FileOpException;
464
f1f710ff14ad Servlet version 1.10b
robcast
parents: 462
diff changeset
49 import digilib.io.FileOps;
159
e743b853efca servlet version 1.16a4
robcast
parents: 149
diff changeset
50 import digilib.io.ImageFile;
464
f1f710ff14ad Servlet version 1.10b
robcast
parents: 462
diff changeset
51 import digilib.io.ImageFileset;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
52
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 1
diff changeset
53 /** Implementation of DocuImage using the ImageLoader API of Java 1.4 and Java2D. */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
54 public class ImageLoaderDocuImage extends DocuImageImpl {
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
55
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
56 /** image object */
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
57 protected BufferedImage img;
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
58
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
59 /** interpolation type */
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
60 protected RenderingHints renderHint;
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
61
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
62 /** ImageIO image reader */
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
63 protected ImageReader reader;
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
64
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
65 /** File that was read */
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
66 protected File imgFile;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
67
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
68 /* loadSubimage is supported. */
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
69 public boolean isSubimageSupported() {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
70 return true;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
71 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
72
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
73 public void setQuality(int qual) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
74 quality = qual;
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
75 renderHint = new RenderingHints(null);
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
76 // hint.put(RenderingHints.KEY_ANTIALIASING,
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
77 // RenderingHints.VALUE_ANTIALIAS_OFF);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
78 // setup interpolation quality
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
79 if (qual > 0) {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
80 logger.debug("quality q1");
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
81 renderHint.put(RenderingHints.KEY_INTERPOLATION,
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
82 RenderingHints.VALUE_INTERPOLATION_BICUBIC);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
83 } else {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
84 logger.debug("quality q0");
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
85 renderHint.put(RenderingHints.KEY_INTERPOLATION,
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
86 RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
87 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
88 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
89
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
90 public int getHeight() {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
91 int h = 0;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
92 try {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
93 if (img == null) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
94 h = reader.getHeight(0);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
95 } else {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
96 h = img.getHeight();
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
97 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
98 } catch (IOException e) {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
99 logger.debug("error in getHeight", e);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
100 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
101 return h;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
102 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
103
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
104 public int getWidth() {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
105 int w = 0;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
106 try {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
107 if (img == null) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
108 w = reader.getWidth(0);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
109 } else {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
110 w = img.getWidth();
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
111 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
112 } catch (IOException e) {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
113 logger.debug("error in getHeight", e);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
114 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
115 return w;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
116 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
117
464
f1f710ff14ad Servlet version 1.10b
robcast
parents: 462
diff changeset
118 /* returns a list of supported image formats */
f1f710ff14ad Servlet version 1.10b
robcast
parents: 462
diff changeset
119 public Iterator getSupportedFormats() {
f1f710ff14ad Servlet version 1.10b
robcast
parents: 462
diff changeset
120 String[] formats = ImageIO.getReaderFormatNames();
f1f710ff14ad Servlet version 1.10b
robcast
parents: 462
diff changeset
121 return Arrays.asList(formats).iterator();
f1f710ff14ad Servlet version 1.10b
robcast
parents: 462
diff changeset
122 }
f1f710ff14ad Servlet version 1.10b
robcast
parents: 462
diff changeset
123
462
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
124 /** Check image size and type and store in ImageFile f */
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
125 public boolean identify(ImageFile imgf) throws IOException {
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
126 // try parent method first
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
127 if (super.identify(imgf)) {
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
128 return true;
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
129 }
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
130 // fileset to store the information
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
131 ImageFileset imgfs = imgf.getParent();
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
132 File f = imgf.getFile();
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
133 if (f == null) {
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
134 throw new IOException("File not found!");
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
135 }
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
136 logger.debug("identifying (ImageIO) " + f);
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
137 /*
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
138 * try ImageReader
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
139 */
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
140 RandomAccessFile raf = new RandomAccessFile(f, "r");
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
141 ImageInputStream istream = ImageIO.createImageInputStream(raf);
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
142 Iterator readers = ImageIO.getImageReaders(istream);
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
143 if (readers.hasNext()) {
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
144 ImageReader reader = (ImageReader) readers.next();
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
145 /* are there more readers? */
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
146 logger.debug("ImageIO: this reader: " + reader.getClass());
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
147 while (readers.hasNext()) {
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
148 logger.debug("ImageIO: next reader: "
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
149 + readers.next().getClass());
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
150 }
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
151 try {
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
152 reader.setInput(istream);
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
153 ImageSize d = new ImageSize(reader.getWidth(0), reader.getHeight(0));
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
154 imgf.setSize(d);
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
155 //String t = reader.getFormatName();
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
156 String t = FileOps.mimeForFile(f);
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
157 imgf.setMimetype(t);
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
158 //logger.debug(" format:"+t);
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
159 if (imgfs != null) {
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
160 imgfs.setAspect(d);
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
161 }
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
162 return true;
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
163 } finally {
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
164 // dispose the reader to free resources
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
165 reader.dispose();
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
166 raf.close();
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
167 }
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
168 }
464
f1f710ff14ad Servlet version 1.10b
robcast
parents: 462
diff changeset
169 throw new FileOpException("ERROR: unknown image file format!");
462
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
170 }
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
171
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
172
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
173 /* load image file */
159
e743b853efca servlet version 1.16a4
robcast
parents: 149
diff changeset
174 public void loadImage(ImageFile f) throws FileOpException {
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
175 logger.debug("loadImage " + f.getFile());
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
176 try {
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
177 img = ImageIO.read(f.getFile());
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
178 if (img == null) {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
179 throw new FileOpException("Unable to load File!");
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
180 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
181 } catch (IOException e) {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
182 throw new FileOpException("Error reading image.");
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
183 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
184 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
185
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
186 /**
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
187 * Get an ImageReader for the image file.
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
188 *
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
189 * @return
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
190 */
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
191 public ImageReader getReader(ImageFile f) throws IOException {
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
192 logger.debug("preloadImage " + f.getFile());
148
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
193 if (reader != null) {
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
194 logger.debug("Reader was not null!");
148
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
195 // clean up old reader
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
196 dispose();
148
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
197 }
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
198 // System.gc();
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
199 RandomAccessFile rf = new RandomAccessFile(f.getFile(), "r");
220
c4ee5f0c3a77 servlet version 1.18b12
robcast
parents: 207
diff changeset
200 ImageInputStream istream = new FileImageInputStream(rf);
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
201 // Iterator readers = ImageIO.getImageReaders(istream);
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
202 String mt = f.getMimetype();
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
203 logger.debug("File type:" + mt);
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
204 Iterator readers = ImageIO.getImageReadersByMIMEType(mt);
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
205 if (!readers.hasNext()) {
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
206 throw new FileOpException("Unable to load File!");
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
207 }
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
208 reader = (ImageReader) readers.next();
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
209 /* are there more readers? */
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
210 logger.debug("ImageIO: this reader: " + reader.getClass());
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
211 while (readers.hasNext()) {
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
212 logger.debug("ImageIO: next reader: " + readers.next().getClass());
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
213 }
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
214 // */
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
215 reader.setInput(istream);
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
216 imgFile = f.getFile();
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
217 return reader;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
218 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
219
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
220 /* Load an image file into the Object. */
159
e743b853efca servlet version 1.16a4
robcast
parents: 149
diff changeset
221 public void loadSubimage(ImageFile f, Rectangle region, int prescale)
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
222 throws FileOpException {
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
223 logger.debug("loadSubimage");
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
224 // System.gc();
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
225 try {
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
226 if ((reader == null) || (imgFile != f.getFile())) {
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
227 getReader(f);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
228 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
229 // set up reader parameters
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
230 ImageReadParam readParam = reader.getDefaultReadParam();
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
231 readParam.setSourceRegion(region);
220
c4ee5f0c3a77 servlet version 1.18b12
robcast
parents: 207
diff changeset
232 if (prescale > 1) {
c4ee5f0c3a77 servlet version 1.18b12
robcast
parents: 207
diff changeset
233 readParam.setSourceSubsampling(prescale, prescale, 0, 0);
c4ee5f0c3a77 servlet version 1.18b12
robcast
parents: 207
diff changeset
234 }
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
235 // read image
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
236 logger.debug("loading..");
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
237 img = reader.read(0, readParam);
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
238 logger.debug("loaded");
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
239 } catch (IOException e) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
240 throw new FileOpException("Unable to load File!");
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
241 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
242 if (img == null) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
243 throw new FileOpException("Unable to load File!");
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
244 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
245 }
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
246
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
247 /* write image of type mt to Stream */
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
248 public void writeImage(String mt, OutputStream ostream)
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
249 throws FileOpException {
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
250 logger.debug("writeImage");
353
25095f85ba7c Servlet version 1.5.9c
robcast
parents: 352
diff changeset
251 // setup output
25095f85ba7c Servlet version 1.5.9c
robcast
parents: 352
diff changeset
252 ImageWriter writer = null;
25095f85ba7c Servlet version 1.5.9c
robcast
parents: 352
diff changeset
253 ImageOutputStream imgout = null;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
254 try {
353
25095f85ba7c Servlet version 1.5.9c
robcast
parents: 352
diff changeset
255 imgout = ImageIO.createImageOutputStream(ostream);
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
256 if (mt == "image/jpeg") {
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
257 /*
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
258 * JPEG doesn't do transparency so we have to convert any RGBA
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
259 * image to RGB :-( *Java2D BUG*
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
260 */
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
261 if (img.getColorModel().hasAlpha()) {
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
262 logger.debug("BARF: JPEG with transparency!!");
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
263 int w = img.getWidth();
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
264 int h = img.getHeight();
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
265 // BufferedImage.TYPE_INT_RGB seems to be fastest (JDK1.4.1,
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
266 // OSX)
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
267 int destType = BufferedImage.TYPE_INT_RGB;
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
268 BufferedImage img2 = new BufferedImage(w, h, destType);
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
269 img2.createGraphics().drawImage(img, null, 0, 0);
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
270 img = img2;
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
271 }
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
272 writer = (ImageWriter) ImageIO.getImageWritersByFormatName(
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
273 "jpeg").next();
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
274 if (writer == null) {
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
275 throw new FileOpException("Unable to get JPEG writer");
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
276 }
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
277 ImageWriteParam param = writer.getDefaultWriteParam();
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
278 if (quality > 1) {
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
279 // change JPEG compression quality
353
25095f85ba7c Servlet version 1.5.9c
robcast
parents: 352
diff changeset
280 param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
469
11e11fe4d680 Improved performance of JAIDocuImage for large images
robcast
parents: 464
diff changeset
281 //logger.debug("JPEG qual before: "
11e11fe4d680 Improved performance of JAIDocuImage for large images
robcast
parents: 464
diff changeset
282 // + Float.toString(param.getCompressionQuality()));
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
283 param.setCompressionQuality(0.9f);
469
11e11fe4d680 Improved performance of JAIDocuImage for large images
robcast
parents: 464
diff changeset
284 //logger.debug("JPEG qual now: "
11e11fe4d680 Improved performance of JAIDocuImage for large images
robcast
parents: 464
diff changeset
285 // + Float.toString(param.getCompressionQuality()));
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
286 }
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
287 writer.setOutput(imgout);
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
288 // render output
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
289 logger.debug("writing");
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
290 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
291 } else if (mt == "image/png") {
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
292 // render output
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
293 writer = (ImageWriter) ImageIO.getImageWritersByFormatName(
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
294 "png").next();
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
295 if (writer == null) {
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
296 throw new FileOpException("Unable to get PNG writer");
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
297 }
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
298 writer.setOutput(imgout);
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
299 logger.debug("writing");
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
300 writer.write(img);
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
301 } else {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
302 // unknown mime type
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
303 throw new FileOpException("Unknown mime type: " + mt);
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
304 }
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
305
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
306 } catch (IOException e) {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
307 throw new FileOpException("Error writing image.");
353
25095f85ba7c Servlet version 1.5.9c
robcast
parents: 352
diff changeset
308 } finally {
25095f85ba7c Servlet version 1.5.9c
robcast
parents: 352
diff changeset
309 // clean up
25095f85ba7c Servlet version 1.5.9c
robcast
parents: 352
diff changeset
310 if (writer != null) {
25095f85ba7c Servlet version 1.5.9c
robcast
parents: 352
diff changeset
311 writer.dispose();
25095f85ba7c Servlet version 1.5.9c
robcast
parents: 352
diff changeset
312 }
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
313 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
314 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
315
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
316 public void scale(double scale, double scaleY) throws ImageOpException {
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
317 logger.debug("scale");
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
318 /* for downscaling in high quality the image is blurred first */
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
319 if ((scale <= 0.5) && (quality > 1)) {
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
320 int bl = (int) Math.floor(1 / scale);
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
321 blur(bl);
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
322 }
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
323 /* then scaled */
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
324 AffineTransformOp scaleOp = new AffineTransformOp(AffineTransform
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
325 .getScaleInstance(scale, scale), renderHint);
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
326 BufferedImage scaledImg = null;
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
327 // enforce destination image type (*Java2D BUG*)
220
c4ee5f0c3a77 servlet version 1.18b12
robcast
parents: 207
diff changeset
328 int type = img.getType();
c4ee5f0c3a77 servlet version 1.18b12
robcast
parents: 207
diff changeset
329 // FIXME: which type would be best?
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
330 if ((quality > 0) && (type != 0)) {
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
331 logger.debug("creating destination image");
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
332 Rectangle2D dstBounds = scaleOp.getBounds2D(img);
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
333 scaledImg = new BufferedImage((int) dstBounds.getWidth(),
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
334 (int) dstBounds.getHeight(), type);
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
335 }
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
336 logger.debug("scaling...");
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
337 scaledImg = scaleOp.filter(img, scaledImg);
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
338 if (scaledImg == null) {
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
339 throw new ImageOpException("Unable to scale");
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
340 }
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
341 // DEBUG
469
11e11fe4d680 Improved performance of JAIDocuImage for large images
robcast
parents: 464
diff changeset
342 logger.debug("destination image type " + scaledImg.getType());
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
343 logger.debug("SCALE: " + scale + " ->" + scaledImg.getWidth() + "x"
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
344 + scaledImg.getHeight());
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
345 img = scaledImg;
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
346 scaledImg = null;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
347 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
348
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
349 public void blur(int radius) throws ImageOpException {
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
350 // DEBUG
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
351 logger.debug("blur: " + radius);
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
352 // minimum radius is 2
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
353 int klen = Math.max(radius, 2);
220
c4ee5f0c3a77 servlet version 1.18b12
robcast
parents: 207
diff changeset
354 // FIXME: use constant kernels for most common sizes
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
355 int ksize = klen * klen;
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
356 // kernel is constant 1/k
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
357 float f = 1f / ksize;
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
358 float[] kern = new float[ksize];
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
359 for (int i = 0; i < ksize; i++) {
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
360 kern[i] = f;
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
361 }
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
362 Kernel blur = new Kernel(klen, klen, kern);
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
363 // blur with convolve operation
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
364 ConvolveOp blurOp = new ConvolveOp(blur, ConvolveOp.EDGE_NO_OP,
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
365 renderHint);
145
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
366 // blur needs explicit destination image type for color *Java2D BUG*
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
367 BufferedImage blurredImg = null;
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
368 if (img.getType() == BufferedImage.TYPE_3BYTE_BGR) {
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
369 blurredImg = new BufferedImage(img.getWidth(), img.getHeight(), img
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
370 .getType());
145
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
371 }
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
372 blurredImg = blurOp.filter(img, blurredImg);
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
373 if (blurredImg == null) {
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
374 throw new ImageOpException("Unable to scale");
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
375 }
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
376 img = blurredImg;
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
377 }
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
378
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
379 public void crop(int x_off, int y_off, int width, int height)
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
380 throws ImageOpException {
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
381 // setup Crop
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
382 BufferedImage croppedImg = img.getSubimage(x_off, y_off, width, height);
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
383 // DEBUG
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
384 // util.dprintln(2, " time
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
385 // "+(System.currentTimeMillis()-startTime)+"ms");
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
386 if (croppedImg == null) {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
387 throw new ImageOpException("Unable to crop");
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
388 }
469
11e11fe4d680 Improved performance of JAIDocuImage for large images
robcast
parents: 464
diff changeset
389 logger.debug("CROP:" + croppedImg.getWidth() + "x"
11e11fe4d680 Improved performance of JAIDocuImage for large images
robcast
parents: 464
diff changeset
390 + croppedImg.getHeight());
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
391 img = croppedImg;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
392 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
393
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
394 public void enhance(float mult, float add) throws ImageOpException {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
395 /*
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
396 * Only one constant should work regardless of the number of bands
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
397 * according to the JDK spec. Doesn't work on JDK 1.4 for OSX and Linux
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
398 * (at least). RescaleOp scaleOp = new RescaleOp( (float)mult,
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
399 * (float)add, null); scaleOp.filter(img, img);
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
400 */
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
401
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
402 /* 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
403 int ncol = img.getColorModel().getNumComponents();
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
404 float[] dm = new float[ncol];
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
405 float[] da = new float[ncol];
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
406 for (int i = 0; i < ncol; i++) {
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
407 dm[i] = (float) mult;
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
408 da[i] = (float) add;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
409 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
410 RescaleOp scaleOp = new RescaleOp(dm, da, null);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
411 scaleOp.filter(img, img);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
412 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
413
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
414 public void enhanceRGB(float[] rgbm, float[] rgba) throws ImageOpException {
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
415
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
416 /*
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
417 * 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
418 * We do only 3 (RGB) bands.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
419 */
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
420
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
421 int ncol = img.getColorModel().getNumColorComponents();
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
422 if ((ncol != 3) || (rgbm.length != 3) || (rgba.length != 3)) {
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
423 logger
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
424 .debug("ERROR(enhance): unknown number of color bands or coefficients ("
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
425 + ncol + ")");
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
426 return;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
427 }
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
428 RescaleOp scaleOp = new RescaleOp(rgbOrdered(rgbm), rgbOrdered(rgba),
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
429 null);
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
430 scaleOp.filter(img, img);
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
431 }
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
432
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
433 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
434 * Ensures that the array f is in the right order to map the images RGB
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
435 * components. (not shure what happens
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
436 */
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
437 public float[] rgbOrdered(float[] fa) {
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
438 /*
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
439 * TODO: this is UGLY, UGLY!!
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
440 */
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
441 float[] fb;
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
442 int t = img.getType();
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
443 if (img.getColorModel().hasAlpha()) {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
444 fb = new float[4];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
445 if ((t == BufferedImage.TYPE_INT_ARGB)
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
446 || (t == BufferedImage.TYPE_INT_ARGB_PRE)) {
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
447 // RGB Type
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
448 fb[0] = fa[0];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
449 fb[1] = fa[1];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
450 fb[2] = fa[2];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
451 fb[3] = 1f;
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
452 } else {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
453 // this isn't tested :-(
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
454 fb[0] = 1f;
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
455 fb[1] = fa[0];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
456 fb[2] = fa[1];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
457 fb[3] = fa[2];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
458 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
459 } else {
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
460 fb = new float[3];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
461 if (t == BufferedImage.TYPE_3BYTE_BGR) {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
462 // BGR Type (actually it looks like RBG...)
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
463 fb[0] = fa[0];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
464 fb[1] = fa[2];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
465 fb[2] = fa[1];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
466 } else {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
467 fb[0] = fa[0];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
468 fb[1] = fa[1];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
469 fb[2] = fa[2];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
470 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
471 }
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
472 return fb;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
473 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
474
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
475 public void rotate(double angle) throws ImageOpException {
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
476 // setup rotation
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
477 double rangle = Math.toRadians(angle);
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
478 // 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
479 // coordinates
101
78f52a1876fe digilib V1.9b1
robcast
parents: 89
diff changeset
480 double w = img.getWidth();
78f52a1876fe digilib V1.9b1
robcast
parents: 89
diff changeset
481 double h = img.getHeight();
103
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
482 AffineTransform trafo = new AffineTransform();
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
483 // center of rotation
103
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
484 double x = (w / 2);
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
485 double y = (h / 2);
101
78f52a1876fe digilib V1.9b1
robcast
parents: 89
diff changeset
486 trafo.rotate(rangle, x, y);
103
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
487 // try rotation to see how far we're out of bounds
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
488 AffineTransformOp rotOp = new AffineTransformOp(trafo, renderHint);
103
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
489 Rectangle2D rotbounds = rotOp.getBounds2D(img);
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
490 double xoff = rotbounds.getX();
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
491 double yoff = rotbounds.getY();
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
492 // move image back in line
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
493 trafo
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
494 .preConcatenate(AffineTransform.getTranslateInstance(-xoff,
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
495 -yoff));
101
78f52a1876fe digilib V1.9b1
robcast
parents: 89
diff changeset
496 // transform image
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
497 rotOp = new AffineTransformOp(trafo, renderHint);
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
498 BufferedImage rotImg = rotOp.filter(img, null);
101
78f52a1876fe digilib V1.9b1
robcast
parents: 89
diff changeset
499 // calculate new bounding box
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
500 // Rectangle2D bounds = rotOp.getBounds2D(img);
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
501 if (rotImg == null) {
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
502 throw new ImageOpException("Unable to rotate");
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
503 }
103
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
504 img = rotImg;
101
78f52a1876fe digilib V1.9b1
robcast
parents: 89
diff changeset
505 // crop new image (with self-made rounding)
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
506 /*
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
507 * img = rotImg.getSubimage( (int) (bounds.getX()+0.5), (int)
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
508 * (bounds.getY()+0.5), (int) (bounds.getWidth()+0.5), (int)
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
509 * (bounds.getHeight()+0.5));
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
510 */
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
511 }
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
512
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
513 public void mirror(double angle) throws ImageOpException {
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
514 // setup mirror
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
515 double mx = 1;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
516 double my = 1;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
517 double tx = 0;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
518 double ty = 0;
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
519 if (Math.abs(angle - 0) < epsilon) { // 0 degree
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
520 mx = -1;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
521 tx = getWidth();
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
522 } else if (Math.abs(angle - 90) < epsilon) { // 90 degree
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
523 my = -1;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
524 ty = getHeight();
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
525 } else if (Math.abs(angle - 180) < epsilon) { // 180 degree
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
526 mx = -1;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
527 tx = getWidth();
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
528 } else if (Math.abs(angle - 270) < epsilon) { // 270 degree
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
529 my = -1;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
530 ty = getHeight();
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
531 } else if (Math.abs(angle - 360) < epsilon) { // 360 degree
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
532 mx = -1;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
533 tx = getWidth();
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
534 }
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
535 AffineTransformOp mirOp = new AffineTransformOp(new AffineTransform(mx,
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
536 0, 0, my, tx, ty), renderHint);
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
537 BufferedImage mirImg = mirOp.filter(img, null);
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
538 if (mirImg == null) {
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
539 throw new ImageOpException("Unable to mirror");
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
540 }
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
541 img = mirImg;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
542 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
543
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
544 /*
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
545 * (non-Javadoc)
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
546 *
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
547 * @see java.lang.Object#finalize()
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
548 */
148
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
549 protected void finalize() throws Throwable {
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
550 dispose();
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
551 super.finalize();
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
552 }
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
553
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
554 public void dispose() {
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
555 // we must dispose the ImageReader because it keeps the filehandle
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
556 // open!
256
7ff9b9b0c16a small fix for NPE
robcast
parents: 220
diff changeset
557 if (reader != null) {
7ff9b9b0c16a small fix for NPE
robcast
parents: 220
diff changeset
558 reader.dispose();
7ff9b9b0c16a small fix for NPE
robcast
parents: 220
diff changeset
559 reader = null;
7ff9b9b0c16a small fix for NPE
robcast
parents: 220
diff changeset
560 }
148
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
561 img = null;
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
562 }
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
563
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
564 }