annotate servlet/src/digilib/image/ImageLoaderDocuImage.java @ 176:67ff8c7fecb9

Servlet version 1.17b2 - new mapping file for "virtual directories" - direct file URLs now work without extension (even with wrong ones)
author robcast
date Mon, 10 Nov 2003 20:59:00 +0100
parents d40922628e4a
children afe7ff98bb71
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 {
0ff3ede32060 Initial revision
robcast
parents:
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) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
65 util.dprintln(4, "quality q1");
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 {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
68 util.dprintln(4, "quality q0");
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) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
82 e.printStackTrace();
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) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
96 e.printStackTrace();
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 {
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
103 util.dprintln(10, "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 util.dprintln(3, "ERROR(loadImage): unable to load file");
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
109 throw new FileOpException("Unable to load File!");
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
110 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
111 } catch (IOException e) {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
112 throw new FileOpException("Error reading image.");
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 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
115
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
116 /** Get an ImageReader for the image file. */
159
e743b853efca servlet version 1.16a4
robcast
parents: 149
diff changeset
117 public void preloadImage(ImageFile f) throws IOException {
148
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
118 if (reader != null) {
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
119 // clean up old reader
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
120 reader.dispose();
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
121 reader = null;
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
122 }
159
e743b853efca servlet version 1.16a4
robcast
parents: 149
diff changeset
123 //System.gc();
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
124 RandomAccessFile rf = new RandomAccessFile(f.getFile(), "r");
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
125 ImageInputStream istream = ImageIO.createImageInputStream(rf);
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
126 //Iterator readers = ImageIO.getImageReaders(istream);
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
127 //String ext = f.getName().substring(f.getName().lastIndexOf('.')+1);
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
128 //Iterator readers = ImageIO.getImageReadersBySuffix(ext);
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
129 Iterator readers = ImageIO.getImageReadersByMIMEType(f.getMimetype());
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
130 reader = (ImageReader) readers.next();
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
131 /* are there more readers? */
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
132 System.out.println("this reader: " + reader.getClass());
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
133 while (readers.hasNext()) {
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
134 System.out.println("next reader: " + readers.next().getClass());
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
135 }
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
136 //*/
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
137 reader.setInput(istream);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
138 if (reader == null) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
139 util.dprintln(3, "ERROR(loadImage): unable to load file");
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
140 throw new FileOpException("Unable to load File!");
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
141 }
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
142 imgFile = f.getFile();
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
143 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
144
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
145 /* Load an image file into the Object. */
159
e743b853efca servlet version 1.16a4
robcast
parents: 149
diff changeset
146 public void loadSubimage(ImageFile f, Rectangle region, int prescale)
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
147 throws FileOpException {
159
e743b853efca servlet version 1.16a4
robcast
parents: 149
diff changeset
148 //System.gc();
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
149 try {
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
150 if ((reader == null) || (imgFile != f.getFile())) {
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
151 preloadImage(f);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
152 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
153 // set up reader parameters
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
154 ImageReadParam readParam = reader.getDefaultReadParam();
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
155 readParam.setSourceRegion(region);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
156 readParam.setSourceSubsampling(prescale, prescale, 0, 0);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
157 // read image
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
158 img = reader.read(0, readParam);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
159 } catch (IOException e) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
160 util.dprintln(3, "ERROR(loadImage): unable to load file");
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 if (img == null) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
164 util.dprintln(3, "ERROR(loadImage): unable to load file");
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
165 throw new FileOpException("Unable to load File!");
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
166 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
167 }
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
168
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
169 /* write image of type mt to Stream */
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
170 public void writeImage(String mt, OutputStream ostream)
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
171 throws FileOpException {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
172 util.dprintln(10, "writeImage!");
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
173 try {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
174 // setup output
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
175 String type = "png";
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
176 if (mt == "image/jpeg") {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
177 type = "jpeg";
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
178 } else if (mt == "image/png") {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
179 type = "png";
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
180 } else {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
181 // unknown mime type
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
182 util.dprintln(2, "ERROR(writeImage): Unknown mime type " + mt);
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
183 throw new FileOpException("Unknown mime type: " + mt);
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
184 }
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
185
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
186 /*
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
187 * 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
188 * image to RGB :-( *Java2D BUG*
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
189 */
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
190 if ((type == "jpeg") && (img.getColorModel().hasAlpha())) {
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
191 util.dprintln(2, "BARF: JPEG with transparency!!");
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
192 int w = img.getWidth();
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
193 int h = img.getHeight();
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
194 // 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
195 // OSX)
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
196 int destType = BufferedImage.TYPE_INT_RGB;
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
197 BufferedImage img2 = new BufferedImage(w, h, destType);
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
198 img2.createGraphics().drawImage(img, null, 0, 0);
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
199 img = img2;
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
200 }
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
201
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
202 // render output
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
203 if (ImageIO.write(img, type, ostream)) {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
204 // writing was OK
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
205 return;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
206 } else {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
207 throw new FileOpException("Error writing image: Unknown image format!");
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
208 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
209 } catch (IOException e) {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
210 // e.printStackTrace();
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
211 throw new FileOpException("Error writing image.");
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
212 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
213 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
214
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
215 public void scale(double scale, double scaleY) throws ImageOpException {
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
216 /* for downscaling in high quality the image is blurred first */
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
217 if ((scale <= 0.5) && (quality > 1)) {
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
218 int bl = (int) Math.floor(1 / scale);
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
219 blur(bl);
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
220 }
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
221 /* and scaled */
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
222 AffineTransformOp scaleOp =
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
223 new AffineTransformOp(
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
224 AffineTransform.getScaleInstance(scale, scale),
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
225 interpol);
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
226 BufferedImage scaledImg = null;
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
227 // enforce grey destination image for greyscale *Java2D BUG*
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
228 if ((quality > 0)
145
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
229 && (img.getColorModel().getNumColorComponents() == 1)) {
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
230 Rectangle2D dstBounds = scaleOp.getBounds2D(img);
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
231 scaledImg =
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
232 new BufferedImage(
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
233 (int) dstBounds.getWidth(),
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
234 (int) dstBounds.getHeight(),
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
235 img.getType());
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
236 }
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
237 scaledImg = scaleOp.filter(img, scaledImg);
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
238 //DEBUG
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
239 util.dprintln(
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
240 3,
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
241 "SCALE: "
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
242 + scale
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
243 + " ->"
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
244 + scaledImg.getWidth()
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
245 + "x"
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
246 + scaledImg.getHeight());
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
247 if (scaledImg == null) {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
248 util.dprintln(2, "ERROR(cropAndScale): error in scale");
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
249 throw new ImageOpException("Unable to scale");
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
250 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
251 img = scaledImg;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
252 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
253
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
254 public void blur(int radius) throws ImageOpException {
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
255 //DEBUG
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
256 util.dprintln(4, "blur: " + radius);
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
257 // minimum radius is 2
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
258 int klen = Math.max(radius, 2);
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
259 int ksize = klen * klen;
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
260 // kernel is constant 1/k
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
261 float f = 1f / ksize;
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
262 float[] kern = new float[ksize];
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
263 for (int i = 0; i < ksize; i++) {
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
264 kern[i] = f;
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
265 }
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
266 Kernel blur = new Kernel(klen, klen, kern);
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
267 // blur with convolve operation
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
268 ConvolveOp blurOp = new ConvolveOp(blur, ConvolveOp.EDGE_NO_OP, null);
145
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
269 // blur needs explicit destination image type for color *Java2D BUG*
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
270 BufferedImage blurredImg = null;
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
271 if (img.getType() == BufferedImage.TYPE_3BYTE_BGR) {
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
272 blurredImg =
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
273 new BufferedImage(
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
274 img.getWidth(),
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
275 img.getHeight(),
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
276 img.getType());
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
277 }
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
278 blurredImg = blurOp.filter(img, blurredImg);
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
279 if (blurredImg == null) {
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
280 util.dprintln(2, "ERROR(cropAndScale): error in scale");
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
281 throw new ImageOpException("Unable to scale");
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
282 }
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
283 img = blurredImg;
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
284 }
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
285
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
286 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
287 throws ImageOpException {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
288 // setup Crop
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
289 BufferedImage croppedImg = img.getSubimage(x_off, y_off, width, height);
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
290 util.dprintln(
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
291 3,
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
292 "CROP:" + croppedImg.getWidth() + "x" + croppedImg.getHeight());
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
293 //DEBUG
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
294 // util.dprintln(2, " time
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
295 // "+(System.currentTimeMillis()-startTime)+"ms");
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
296 if (croppedImg == null) {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
297 util.dprintln(2, "ERROR(cropAndScale): error in crop");
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
298 throw new ImageOpException("Unable to crop");
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
299 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
300 img = croppedImg;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
301 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
302
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
303 public void enhance(float mult, float add) throws ImageOpException {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
304 /*
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
305 * 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
306 * 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
307 * (at least). RescaleOp scaleOp = new RescaleOp( (float)mult,
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
308 * (float)add, null); scaleOp.filter(img, img);
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
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
311 /* 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
312 int ncol = img.getColorModel().getNumComponents();
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
313 float[] dm = new float[ncol];
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
314 float[] da = new float[ncol];
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
315 for (int i = 0; i < ncol; i++) {
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
316 dm[i] = (float) mult;
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
317 da[i] = (float) add;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
318 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
319 RescaleOp scaleOp = new RescaleOp(dm, da, null);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
320 scaleOp.filter(img, img);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
321 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
322
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
323 public void enhanceRGB(float[] rgbm, float[] rgba)
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
324 throws ImageOpException {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
325
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
326 /*
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
327 * 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
328 * We do only 3 (RGB) bands.
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
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
331 int ncol = img.getColorModel().getNumColorComponents();
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
332 if ((ncol != 3) || (rgbm.length != 3) || (rgba.length != 3)) {
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
333 util.dprintln(
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
334 2,
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
335 "ERROR(enhance): unknown number of color bands or coefficients ("
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
336 + ncol
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
337 + ")");
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
338 return;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
339 }
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
340 RescaleOp scaleOp =
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
341 new RescaleOp(rgbOrdered(rgbm), rgbOrdered(rgba), null);
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
342 scaleOp.filter(img, img);
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
343 }
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
344
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
345 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
346 * 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
347 * components. (not shure what happens
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
348 */
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
349 public float[] rgbOrdered(float[] fa) {
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
350 /*
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
351 * TODO: this is UGLY, UGLY!!
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
352 */
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
353 float[] fb;
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
354 int t = img.getType();
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
355 if (img.getColorModel().hasAlpha()) {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
356 fb = new float[4];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
357 if ((t == BufferedImage.TYPE_INT_ARGB)
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
358 || (t == BufferedImage.TYPE_INT_ARGB_PRE)) {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
359 // RGB Type
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[1];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
362 fb[2] = fa[2];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
363 fb[3] = 1f;
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
364 } else {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
365 // this isn't tested :-(
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
366 fb[0] = 1f;
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
367 fb[1] = fa[0];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
368 fb[2] = fa[1];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
369 fb[3] = fa[2];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
370 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
371 } else {
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
372 fb = new float[3];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
373 if (t == BufferedImage.TYPE_3BYTE_BGR) {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
374 // BGR Type (actually it looks like RBG...)
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
375 fb[0] = fa[0];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
376 fb[1] = fa[2];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
377 fb[2] = fa[1];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
378 } else {
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[1];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
381 fb[2] = fa[2];
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
382 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
383 }
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
384 return fb;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
385 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
386
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
387 public void rotate(double angle) throws ImageOpException {
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
388 // setup rotation
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
389 double rangle = Math.toRadians(angle);
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
390 // 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
391 // coordinates
101
78f52a1876fe digilib V1.9b1
robcast
parents: 89
diff changeset
392 double w = img.getWidth();
78f52a1876fe digilib V1.9b1
robcast
parents: 89
diff changeset
393 double h = img.getHeight();
103
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
394 AffineTransform trafo = new AffineTransform();
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
395 // center of rotation
103
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
396 double x = (w / 2);
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
397 double y = (h / 2);
101
78f52a1876fe digilib V1.9b1
robcast
parents: 89
diff changeset
398 trafo.rotate(rangle, x, y);
103
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
399 // try rotation to see how far we're out of bounds
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
400 AffineTransformOp rotOp = new AffineTransformOp(trafo, interpol);
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
401 Rectangle2D rotbounds = rotOp.getBounds2D(img);
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
402 double xoff = rotbounds.getX();
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
403 double yoff = rotbounds.getY();
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
404 // move image back in line
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
405 trafo.preConcatenate(
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
406 AffineTransform.getTranslateInstance(-xoff, -yoff));
101
78f52a1876fe digilib V1.9b1
robcast
parents: 89
diff changeset
407 // transform image
103
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
408 rotOp = new AffineTransformOp(trafo, interpol);
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
409 BufferedImage rotImg = rotOp.filter(img, null);
101
78f52a1876fe digilib V1.9b1
robcast
parents: 89
diff changeset
410 // calculate new bounding box
103
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
411 //Rectangle2D bounds = rotOp.getBounds2D(img);
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
412 if (rotImg == null) {
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
413 util.dprintln(2, "ERROR: error in rotate");
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
414 throw new ImageOpException("Unable to rotate");
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
415 }
103
0e49645f98c8 Servlet V1.9b2
robcast
parents: 101
diff changeset
416 img = rotImg;
101
78f52a1876fe digilib V1.9b1
robcast
parents: 89
diff changeset
417 // crop new image (with self-made rounding)
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
418 /*
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
419 * img = rotImg.getSubimage( (int) (bounds.getX()+0.5), (int)
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
420 * (bounds.getY()+0.5), (int) (bounds.getWidth()+0.5), (int)
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
421 * (bounds.getHeight()+0.5));
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
422 */
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
423 }
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
424
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
425 public void mirror(double angle) throws ImageOpException {
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
426 // setup mirror
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
427 double mx = 1;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
428 double my = 1;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
429 double tx = 0;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
430 double ty = 0;
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
431 if (Math.abs(angle - 0) < epsilon) { // 0 degree
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
432 mx = -1;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
433 tx = getWidth();
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
434 } else if (Math.abs(angle - 90) < epsilon) { // 90 degree
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
435 my = -1;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
436 ty = getHeight();
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
437 } else if (Math.abs(angle - 180) < epsilon) { // 180 degree
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
438 mx = -1;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
439 tx = getWidth();
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
440 } else if (Math.abs(angle - 270) < epsilon) { // 270 degree
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
441 my = -1;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
442 ty = getHeight();
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
443 } else if (Math.abs(angle - 360) < epsilon) { // 360 degree
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
444 mx = -1;
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
445 tx = getWidth();
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
446 }
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
447 AffineTransformOp mirOp =
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
448 new AffineTransformOp(
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
449 new AffineTransform(mx, 0, 0, my, tx, ty),
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
450 interpol);
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
451 BufferedImage mirImg = mirOp.filter(img, null);
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
452 if (mirImg == null) {
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
453 util.dprintln(2, "ERROR: error in mirror");
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
454 throw new ImageOpException("Unable to mirror");
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
455 }
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
456 img = mirImg;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
457 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
458
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
459 /* (non-Javadoc) @see java.lang.Object#finalize() */
148
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
460 protected void finalize() throws Throwable {
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
461 //System.out.println("FIN de ImageLoaderDocuImage!");
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
462 // we must dispose the ImageReader because it keeps the filehandle
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
463 // open!
148
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
464 reader.dispose();
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
465 reader = null;
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
466 img = null;
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
467 super.finalize();
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
468 }
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
469
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
470 }