digilib-old: common/src/main/java/digilib/image/ImageLoaderDocuImage.java annotate

annotate common/src/main/java/digilib/image/ImageLoaderDocuImage.java @ 1068:c1df386f2464

JDK 1.6 on OSX 10.5 needs rescaleRgba too.

author	robcast
date	Fri, 13 Apr 2012 18:16:59 +0200
parents	81c2378f12ff
children	ec1c3de5c70b

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

Mercurial > hg > digilib-old

annotate common/src/main/java/digilib/image/ImageLoaderDocuImage.java @ 1068:c1df386f2464