annotate common/src/main/java/digilib/image/ImageLoaderDocuImage.java @ 1026:01ea28b6fe11

commit sliders, not yet functional
author hertzhaft
date Wed, 07 Mar 2012 16:19:50 +0100
parents 172079f9a398
children 4e368c85cce4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
1 /* ImageLoaderDocuImage -- Image class implementation using JDK 1.4 ImageLoader
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
2
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
3 Digital Image Library servlet components
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
4
819
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
5 Copyright (C) 2002 - 2011 Robert Casties (robcast@mail.berlios.de)
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
6
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
7 This program is free software; you can redistribute it and/or modify it
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
8 under the terms of the GNU General Public License as published by the
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
9 Free Software Foundation; either version 2 of the License, or (at your
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
10 option) any later version.
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
11
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
12 Please read license.txt for the full details. A copy of the GPL
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
13 may be found at http://www.gnu.org/copyleft/lgpl.html
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
14
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
15 You should have received a copy of the GNU General Public License
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
16 along with this program; if not, write to the Free Software
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
18 */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
19
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
20 package digilib.image;
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
21
496
1760b19df530 Added getImage method to ImageLoaderDocuImage;
cmielack
parents: 469
diff changeset
22 import java.awt.Image;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
23 import java.awt.Rectangle;
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
24 import java.awt.RenderingHints;
829
a630d0303cce new servlet operation colop=grayscale.
robcast
parents: 827
diff changeset
25 import java.awt.color.ColorSpace;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 1
diff changeset
26 import java.awt.geom.AffineTransform;
101
78f52a1876fe digilib V1.9b1
robcast
parents: 89
diff changeset
27 import java.awt.geom.Rectangle2D;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 1
diff changeset
28 import java.awt.image.AffineTransformOp;
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
29 import java.awt.image.BandCombineOp;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 1
diff changeset
30 import java.awt.image.BufferedImage;
834
c07c21ac78f9 color invert operation. doesn't work with all image types yet...
robcast
parents: 831
diff changeset
31 import java.awt.image.ByteLookupTable;
829
a630d0303cce new servlet operation colop=grayscale.
robcast
parents: 827
diff changeset
32 import java.awt.image.ColorConvertOp;
838
dd13310dbe29 another try at invert. (works on osx...)
robcast
parents: 834
diff changeset
33 import java.awt.image.ColorModel;
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
34 import java.awt.image.ConvolveOp;
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
35 import java.awt.image.IndexColorModel;
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
36 import java.awt.image.Kernel;
834
c07c21ac78f9 color invert operation. doesn't work with all image types yet...
robcast
parents: 831
diff changeset
37 import java.awt.image.LookupOp;
c07c21ac78f9 color invert operation. doesn't work with all image types yet...
robcast
parents: 831
diff changeset
38 import java.awt.image.LookupTable;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
39 import java.awt.image.RescaleOp;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 1
diff changeset
40 import java.io.IOException;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
41 import java.io.OutputStream;
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
42 import java.io.RandomAccessFile;
464
f1f710ff14ad Servlet version 1.10b
robcast
parents: 462
diff changeset
43 import java.util.Arrays;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
44 import java.util.Iterator;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
45
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
46 import javax.imageio.IIOImage;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 1
diff changeset
47 import javax.imageio.ImageIO;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
48 import javax.imageio.ImageReadParam;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
49 import javax.imageio.ImageReader;
935
776347921bec fixed slowness of tiff with color profile by loading into srgb.
robcast
parents: 912
diff changeset
50 import javax.imageio.ImageTypeSpecifier;
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
51 import javax.imageio.ImageWriteParam;
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
52 import javax.imageio.ImageWriter;
220
c4ee5f0c3a77 servlet version 1.18b12
robcast
parents: 207
diff changeset
53 import javax.imageio.stream.FileImageInputStream;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
54 import javax.imageio.stream.ImageInputStream;
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
55 import javax.imageio.stream.ImageOutputStream;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
56
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
57 import digilib.io.FileOpException;
464
f1f710ff14ad Servlet version 1.10b
robcast
parents: 462
diff changeset
58 import digilib.io.FileOps;
579
efd7a223f819 try: ImageInput as interface, ImageFile inherits from Dirent and implements ImageInput
robcast
parents: 574
diff changeset
59 import digilib.io.ImageInput;
596
2b58d2783ef0 small cleanup
robcast
parents: 590
diff changeset
60 import digilib.util.ImageSize;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
61
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 1
diff changeset
62 /** Implementation of DocuImage using the ImageLoader API of Java 1.4 and Java2D. */
564
4c51d71aef13 more reshuffling of classes
robcast
parents: 563
diff changeset
63 public class ImageLoaderDocuImage extends ImageInfoDocuImage {
590
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
64
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
65 /** image object */
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
66 protected BufferedImage img;
570
fd2ef7e46119 more cleanup, set version to 1.8.2
robcast
parents: 565
diff changeset
67
906
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
68 /** the reader object */
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
69 protected ImageReader reader = null;
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
70
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
71 /** try to reuse reader object */
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
72 public boolean reuseReader = false;
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
73
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
74 /** interpolation type */
838
dd13310dbe29 another try at invert. (works on osx...)
robcast
parents: 834
diff changeset
75 protected RenderingHints renderHint = null;
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
76
834
c07c21ac78f9 color invert operation. doesn't work with all image types yet...
robcast
parents: 831
diff changeset
77 /** convolution kernels for blur() */
590
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
78 protected static Kernel[] convolutionKernels = {
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
79 null,
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
80 new Kernel(1, 1, new float[] {1f}),
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
81 new Kernel(2, 2, new float[] {0.25f, 0.25f, 0.25f, 0.25f}),
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
82 new Kernel(3, 3, new float[] {1f/9f, 1f/9f, 1f/9f, 1f/9f, 1f/9f, 1f/9f, 1f/9f, 1f/9f, 1f/9f})
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
83 };
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
84
854
1e2e9599d84c (slightly) fixed enhance and colop in linux.
robcast
parents: 843
diff changeset
85 /* lookup tables for inverting images (byte) */
841
3519cfa11a0b organised special juju for invert on linux jdk 1.6.
robcast
parents: 839
diff changeset
86 protected static LookupTable invertSingleByteTable;
3519cfa11a0b organised special juju for invert on linux jdk 1.6.
robcast
parents: 839
diff changeset
87 protected static LookupTable invertRgbaByteTable;
854
1e2e9599d84c (slightly) fixed enhance and colop in linux.
robcast
parents: 843
diff changeset
88 protected static boolean needsInvertRgba = false;
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
89 /* RescaleOp for contrast/brightness operation */
854
1e2e9599d84c (slightly) fixed enhance and colop in linux.
robcast
parents: 843
diff changeset
90 protected static boolean needsRescaleRgba = false;
865
ace973a106b5 fixed linux version of image ops.
robcast
parents: 864
diff changeset
91 /* lookup table for false-color */
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
92 protected static LookupTable mapBgrByteTable;
865
ace973a106b5 fixed linux version of image ops.
robcast
parents: 864
diff changeset
93 protected static boolean needsMapBgr = false;
854
1e2e9599d84c (slightly) fixed enhance and colop in linux.
robcast
parents: 843
diff changeset
94
834
c07c21ac78f9 color invert operation. doesn't work with all image types yet...
robcast
parents: 831
diff changeset
95 static {
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
96 /*
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
97 * create static lookup tables
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
98 */
834
c07c21ac78f9 color invert operation. doesn't work with all image types yet...
robcast
parents: 831
diff changeset
99 byte[] invertByte = new byte[256];
c07c21ac78f9 color invert operation. doesn't work with all image types yet...
robcast
parents: 831
diff changeset
100 byte[] orderedByte = new byte[256];
841
3519cfa11a0b organised special juju for invert on linux jdk 1.6.
robcast
parents: 839
diff changeset
101 byte[] nullByte = new byte[256];
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
102 byte[] mapR = new byte[256];
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
103 byte[] mapG = new byte[256];
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
104 byte[] mapB = new byte[256];
834
c07c21ac78f9 color invert operation. doesn't work with all image types yet...
robcast
parents: 831
diff changeset
105 for (int i = 0; i < 256; ++i) {
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
106 // counting down
834
c07c21ac78f9 color invert operation. doesn't work with all image types yet...
robcast
parents: 831
diff changeset
107 invertByte[i] = (byte) (256 - i);
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
108 // counting up
834
c07c21ac78f9 color invert operation. doesn't work with all image types yet...
robcast
parents: 831
diff changeset
109 orderedByte[i] = (byte) i;
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
110 // constant 0
841
3519cfa11a0b organised special juju for invert on linux jdk 1.6.
robcast
parents: 839
diff changeset
111 nullByte[i] = 0;
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
112 // three overlapping slopes
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
113 if (i < 64) {
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
114 mapR[i] = 0;
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
115 mapG[i] = (byte) (4 * i);
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
116 mapB[i] = (byte) 255;
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
117 } else if (i >= 64 && i < 192) {
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
118 mapR[i] = (byte) (2 * (i - 64));
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
119 mapG[i] = (byte) 255;
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
120 mapB[i] = (byte) (255 - 2 * (i - 64));
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
121 } else {
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
122 mapR[i] = (byte) 255;
861
74062b7d9b22 fixed colop=map_gray_bgr.
robcast
parents: 860
diff changeset
123 mapG[i] = (byte) (255 - (4 * (i - 192)));
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
124 mapB[i] = 0;
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
125 }
834
c07c21ac78f9 color invert operation. doesn't work with all image types yet...
robcast
parents: 831
diff changeset
126 }
841
3519cfa11a0b organised special juju for invert on linux jdk 1.6.
robcast
parents: 839
diff changeset
127 // should(!) work for all color models
3519cfa11a0b organised special juju for invert on linux jdk 1.6.
robcast
parents: 839
diff changeset
128 invertSingleByteTable = new ByteLookupTable(0, invertByte);
3519cfa11a0b organised special juju for invert on linux jdk 1.6.
robcast
parents: 839
diff changeset
129 // but doesn't work with alpha channel on all platforms
3519cfa11a0b organised special juju for invert on linux jdk 1.6.
robcast
parents: 839
diff changeset
130 String ver = System.getProperty("java.version");
3519cfa11a0b organised special juju for invert on linux jdk 1.6.
robcast
parents: 839
diff changeset
131 String os = System.getProperty("os.name");
3519cfa11a0b organised special juju for invert on linux jdk 1.6.
robcast
parents: 839
diff changeset
132 logger.debug("os="+os+" ver="+ver);
3519cfa11a0b organised special juju for invert on linux jdk 1.6.
robcast
parents: 839
diff changeset
133 if (os.startsWith("Linux") && ver.startsWith("1.6")) {
3519cfa11a0b organised special juju for invert on linux jdk 1.6.
robcast
parents: 839
diff changeset
134 // GRAB(WTF?) works in Linux JDK1.6 with transparency
3519cfa11a0b organised special juju for invert on linux jdk 1.6.
robcast
parents: 839
diff changeset
135 invertRgbaByteTable = new ByteLookupTable(0, new byte[][] {
3519cfa11a0b organised special juju for invert on linux jdk 1.6.
robcast
parents: 839
diff changeset
136 invertByte, invertByte, orderedByte, invertByte});
854
1e2e9599d84c (slightly) fixed enhance and colop in linux.
robcast
parents: 843
diff changeset
137 needsInvertRgba = true;
1e2e9599d84c (slightly) fixed enhance and colop in linux.
robcast
parents: 843
diff changeset
138 needsRescaleRgba = true;
865
ace973a106b5 fixed linux version of image ops.
robcast
parents: 864
diff changeset
139 needsMapBgr = true;
841
3519cfa11a0b organised special juju for invert on linux jdk 1.6.
robcast
parents: 839
diff changeset
140 } else {
3519cfa11a0b organised special juju for invert on linux jdk 1.6.
robcast
parents: 839
diff changeset
141 invertRgbaByteTable = invertSingleByteTable;
3519cfa11a0b organised special juju for invert on linux jdk 1.6.
robcast
parents: 839
diff changeset
142 }
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
143 // this hopefully works for all
865
ace973a106b5 fixed linux version of image ops.
robcast
parents: 864
diff changeset
144 mapBgrByteTable = new ByteLookupTable(0, new byte[][] {
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
145 mapR, mapG, mapB});
834
c07c21ac78f9 color invert operation. doesn't work with all image types yet...
robcast
parents: 831
diff changeset
146 }
c07c21ac78f9 color invert operation. doesn't work with all image types yet...
robcast
parents: 831
diff changeset
147
819
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
148 /** the size of the current image */
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
149 protected ImageSize imageSize;
590
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
150
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
151
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
152 /* loadSubimage is supported. */
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
153 public boolean isSubimageSupported() {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
154 return true;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
155 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
156
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
157 public void setQuality(int qual) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
158 quality = qual;
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
159 renderHint = new RenderingHints(null);
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
160 // hint.put(RenderingHints.KEY_ANTIALIASING,
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
161 // RenderingHints.VALUE_ANTIALIAS_OFF);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
162 // setup interpolation quality
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
163 if (qual > 0) {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
164 logger.debug("quality q1");
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
165 renderHint.put(RenderingHints.KEY_INTERPOLATION,
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
166 RenderingHints.VALUE_INTERPOLATION_BICUBIC);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
167 } else {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
168 logger.debug("quality q0");
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
169 renderHint.put(RenderingHints.KEY_INTERPOLATION,
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
170 RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
171 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
172 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
173
570
fd2ef7e46119 more cleanup, set version to 1.8.2
robcast
parents: 565
diff changeset
174 /* returns the size of the current image */
fd2ef7e46119 more cleanup, set version to 1.8.2
robcast
parents: 565
diff changeset
175 public ImageSize getSize() {
819
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
176 if (imageSize == null) {
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
177 int h = 0;
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
178 int w = 0;
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
179 try {
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
180 if (img == null) {
906
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
181 reader = getReader(input);
819
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
182 // get size from ImageReader
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
183 h = reader.getHeight(0);
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
184 w = reader.getWidth(0);
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
185 } else {
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
186 // get size from image
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
187 h = img.getHeight();
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
188 w = img.getWidth();
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
189 }
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
190 imageSize = new ImageSize(w, h);
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
191 } catch (IOException e) {
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
192 logger.debug("error in getSize:", e);
570
fd2ef7e46119 more cleanup, set version to 1.8.2
robcast
parents: 565
diff changeset
193 }
fd2ef7e46119 more cleanup, set version to 1.8.2
robcast
parents: 565
diff changeset
194 }
819
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
195 return imageSize;
570
fd2ef7e46119 more cleanup, set version to 1.8.2
robcast
parents: 565
diff changeset
196 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
197
464
f1f710ff14ad Servlet version 1.10b
robcast
parents: 462
diff changeset
198 /* returns a list of supported image formats */
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents: 1
diff changeset
199 public Iterator<String> getSupportedFormats() {
464
f1f710ff14ad Servlet version 1.10b
robcast
parents: 462
diff changeset
200 String[] formats = ImageIO.getReaderFormatNames();
f1f710ff14ad Servlet version 1.10b
robcast
parents: 462
diff changeset
201 return Arrays.asList(formats).iterator();
f1f710ff14ad Servlet version 1.10b
robcast
parents: 462
diff changeset
202 }
f1f710ff14ad Servlet version 1.10b
robcast
parents: 462
diff changeset
203
588
aee436f0549d more work on stream input
robcast
parents: 587
diff changeset
204 /* Check image size and type and store in ImageInput */
aee436f0549d more work on stream input
robcast
parents: 587
diff changeset
205 public ImageInput identify(ImageInput input) throws IOException {
906
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
206 ImageInput ii = null;
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
207 if (!reuseReader) {
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
208 // try parent method first
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
209 ii = super.identify(input);
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
210 if (ii != null) {
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
211 return ii;
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
212 }
462
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
213 }
588
aee436f0549d more work on stream input
robcast
parents: 587
diff changeset
214 logger.debug("identifying (ImageIO) " + input);
590
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
215 try {
819
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
216 /*
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
217 * try ImageReader
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
218 */
590
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
219 reader = getReader(input);
819
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
220 // set size
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
221 ImageSize d = new ImageSize(reader.getWidth(0), reader.getHeight(0));
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
222 input.setSize(d);
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
223 // set mime type
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
224 if (input.getMimetype() == null) {
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
225 if (input.hasFile()) {
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
226 String t = FileOps.mimeForFile(input.getFile());
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
227 input.setMimetype(t);
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
228 } else {
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
229 // FIXME: is format name a mime type???
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
230 String t = reader.getFormatName();
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
231 input.setMimetype(t);
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
232 }
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
233 }
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
234 return input;
590
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
235 } catch (FileOpException e) {
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
236 // maybe just our class doesn't know what to do
819
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
237 logger.error("ImageLoaderDocuimage unable to identify:", e);
590
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
238 return null;
819
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
239 } finally {
906
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
240 if (!reuseReader && reader != null) {
819
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
241 reader.dispose();
588
aee436f0549d more work on stream input
robcast
parents: 587
diff changeset
242 }
462
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
243 }
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
244 }
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
245
03ff7238c9d4 second try for flashpix support (doesn't work currently...)
robcast
parents: 402
diff changeset
246 /* load image file */
588
aee436f0549d more work on stream input
robcast
parents: 587
diff changeset
247 public void loadImage(ImageInput ii) throws FileOpException {
aee436f0549d more work on stream input
robcast
parents: 587
diff changeset
248 logger.debug("loadImage: " + ii);
aee436f0549d more work on stream input
robcast
parents: 587
diff changeset
249 this.input = ii;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
250 try {
588
aee436f0549d more work on stream input
robcast
parents: 587
diff changeset
251 if (ii.hasImageInputStream()) {
aee436f0549d more work on stream input
robcast
parents: 587
diff changeset
252 img = ImageIO.read(ii.getImageInputStream());
aee436f0549d more work on stream input
robcast
parents: 587
diff changeset
253 } else if (ii.hasFile()) {
aee436f0549d more work on stream input
robcast
parents: 587
diff changeset
254 img = ImageIO.read(ii.getFile());
aee436f0549d more work on stream input
robcast
parents: 587
diff changeset
255 }
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
256 } catch (IOException e) {
906
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
257 throw new FileOpException("Error reading image!", e);
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
258 }
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
259 if (img == null) {
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
260 throw new FileOpException("Unable to read image!");
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
261 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
262 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
263
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
264 /**
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
265 * Get an ImageReader for the image file.
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
266 *
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
267 * @return
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
268 */
587
720d061a1b30 more work on stream input
robcast
parents: 574
diff changeset
269 public ImageReader getReader(ImageInput input) throws IOException {
720d061a1b30 more work on stream input
robcast
parents: 574
diff changeset
270 logger.debug("get ImageReader for " + input);
906
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
271 if (reuseReader && reader != null) {
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
272 logger.debug("reuseing ImageReader");
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
273 return reader;
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
274 }
587
720d061a1b30 more work on stream input
robcast
parents: 574
diff changeset
275 ImageInputStream istream = null;
720d061a1b30 more work on stream input
robcast
parents: 574
diff changeset
276 if (input.hasImageInputStream()) {
906
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
277 // ImageInputStream input
587
720d061a1b30 more work on stream input
robcast
parents: 574
diff changeset
278 istream = input.getImageInputStream();
720d061a1b30 more work on stream input
robcast
parents: 574
diff changeset
279 } else if (input.hasFile()) {
720d061a1b30 more work on stream input
robcast
parents: 574
diff changeset
280 // file only input
720d061a1b30 more work on stream input
robcast
parents: 574
diff changeset
281 RandomAccessFile rf = new RandomAccessFile(input.getFile(), "r");
720d061a1b30 more work on stream input
robcast
parents: 574
diff changeset
282 istream = new FileImageInputStream(rf);
720d061a1b30 more work on stream input
robcast
parents: 574
diff changeset
283 } else {
720d061a1b30 more work on stream input
robcast
parents: 574
diff changeset
284 throw new FileOpException("Unable to get data from ImageInput");
148
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
285 }
565
8beefd1142b2 more cleanup
robcast
parents: 564
diff changeset
286 Iterator<ImageReader> readers;
819
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
287 String mt = null;
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
288 if (input.hasMimetype()) {
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
289 // check hasMimetype first or we might get into a loop
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
290 mt = input.getMimetype();
821
6c752969f9e8 more tries and catches...
robcast
parents: 819
diff changeset
291 } else {
6c752969f9e8 more tries and catches...
robcast
parents: 819
diff changeset
292 // try file extension
6c752969f9e8 more tries and catches...
robcast
parents: 819
diff changeset
293 mt = FileOps.mimeForFile(input.getFile());
819
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
294 }
565
8beefd1142b2 more cleanup
robcast
parents: 564
diff changeset
295 if (mt == null) {
8beefd1142b2 more cleanup
robcast
parents: 564
diff changeset
296 logger.debug("No mime-type. Trying automagic.");
8beefd1142b2 more cleanup
robcast
parents: 564
diff changeset
297 readers = ImageIO.getImageReaders(istream);
8beefd1142b2 more cleanup
robcast
parents: 564
diff changeset
298 } else {
8beefd1142b2 more cleanup
robcast
parents: 564
diff changeset
299 logger.debug("File type:" + mt);
8beefd1142b2 more cleanup
robcast
parents: 564
diff changeset
300 readers = ImageIO.getImageReadersByMIMEType(mt);
8beefd1142b2 more cleanup
robcast
parents: 564
diff changeset
301 }
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
302 if (!readers.hasNext()) {
565
8beefd1142b2 more cleanup
robcast
parents: 564
diff changeset
303 throw new FileOpException("Can't find Reader to load File!");
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
304 }
819
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
305 ImageReader reader = readers.next();
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
306 /* are there more readers? */
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
307 logger.debug("ImageIO: this reader: " + reader.getClass());
564
4c51d71aef13 more reshuffling of classes
robcast
parents: 563
diff changeset
308 /* while (readers.hasNext()) {
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
309 logger.debug("ImageIO: next reader: " + readers.next().getClass());
564
4c51d71aef13 more reshuffling of classes
robcast
parents: 563
diff changeset
310 } */
89
6d35c945a5d6 New version 1.8b4.
robcast
parents: 86
diff changeset
311 reader.setInput(istream);
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
312 return reader;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
313 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
314
935
776347921bec fixed slowness of tiff with color profile by loading into srgb.
robcast
parents: 912
diff changeset
315 /* Load an image file into the Object. */
776347921bec fixed slowness of tiff with color profile by loading into srgb.
robcast
parents: 912
diff changeset
316 public void loadSubimage(ImageInput ii, Rectangle region, int prescale)
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
317 throws FileOpException {
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
318 logger.debug("loadSubimage");
819
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
319 this.input = ii;
906
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
320 //ImageReader reader = null;
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
321 try {
906
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
322 reader = getReader(ii);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
323 // set up reader parameters
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
324 ImageReadParam readParam = reader.getDefaultReadParam();
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
325 readParam.setSourceRegion(region);
220
c4ee5f0c3a77 servlet version 1.18b12
robcast
parents: 207
diff changeset
326 if (prescale > 1) {
c4ee5f0c3a77 servlet version 1.18b12
robcast
parents: 207
diff changeset
327 readParam.setSourceSubsampling(prescale, prescale, 0, 0);
c4ee5f0c3a77 servlet version 1.18b12
robcast
parents: 207
diff changeset
328 }
935
776347921bec fixed slowness of tiff with color profile by loading into srgb.
robcast
parents: 912
diff changeset
329 // try to restrict target color space to sRGB
776347921bec fixed slowness of tiff with color profile by loading into srgb.
robcast
parents: 912
diff changeset
330 for (Iterator<ImageTypeSpecifier> i = reader.getImageTypes(0); i.hasNext(); ) {
776347921bec fixed slowness of tiff with color profile by loading into srgb.
robcast
parents: 912
diff changeset
331 ImageTypeSpecifier type = (ImageTypeSpecifier) i.next();
936
172079f9a398 fixed problem with highcolor images by downconversion after load.
robcast
parents: 935
diff changeset
332 ColorModel cm = type.getColorModel();
172079f9a398 fixed problem with highcolor images by downconversion after load.
robcast
parents: 935
diff changeset
333 ColorSpace cs = cm.getColorSpace();
172079f9a398 fixed problem with highcolor images by downconversion after load.
robcast
parents: 935
diff changeset
334 //logger.debug("loadSubimage: possible color model:"+cm+" color space:"+cs);
935
776347921bec fixed slowness of tiff with color profile by loading into srgb.
robcast
parents: 912
diff changeset
335 if (cs.isCS_sRGB()) {
776347921bec fixed slowness of tiff with color profile by loading into srgb.
robcast
parents: 912
diff changeset
336 logger.debug("loadSubimage: substituted sRGB destination type "+type);
776347921bec fixed slowness of tiff with color profile by loading into srgb.
robcast
parents: 912
diff changeset
337 readParam.setDestinationType(type);
936
172079f9a398 fixed problem with highcolor images by downconversion after load.
robcast
parents: 935
diff changeset
338 //break;
935
776347921bec fixed slowness of tiff with color profile by loading into srgb.
robcast
parents: 912
diff changeset
339 }
776347921bec fixed slowness of tiff with color profile by loading into srgb.
robcast
parents: 912
diff changeset
340 }
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
341 // read image
936
172079f9a398 fixed problem with highcolor images by downconversion after load.
robcast
parents: 935
diff changeset
342 logger.debug("loadSubimage: loading..");
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
343 img = reader.read(0, readParam);
936
172079f9a398 fixed problem with highcolor images by downconversion after load.
robcast
parents: 935
diff changeset
344 logger.debug("loadSubimage: loaded");
912
cbfc94584d3b reset imgSize in operations that change size.
robcast
parents: 906
diff changeset
345 // invalidate image size
cbfc94584d3b reset imgSize in operations that change size.
robcast
parents: 906
diff changeset
346 imageSize = null;
936
172079f9a398 fixed problem with highcolor images by downconversion after load.
robcast
parents: 935
diff changeset
347 // downconvert highcolor images
865
ace973a106b5 fixed linux version of image ops.
robcast
parents: 864
diff changeset
348 if (img.getColorModel().getComponentSize(0) > 8) {
936
172079f9a398 fixed problem with highcolor images by downconversion after load.
robcast
parents: 935
diff changeset
349 logger.debug("loadSubimage: converting to 8bit");
172079f9a398 fixed problem with highcolor images by downconversion after load.
robcast
parents: 935
diff changeset
350 int type = BufferedImage.TYPE_INT_RGB;
172079f9a398 fixed problem with highcolor images by downconversion after load.
robcast
parents: 935
diff changeset
351 if (img.getColorModel().hasAlpha()) {
172079f9a398 fixed problem with highcolor images by downconversion after load.
robcast
parents: 935
diff changeset
352 type = BufferedImage.TYPE_INT_ARGB;
172079f9a398 fixed problem with highcolor images by downconversion after load.
robcast
parents: 935
diff changeset
353 }
172079f9a398 fixed problem with highcolor images by downconversion after load.
robcast
parents: 935
diff changeset
354 BufferedImage dest = new BufferedImage(img.getWidth(), img.getHeight(), type);
865
ace973a106b5 fixed linux version of image ops.
robcast
parents: 864
diff changeset
355 dest.createGraphics().drawImage(img, null, 0, 0);
ace973a106b5 fixed linux version of image ops.
robcast
parents: 864
diff changeset
356 img = dest;
936
172079f9a398 fixed problem with highcolor images by downconversion after load.
robcast
parents: 935
diff changeset
357 }
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
358 } catch (IOException e) {
906
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
359 throw new FileOpException("Unable to load File!", e);
819
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
360 } finally {
906
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
361 if (!reuseReader && reader != null) {
819
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
362 reader.dispose();
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
363 }
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
364 }
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
365 }
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
366
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
367 /* write image of type mt to Stream */
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
368 public void writeImage(String mt, OutputStream ostream)
906
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
369 throws ImageOpException, FileOpException {
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
370 logger.debug("writeImage");
353
25095f85ba7c Servlet version 1.5.9c
robcast
parents: 352
diff changeset
371 // setup output
25095f85ba7c Servlet version 1.5.9c
robcast
parents: 352
diff changeset
372 ImageWriter writer = null;
25095f85ba7c Servlet version 1.5.9c
robcast
parents: 352
diff changeset
373 ImageOutputStream imgout = null;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
374 try {
353
25095f85ba7c Servlet version 1.5.9c
robcast
parents: 352
diff changeset
375 imgout = ImageIO.createImageOutputStream(ostream);
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
376 if (mt == "image/jpeg") {
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
377 /*
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
378 * JPEG doesn't do transparency so we have to convert any RGBA
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
379 * image to RGB or we the client will think its CMYK :-( *Java2D BUG*
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
380 */
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
381 if (img.getColorModel().hasAlpha()) {
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
382 logger.debug("BARF: JPEG with transparency!!");
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
383 BufferedImage rgbImg = new BufferedImage(img.getWidth(),
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
384 img.getHeight(), BufferedImage.TYPE_INT_RGB);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
385 rgbImg.createGraphics().drawImage(img, null, 0, 0);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
386 img = rgbImg;
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
387 }
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
388 writer = ImageIO.getImageWritersByFormatName("jpeg").next();
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
389 if (writer == null) {
570
fd2ef7e46119 more cleanup, set version to 1.8.2
robcast
parents: 565
diff changeset
390 throw new ImageOpException("Unable to get JPEG writer");
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
391 }
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
392 ImageWriteParam param = writer.getDefaultWriteParam();
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
393 if (quality > 1) {
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
394 // change JPEG compression quality
353
25095f85ba7c Servlet version 1.5.9c
robcast
parents: 352
diff changeset
395 param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
396 param.setCompressionQuality(0.9f);
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
397 }
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
398 writer.setOutput(imgout);
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
399 // render output
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
400 logger.debug("writing JPEG");
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
401 writer.write(null, new IIOImage(img, null, null), param);
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
402 } else if (mt == "image/png") {
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
403 // render output
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
404 writer = ImageIO.getImageWritersByFormatName("png").next();
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
405 if (writer == null) {
570
fd2ef7e46119 more cleanup, set version to 1.8.2
robcast
parents: 565
diff changeset
406 throw new ImageOpException("Unable to get PNG writer");
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
407 }
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
408 writer.setOutput(imgout);
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
409 logger.debug("writing PNG");
352
5ded9e06cd57 Servlet version 1.5.9b
robcast
parents: 293
diff changeset
410 writer.write(img);
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
411 } else {
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
412 // unknown mime type
570
fd2ef7e46119 more cleanup, set version to 1.8.2
robcast
parents: 565
diff changeset
413 throw new ImageOpException("Unknown mime type: " + mt);
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
414 }
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 122
diff changeset
415
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
416 } catch (IOException e) {
570
fd2ef7e46119 more cleanup, set version to 1.8.2
robcast
parents: 565
diff changeset
417 logger.error("Error writing image:", e);
906
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
418 throw new FileOpException("Error writing image!", e);
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
419 }
801
72662bb585ba remove all ServletOutputStream.flush(). (stupid me ;-)
robcast
parents: 596
diff changeset
420 // TODO: should we: finally { writer.dispose(); }
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
421 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
422
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
423 public void scale(double scaleX, double scaleY) throws ImageOpException {
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
424 logger.debug("scale: " + scaleX);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
425 /* for downscaling in high quality the image is blurred first */
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
426 if ((scaleX <= 0.5) && (quality > 1)) {
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
427 int bl = (int) Math.floor(1 / scaleX);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
428 blur(bl);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
429 }
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
430 /* then scaled */
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
431 AffineTransformOp scaleOp = new AffineTransformOp(
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
432 AffineTransform.getScaleInstance(scaleX, scaleY), renderHint);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
433 img = scaleOp.filter(img, null);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
434 logger.debug("scaled to " + img.getWidth() + "x" + img.getHeight()
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
435 + " img=" + img);
912
cbfc94584d3b reset imgSize in operations that change size.
robcast
parents: 906
diff changeset
436 // invalidate image size
cbfc94584d3b reset imgSize in operations that change size.
robcast
parents: 906
diff changeset
437 imageSize = null;
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
438 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
439
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
440 public void blur(int radius) throws ImageOpException {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 170
diff changeset
441 logger.debug("blur: " + radius);
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
442 // minimum radius is 2
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
443 int klen = Math.max(radius, 2);
590
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
444 Kernel blur = null;
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
445 if (klen < convolutionKernels.length) {
863
1641fab276ee fixing bugs from cleanup...
robcast
parents: 861
diff changeset
446 // use precalculated Kernel
590
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
447 blur = convolutionKernels[klen];
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
448 } else {
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
449 // calculate our own kernel
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
450 int ksize = klen * klen;
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
451 // kernel is constant 1/k
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
452 float f = 1f / ksize;
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
453 float[] kern = new float[ksize];
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
454 for (int i = 0; i < ksize; ++i) {
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
455 kern[i] = f;
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
456 }
69bc69381ac4 more work on stream input and more cleanup
robcast
parents: 589
diff changeset
457 blur = new Kernel(klen, klen, kern);
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
458 }
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
459 // blur with convolve operation
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
460 ConvolveOp blurOp = new ConvolveOp(blur, ConvolveOp.EDGE_NO_OP,
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
461 renderHint);
863
1641fab276ee fixing bugs from cleanup...
robcast
parents: 861
diff changeset
462 BufferedImage dest = null;
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
463 // blur needs explicit destination image type for 3BYTE_BGR *Java2D BUG*
145
d76006c12e89 corrected bugs with Java2D on Linux...
robcast
parents: 144
diff changeset
464 if (img.getType() == BufferedImage.TYPE_3BYTE_BGR) {
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
465 logger.debug("blur: fixing destination image type");
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
466 dest = new BufferedImage(img.getWidth(), img.getHeight(), BufferedImage.TYPE_3BYTE_BGR);
863
1641fab276ee fixing bugs from cleanup...
robcast
parents: 861
diff changeset
467 }
1641fab276ee fixing bugs from cleanup...
robcast
parents: 861
diff changeset
468 img = blurOp.filter(img, dest);
1641fab276ee fixing bugs from cleanup...
robcast
parents: 861
diff changeset
469 logger.debug("blurred: "+img);
144
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
470 }
d87a7e2515af Sevlet version 1.12b5
robcast
parents: 140
diff changeset
471
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
472 public void crop(int x_off, int y_off, int width, int height)
279
2739fd945499 Servlet version 1.22b1
robcast
parents: 256
diff changeset
473 throws ImageOpException {
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
474 // setup Crop
857
456408791331 rendering code cleanup.
robcast
parents: 854
diff changeset
475 img = img.getSubimage(x_off, y_off, width, height);
456408791331 rendering code cleanup.
robcast
parents: 854
diff changeset
476 logger.debug("CROP:" + img.getWidth() + "x"
456408791331 rendering code cleanup.
robcast
parents: 854
diff changeset
477 + img.getHeight());
912
cbfc94584d3b reset imgSize in operations that change size.
robcast
parents: 906
diff changeset
478 // invalidate image size
cbfc94584d3b reset imgSize in operations that change size.
robcast
parents: 906
diff changeset
479 imageSize = null;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
480 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
481
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
482 public void rotate(double angle) throws ImageOpException {
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
483 logger.debug("rotate: " + angle);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
484 // setup rotation
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
485 double rangle = Math.toRadians(angle);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
486 // center of rotation is center of image
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
487 double w = img.getWidth();
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
488 double h = img.getHeight();
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
489 double x = (w / 2);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
490 double y = (h / 2);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
491 AffineTransform trafo = AffineTransform.getRotateInstance(rangle, x, y);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
492 AffineTransformOp rotOp = new AffineTransformOp(trafo, renderHint);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
493 // rotate bounds to see how much of the image would be off screen
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
494 Rectangle2D rotbounds = rotOp.getBounds2D(img);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
495 double xoff = rotbounds.getX();
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
496 double yoff = rotbounds.getY();
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
497 if (Math.abs(xoff) > epsilon || Math.abs(yoff) > epsilon) {
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
498 // move image back on screen
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
499 logger.debug("move rotation: xoff="+xoff+" yoff="+yoff);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
500 trafo.preConcatenate(AffineTransform.getTranslateInstance(-xoff, -yoff));
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
501 rotOp = new AffineTransformOp(trafo, renderHint);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
502 }
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
503 // transform image
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
504 img = rotOp.filter(img, null);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
505 logger.debug("rotated: "+img);
912
cbfc94584d3b reset imgSize in operations that change size.
robcast
parents: 906
diff changeset
506 // invalidate image size
cbfc94584d3b reset imgSize in operations that change size.
robcast
parents: 906
diff changeset
507 imageSize = null;
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
508 }
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
509
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
510 public void mirror(double angle) throws ImageOpException {
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
511 logger.debug("mirror: " + angle);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
512 // setup mirror
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
513 double mx = 1;
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
514 double my = 1;
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
515 double tx = 0;
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
516 double ty = 0;
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
517 if (Math.abs(angle - 0) < epsilon) { // 0 degree
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
518 mx = -1;
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
519 tx = img.getWidth();
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
520 } else if (Math.abs(angle - 90) < epsilon) { // 90 degree
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
521 my = -1;
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
522 ty = img.getHeight();
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
523 } else if (Math.abs(angle - 180) < epsilon) { // 180 degree
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
524 mx = -1;
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
525 tx = img.getWidth();
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
526 } else if (Math.abs(angle - 270) < epsilon) { // 270 degree
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
527 my = -1;
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
528 ty = img.getHeight();
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
529 } else if (Math.abs(angle - 360) < epsilon) { // 360 degree
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
530 mx = -1;
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
531 tx = img.getWidth();
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
532 } else {
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
533 logger.error("invalid mirror angle "+angle);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
534 return;
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
535 }
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
536 AffineTransformOp mirOp = new AffineTransformOp(new AffineTransform(mx,
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
537 0, 0, my, tx, ty), renderHint);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
538 img = mirOp.filter(img, null);
912
cbfc94584d3b reset imgSize in operations that change size.
robcast
parents: 906
diff changeset
539 // invalidate image size
cbfc94584d3b reset imgSize in operations that change size.
robcast
parents: 906
diff changeset
540 imageSize = null;
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
541 }
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
542
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
543 public void enhance(float mult, float add) throws ImageOpException {
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
544 RescaleOp op = null;
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
545 logger.debug("enhance: img=" + img);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
546 if (needsRescaleRgba) {
857
456408791331 rendering code cleanup.
robcast
parents: 854
diff changeset
547 /*
456408791331 rendering code cleanup.
robcast
parents: 854
diff changeset
548 * Only one constant should work regardless of the number of bands
456408791331 rendering code cleanup.
robcast
parents: 854
diff changeset
549 * according to the JDK spec. Doesn't work on JDK 1.4 for OSX and
456408791331 rendering code cleanup.
robcast
parents: 854
diff changeset
550 * Linux (at least).
456408791331 rendering code cleanup.
robcast
parents: 854
diff changeset
551 *
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
552 * The number of constants must match the number of bands in the
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
553 * image.
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
554 */
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
555 int ncol = img.getColorModel().getNumComponents();
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
556 float[] dm = new float[ncol];
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
557 float[] da = new float[ncol];
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
558 for (int i = 0; i < ncol; i++) {
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
559 dm[i] = (float) mult;
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
560 da[i] = (float) add;
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
561 }
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
562 op = new RescaleOp(dm, da, null);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
563 } else {
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
564 op = new RescaleOp(mult, add, renderHint);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
565 }
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
566 op.filter(img, img);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
567 }
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
568
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
569 public void enhanceRGB(float[] rgbm, float[] rgba) throws ImageOpException {
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
570 logger.debug("enhanceRGB: rgbm="+rgbm+" rgba="+rgba);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
571 /*
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
572 * The number of constants must match the number of bands in the image.
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
573 * We do only 3 (RGB) bands.
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
574 */
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
575 int ncol = img.getColorModel().getNumColorComponents();
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
576 if ((ncol != 3) || (rgbm.length != 3) || (rgba.length != 3)) {
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
577 logger.error("enhanceRGB: unknown number of color bands or coefficients ("
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
578 + ncol + ")");
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
579 return;
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
580 }
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
581 if (img.getColorModel().hasAlpha()) {
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
582 // add constant for alpha
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
583 rgbm = new float[] {rgbm[0], rgbm[1], rgbm[2], 1};
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
584 rgba = new float[] {rgba[0], rgba[1], rgba[2], 0};
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
585 }
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
586 RescaleOp scaleOp = new RescaleOp(rgbm, rgba, renderHint);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
587 scaleOp.filter(img, img);
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
588 }
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
589
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
590 /*
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
591 * (non-Javadoc)
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
592 *
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
593 * @see
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
594 * digilib.image.DocuImageImpl#colorOp(digilib.image.DocuImage.ColorOps)
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
595 */
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
596 public void colorOp(ColorOp colop) throws ImageOpException {
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
597 if (colop == ColorOp.GRAYSCALE) {
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
598 /*
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
599 * convert image to grayscale
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
600 */
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
601 logger.debug("Color op: grayscaling");
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
602 ColorModel cm = img.getColorModel();
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
603 if (cm.getNumColorComponents() < 3) {
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
604 // grayscale already
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
605 logger.debug("Color op: not grayscaling");
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
606 return;
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
607 }
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
608 ColorConvertOp op = new ColorConvertOp(
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
609 ColorSpace.getInstance(ColorSpace.CS_GRAY), renderHint);
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
610 // let filter create new image
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
611 img = op.filter(img, null);
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
612 } else if (colop == ColorOp.NTSC_GRAY) {
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
613 /*
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
614 * convert image to grayscale NTSC-style: luminance = 0.2989*red +
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
615 * 0.5870*green + 0.1140*blue
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
616 */
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
617 logger.debug("Color op: NTSC gray");
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
618 logger.debug("img="+img);
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
619 ColorModel cm = img.getColorModel();
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
620 if (cm.getNumColorComponents() < 3 || cm instanceof IndexColorModel) {
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
621 // grayscale already or not possible
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
622 logger.debug("Color op: unable to NTSC gray");
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
623 return;
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
624 }
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
625 float[][] combineFn = new float[1][4];
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
626 combineFn[0] = new float[] { 0.299f, 0.587f, 0.114f, 0f };
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
627 BandCombineOp op = new BandCombineOp(combineFn, renderHint);
863
1641fab276ee fixing bugs from cleanup...
robcast
parents: 861
diff changeset
628 // BandCombineOp only works on Rasters so we create a
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
629 // new image and use its Raster
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
630 BufferedImage dest = new BufferedImage(img.getWidth(),
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
631 img.getHeight(), BufferedImage.TYPE_BYTE_GRAY);
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
632 op.filter(img.getRaster(), dest.getRaster());
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
633 img = dest;
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
634 } else if (colop == ColorOp.INVERT) {
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
635 /*
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
636 * invert colors i.e. invert every channel
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
637 */
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
638 logger.debug("Color op: inverting");
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
639 LookupTable invtbl = null;
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
640 ColorModel cm = img.getColorModel();
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
641 if (cm instanceof IndexColorModel) {
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
642 // invert not possible
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
643 // TODO: should we convert?
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
644 logger.debug("Color op: unable to invert");
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
645 return;
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
646 }
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
647 if (needsInvertRgba && cm.hasAlpha()) {
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
648 // fix for some cases
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
649 invtbl = invertRgbaByteTable;
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
650 } else {
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
651 invtbl = invertSingleByteTable;
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
652 }
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
653 LookupOp op = new LookupOp(invtbl, renderHint);
865
ace973a106b5 fixed linux version of image ops.
robcast
parents: 864
diff changeset
654 logger.debug("colop: image=" + img);
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
655 op.filter(img, img);
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
656 } else if (colop == ColorOp.MAP_GRAY_BGR) {
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
657 /*
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
658 * false color image from grayscale (0: blue, 128: green, 255: red)
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
659 */
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
660 logger.debug("Color op: map_gray_bgr");
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
661 // convert to grayscale
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
662 ColorConvertOp grayOp = new ColorConvertOp(
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
663 ColorSpace.getInstance(ColorSpace.CS_GRAY), renderHint);
864
83e747b2a98f more cleanup of image operations.
robcast
parents: 863
diff changeset
664 // create new 3-channel image
865
ace973a106b5 fixed linux version of image ops.
robcast
parents: 864
diff changeset
665 int destType = BufferedImage.TYPE_INT_RGB;
ace973a106b5 fixed linux version of image ops.
robcast
parents: 864
diff changeset
666 if (needsMapBgr) {
ace973a106b5 fixed linux version of image ops.
robcast
parents: 864
diff changeset
667 // special case for broken Java2Ds
ace973a106b5 fixed linux version of image ops.
robcast
parents: 864
diff changeset
668 destType = BufferedImage.TYPE_3BYTE_BGR;
ace973a106b5 fixed linux version of image ops.
robcast
parents: 864
diff changeset
669 }
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
670 BufferedImage dest = new BufferedImage(img.getWidth(),
865
ace973a106b5 fixed linux version of image ops.
robcast
parents: 864
diff changeset
671 img.getHeight(), destType);
860
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
672 img = grayOp.filter(img, dest);
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
673 logger.debug("map_gray: image=" + img);
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
674 // convert to false color
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
675 LookupOp mapOp = new LookupOp(mapBgrByteTable, renderHint);
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
676 mapOp.filter(img, img);
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
677 logger.debug("mapped image=" + img);
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
678 }
fe58284a8dd9 implemented colop= ntsc_gray and map_gray_bgr.
robcast
parents: 857
diff changeset
679 }
829
a630d0303cce new servlet operation colop=grayscale.
robcast
parents: 827
diff changeset
680
207
1a65d8e43620 Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 181
diff changeset
681 public void dispose() {
906
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
682 if (reader != null) {
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
683 reader.dispose();
28d007673346 really works with streams now.
robcast
parents: 903
diff changeset
684 }
819
a23c4c15a6a8 clean up possible resource leaks. better behaviour with unknown image types.
robcast
parents: 801
diff changeset
685 // is this necessary?
148
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
686 img = null;
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
687 }
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 145
diff changeset
688
533
87cb3dc2aa12 improved pdf generation (not done yet)
robcast
parents: 531
diff changeset
689 public Image getAwtImage(){
496
1760b19df530 Added getImage method to ImageLoaderDocuImage;
cmielack
parents: 469
diff changeset
690 return (Image) img;
1760b19df530 Added getImage method to ImageLoaderDocuImage;
cmielack
parents: 469
diff changeset
691 }
1760b19df530 Added getImage method to ImageLoaderDocuImage;
cmielack
parents: 469
diff changeset
692
1760b19df530 Added getImage method to ImageLoaderDocuImage;
cmielack
parents: 469
diff changeset
693
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
694 }