annotate servlet/src/digilib/image/ImageLoaderDocuImage.java @ 205:6221d688eab6

Servlet version 1.18b9 -- cleanup and bugfixes - fixed bug with slow color JPEGs - better pathname handling - better filehandle cleanup (hopefully)
author robcast
date Fri, 12 Mar 2004 19:52:06 +0100
parents afe7ff98bb71
children 1a65d8e43620
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
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
3 Digital Image Library servlet components
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
4
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
5 Copyright (C) 2002, 2003 Robert Casties (robcast@mail.berlios.de)
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
6
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
7 This program is free software; you can redistribute it and/or modify it
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
9 Free Software Foundation; either version 2 of the License, or (at your
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
10 option) any later version.
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
11
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
12 Please read license.txt for the full details. A copy of the GPL
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
13 may be found at http://www.gnu.org/copyleft/lgpl.html
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
14
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
15 You should have received a copy of the GNU General Public License
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
16 along with this program; if not, write to the Free Software
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
18 */
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;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 1
diff changeset
23 import java.awt.geom.AffineTransform;
101
78f52a1876fe digilib V1.9b1
robcast
parents: 89
diff changeset
24 import java.awt.geom.Rectangle2D;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 1
diff changeset
25 import java.awt.image.AffineTransformOp;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 1
diff changeset
26 import java.awt.image.BufferedImage;
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
27 import java.awt.image.ConvolveOp;
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
28 import java.awt.image.Kernel;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
29 import java.awt.image.RescaleOp;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 1
diff changeset
30 import java.io.File;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 1
diff changeset
31 import java.io.IOException;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
32 import java.io.OutputStream;
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
33 import java.io.RandomAccessFile;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
34 import java.util.Iterator;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
35
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 1
diff changeset
36 import javax.imageio.ImageIO;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
37 import javax.imageio.ImageReadParam;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
38 import javax.imageio.ImageReader;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
39 import javax.imageio.stream.ImageInputStream;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
40
159
e743b853efca servlet version 1.16a4
robcast
parents: 149
diff changeset
41 import digilib.io.ImageFile;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 1
diff changeset
42 import digilib.io.FileOpException;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
43
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 1
diff changeset
44 /** Implementation of DocuImage using the ImageLoader API of Java 1.4 and Java2D. */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
45 public class ImageLoaderDocuImage extends DocuImageImpl {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
46
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
47 /** image object */
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
48 protected BufferedImage img;
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
49 /** interpolation type */
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
50 protected int interpol;
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
51 /** ImageIO image reader */
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
52 protected ImageReader reader;
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
53 /** File that was read */
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
54 protected File imgFile;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
55
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
56 /* loadSubimage is supported. */
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
57 public boolean isSubimageSupported() {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
58 return true;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
59 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
60
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
61 public void setQuality(int qual) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
62 quality = qual;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
63 // setup interpolation quality
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
64 if (qual > 0) {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
65 logger.debug("quality q1");
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
66 interpol = AffineTransformOp.TYPE_BILINEAR;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
67 } else {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
68 logger.debug("quality q0");
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
69 interpol = AffineTransformOp.TYPE_NEAREST_NEIGHBOR;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
70 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
71 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
72
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
73 public int getHeight() {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
74 int h = 0;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
75 try {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
76 if (img == null) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
77 h = reader.getHeight(0);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
78 } else {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
79 h = img.getHeight();
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
80 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
81 } catch (IOException e) {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
82 logger.debug("error in getHeight", e);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
83 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
84 return h;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
85 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
86
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
87 public int getWidth() {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
88 int w = 0;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
89 try {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
90 if (img == null) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
91 w = reader.getWidth(0);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
92 } else {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
93 w = img.getWidth();
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
94 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
95 } catch (IOException e) {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
96 logger.debug("error in getHeight", e);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
97 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
98 return w;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
99 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
100
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
101 /* load image file */
159
e743b853efca servlet version 1.16a4
robcast
parents: 149
diff changeset
102 public void loadImage(ImageFile f) throws FileOpException {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
103 logger.debug("loadImage!");
159
e743b853efca servlet version 1.16a4
robcast
parents: 149
diff changeset
104 //System.gc();
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
105 try {
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
106 img = ImageIO.read(f.getFile());
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
107 if (img == null) {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
108 throw new FileOpException("Unable to load File!");
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
109 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
110 } catch (IOException e) {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
111 throw new FileOpException("Error reading image.");
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
112 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
113 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
114
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
115 /** Get an ImageReader for the image file. */
159
e743b853efca servlet version 1.16a4
robcast
parents: 149
diff changeset
116 public void preloadImage(ImageFile f) throws IOException {
148
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
117 if (reader != null) {
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
118 // clean up old reader
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
119 reader.dispose();
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
120 reader = null;
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
121 }
159
e743b853efca servlet version 1.16a4
robcast
parents: 149
diff changeset
122 //System.gc();
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
123 RandomAccessFile rf = new RandomAccessFile(f.getFile(), "r");
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
124 ImageInputStream istream = ImageIO.createImageInputStream(rf);
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
125 //Iterator readers = ImageIO.getImageReaders(istream);
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
126 //String ext = f.getName().substring(f.getName().lastIndexOf('.')+1);
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
127 //Iterator readers = ImageIO.getImageReadersBySuffix(ext);
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
128 Iterator readers = ImageIO.getImageReadersByMIMEType(f.getMimetype());
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
129 reader = (ImageReader) readers.next();
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
130 /* are there more readers? */
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
131 logger.debug("this reader: " + reader.getClass());
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
132 while (readers.hasNext()) {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
133 logger.debug("next reader: " + readers.next().getClass());
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
134 }
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
135 //*/
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
136 reader.setInput(istream);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
137 if (reader == null) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
138 throw new FileOpException("Unable to load File!");
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
139 }
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
140 imgFile = f.getFile();
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
141 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
142
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
143 /* Load an image file into the Object. */
159
e743b853efca servlet version 1.16a4
robcast
parents: 149
diff changeset
144 public void loadSubimage(ImageFile f, Rectangle region, int prescale)
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
145 throws FileOpException {
159
e743b853efca servlet version 1.16a4
robcast
parents: 149
diff changeset
146 //System.gc();
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
147 try {
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
148 if ((reader == null) || (imgFile != f.getFile())) {
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
149 preloadImage(f);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
150 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
151 // set up reader parameters
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
152 ImageReadParam readParam = reader.getDefaultReadParam();
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
153 readParam.setSourceRegion(region);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
154 readParam.setSourceSubsampling(prescale, prescale, 0, 0);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
155 // read image
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
156 img = reader.read(0, readParam);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
157 } catch (IOException e) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
158 throw new FileOpException("Unable to load File!");
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
159 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
160 if (img == null) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
161 throw new FileOpException("Unable to load File!");
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
162 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
163 }
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
164
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
165 /* write image of type mt to Stream */
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
166 public void writeImage(String mt, OutputStream ostream)
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
167 throws FileOpException {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
168 logger.debug("writeImage!");
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
169 try {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
170 // setup output
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
171 String type = "png";
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
172 if (mt == "image/jpeg") {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
173 type = "jpeg";
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
174 } else if (mt == "image/png") {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
175 type = "png";
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
176 } else {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
177 // unknown mime type
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
178 throw new FileOpException("Unknown mime type: " + mt);
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
179 }
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
180
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
181 /*
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
182 * JPEG doesn't do transparency so we have to convert any RGBA
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
183 * image to RGB :-( *Java2D BUG*
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
184 */
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
185 if ((type == "jpeg") && (img.getColorModel().hasAlpha())) {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
186 logger.debug("BARF: JPEG with transparency!!");
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
187 int w = img.getWidth();
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
188 int h = img.getHeight();
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
189 // BufferedImage.TYPE_INT_RGB seems to be fastest (JDK1.4.1,
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
190 // OSX)
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
191 int destType = BufferedImage.TYPE_INT_RGB;
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
192 BufferedImage img2 = new BufferedImage(w, h, destType);
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
193 img2.createGraphics().drawImage(img, null, 0, 0);
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
194 img = img2;
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
195 }
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
196
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
197 // render output
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
198 if (ImageIO.write(img, type, ostream)) {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
199 // writing was OK
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
200 return;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
201 } else {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
202 throw new FileOpException("Error writing image: Unknown image format!");
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
203 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
204 } catch (IOException e) {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
205 throw new FileOpException("Error writing image.");
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
206 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
207 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
208
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
209 public void scale(double scale, double scaleY) throws ImageOpException {
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
210 /* for downscaling in high quality the image is blurred first */
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
211 if ((scale <= 0.5) && (quality > 1)) {
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
212 int bl = (int) Math.floor(1 / scale);
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
213 blur(bl);
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
214 }
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
215 /* and scaled */
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
216 AffineTransformOp scaleOp =
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
217 new AffineTransformOp(
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
218 AffineTransform.getScaleInstance(scale, scale),
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
219 interpol);
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
220 BufferedImage scaledImg = null;
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
221 // enforce grey destination image for greyscale *Java2D BUG*
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
222 if ((quality > 0)
145
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
223 && (img.getColorModel().getNumColorComponents() == 1)) {
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
224 Rectangle2D dstBounds = scaleOp.getBounds2D(img);
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
225 scaledImg =
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
226 new BufferedImage(
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
227 (int) dstBounds.getWidth(),
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
228 (int) dstBounds.getHeight(),
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
229 img.getType());
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
230 }
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
231 scaledImg = scaleOp.filter(img, scaledImg);
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
232 //DEBUG
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
233 logger.debug("SCALE: "
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
234 + scale
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
235 + " ->"
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
236 + scaledImg.getWidth()
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
237 + "x"
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
238 + scaledImg.getHeight());
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
239 if (scaledImg == null) {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
240 throw new ImageOpException("Unable to scale");
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
241 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
242 img = scaledImg;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
243 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
244
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
245 public void blur(int radius) throws ImageOpException {
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
246 //DEBUG
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
247 logger.debug("blur: " + radius);
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
248 // minimum radius is 2
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
249 int klen = Math.max(radius, 2);
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
250 int ksize = klen * klen;
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
251 // kernel is constant 1/k
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
252 float f = 1f / ksize;
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
253 float[] kern = new float[ksize];
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
254 for (int i = 0; i < ksize; i++) {
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
255 kern[i] = f;
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
256 }
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
257 Kernel blur = new Kernel(klen, klen, kern);
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
258 // blur with convolve operation
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
259 ConvolveOp blurOp = new ConvolveOp(blur, ConvolveOp.EDGE_NO_OP, null);
145
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
260 // blur needs explicit destination image type for color *Java2D BUG*
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
261 BufferedImage blurredImg = null;
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
262 if (img.getType() == BufferedImage.TYPE_3BYTE_BGR) {
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
263 blurredImg =
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
264 new BufferedImage(
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
265 img.getWidth(),
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
266 img.getHeight(),
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
267 img.getType());
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
268 }
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
269 blurredImg = blurOp.filter(img, blurredImg);
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
270 if (blurredImg == null) {
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
271 throw new ImageOpException("Unable to scale");
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
272 }
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
273 img = blurredImg;
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
274 }
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
275
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
276 public void crop(int x_off, int y_off, int width, int height)
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
277 throws ImageOpException {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
278 // setup Crop
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
279 BufferedImage croppedImg = img.getSubimage(x_off, y_off, width, height);
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
280 logger.debug("CROP:" + croppedImg.getWidth() + "x" + croppedImg.getHeight());
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
281 //DEBUG
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
282 // util.dprintln(2, " time
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
283 // "+(System.currentTimeMillis()-startTime)+"ms");
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
284 if (croppedImg == null) {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
285 throw new ImageOpException("Unable to crop");
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
286 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
287 img = croppedImg;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
288 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
289
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
290 public void enhance(float mult, float add) throws ImageOpException {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
291 /*
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
292 * 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
293 * according to the JDK spec. Doesn't work on JDK 1.4 for OSX and Linux
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
294 * (at least). RescaleOp scaleOp = new RescaleOp( (float)mult,
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
295 * (float)add, null); scaleOp.filter(img, img);
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
296 */
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
297
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
298 /* 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
299 int ncol = img.getColorModel().getNumComponents();
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
300 float[] dm = new float[ncol];
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
301 float[] da = new float[ncol];
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
302 for (int i = 0; i < ncol; i++) {
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
303 dm[i] = (float) mult;
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
304 da[i] = (float) add;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
305 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
306 RescaleOp scaleOp = new RescaleOp(dm, da, null);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
307 scaleOp.filter(img, img);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
308 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
309
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
310 public void enhanceRGB(float[] rgbm, float[] rgba)
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
311 throws ImageOpException {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
312
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
313 /*
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
314 * 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
315 * We do only 3 (RGB) bands.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
316 */
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
317
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
318 int ncol = img.getColorModel().getNumColorComponents();
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
319 if ((ncol != 3) || (rgbm.length != 3) || (rgba.length != 3)) {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
320 logger.debug("ERROR(enhance): unknown number of color bands or coefficients ("
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
321 + ncol
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
322 + ")");
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
323 return;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
324 }
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
325 RescaleOp scaleOp =
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
326 new RescaleOp(rgbOrdered(rgbm), rgbOrdered(rgba), null);
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
327 scaleOp.filter(img, img);
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
328 }
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
329
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
330 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
331 * Ensures that the array f is in the right order to map the images RGB
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
332 * components. (not shure what happens
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
333 */
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
334 public float[] rgbOrdered(float[] fa) {
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
335 /*
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
336 * TODO: this is UGLY, UGLY!!
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
337 */
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
338 float[] fb;
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
339 int t = img.getType();
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
340 if (img.getColorModel().hasAlpha()) {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
341 fb = new float[4];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
342 if ((t == BufferedImage.TYPE_INT_ARGB)
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
343 || (t == BufferedImage.TYPE_INT_ARGB_PRE)) {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
344 // RGB Type
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
345 fb[0] = fa[0];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
346 fb[1] = fa[1];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
347 fb[2] = fa[2];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
348 fb[3] = 1f;
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
349 } else {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
350 // this isn't tested :-(
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
351 fb[0] = 1f;
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
352 fb[1] = fa[0];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
353 fb[2] = fa[1];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
354 fb[3] = fa[2];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
355 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
356 } else {
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
357 fb = new float[3];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
358 if (t == BufferedImage.TYPE_3BYTE_BGR) {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
359 // BGR Type (actually it looks like RBG...)
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
360 fb[0] = fa[0];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
361 fb[1] = fa[2];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
362 fb[2] = fa[1];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
363 } else {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
364 fb[0] = fa[0];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
365 fb[1] = fa[1];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
366 fb[2] = fa[2];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
367 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
368 }
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
369 return fb;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
370 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
371
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
372 public void rotate(double angle) throws ImageOpException {
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
373 // setup rotation
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
374 double rangle = Math.toRadians(angle);
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
375 // 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
376 // coordinates
101
78f52a1876fe digilib V1.9b1
robcast
parents: 89
diff changeset
377 double w = img.getWidth();
78f52a1876fe digilib V1.9b1
robcast
parents: 89
diff changeset
378 double h = img.getHeight();
103
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
379 AffineTransform trafo = new AffineTransform();
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
380 // center of rotation
103
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
381 double x = (w / 2);
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
382 double y = (h / 2);
101
78f52a1876fe digilib V1.9b1
robcast
parents: 89
diff changeset
383 trafo.rotate(rangle, x, y);
103
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
384 // try rotation to see how far we're out of bounds
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
385 AffineTransformOp rotOp = new AffineTransformOp(trafo, interpol);
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
386 Rectangle2D rotbounds = rotOp.getBounds2D(img);
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
387 double xoff = rotbounds.getX();
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
388 double yoff = rotbounds.getY();
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
389 // move image back in line
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
390 trafo.preConcatenate(
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
391 AffineTransform.getTranslateInstance(-xoff, -yoff));
101
78f52a1876fe digilib V1.9b1
robcast
parents: 89
diff changeset
392 // transform image
103
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
393 rotOp = new AffineTransformOp(trafo, interpol);
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
394 BufferedImage rotImg = rotOp.filter(img, null);
101
78f52a1876fe digilib V1.9b1
robcast
parents: 89
diff changeset
395 // calculate new bounding box
103
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
396 //Rectangle2D bounds = rotOp.getBounds2D(img);
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
397 if (rotImg == null) {
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
398 throw new ImageOpException("Unable to rotate");
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
399 }
103
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
400 img = rotImg;
101
78f52a1876fe digilib V1.9b1
robcast
parents: 89
diff changeset
401 // crop new image (with self-made rounding)
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
402 /*
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
403 * img = rotImg.getSubimage( (int) (bounds.getX()+0.5), (int)
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
404 * (bounds.getY()+0.5), (int) (bounds.getWidth()+0.5), (int)
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
405 * (bounds.getHeight()+0.5));
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
406 */
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
407 }
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
408
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
409 public void mirror(double angle) throws ImageOpException {
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
410 // setup mirror
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
411 double mx = 1;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
412 double my = 1;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
413 double tx = 0;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
414 double ty = 0;
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
415 if (Math.abs(angle - 0) < epsilon) { // 0 degree
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
416 mx = -1;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
417 tx = getWidth();
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
418 } else if (Math.abs(angle - 90) < epsilon) { // 90 degree
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
419 my = -1;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
420 ty = getHeight();
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
421 } else if (Math.abs(angle - 180) < epsilon) { // 180 degree
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
422 mx = -1;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
423 tx = getWidth();
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
424 } else if (Math.abs(angle - 270) < epsilon) { // 270 degree
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
425 my = -1;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
426 ty = getHeight();
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
427 } else if (Math.abs(angle - 360) < epsilon) { // 360 degree
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
428 mx = -1;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
429 tx = getWidth();
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
430 }
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
431 AffineTransformOp mirOp =
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
432 new AffineTransformOp(
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
433 new AffineTransform(mx, 0, 0, my, tx, ty),
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
434 interpol);
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
435 BufferedImage mirImg = mirOp.filter(img, null);
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
436 if (mirImg == null) {
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
437 throw new ImageOpException("Unable to mirror");
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
438 }
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
439 img = mirImg;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
440 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
441
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
442 /* (non-Javadoc) @see java.lang.Object#finalize() */
148
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
443 protected void finalize() throws Throwable {
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
444 // we must dispose the ImageReader because it keeps the filehandle
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
445 // open!
148
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
446 reader.dispose();
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
447 reader = null;
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
448 img = null;
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
449 super.finalize();
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
450 }
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
451
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
452 }