annotate servlet/src/digilib/image/ImageLoaderDocuImage.java @ 244:a945d4d5f8cd

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