Mercurial > hg > digilib-old
changeset 863:1641fab276ee stream
fixing bugs from cleanup...
author | robcast |
---|---|
date | Wed, 09 Mar 2011 11:03:29 +0100 |
parents | 74062b7d9b22 |
children | 83e747b2a98f |
files | servlet/src/digilib/image/ImageLoaderDocuImage.java servlet/src/digilib/servlet/Scaler.java |
diffstat | 2 files changed, 15 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/servlet/src/digilib/image/ImageLoaderDocuImage.java Tue Mar 08 22:58:53 2011 +0100 +++ b/servlet/src/digilib/image/ImageLoaderDocuImage.java Wed Mar 09 11:03:29 2011 +0100 @@ -36,6 +36,7 @@ import java.awt.image.LookupOp; import java.awt.image.LookupTable; import java.awt.image.RescaleOp; +import java.awt.image.WritableRaster; import java.io.IOException; import java.io.OutputStream; import java.io.RandomAccessFile; @@ -397,7 +398,7 @@ logger.debug("scaling..."); img = scaleOp.filter(img, null); logger.debug("SCALE: " + scale + " ->" + img.getWidth() + "x" - + img.getHeight() + " type=" + img.getType()); + + img.getHeight() + " type=" + img); } public void blur(int radius) throws ImageOpException { @@ -406,6 +407,7 @@ int klen = Math.max(radius, 2); Kernel blur = null; if (klen < convolutionKernels.length) { + // use precalculated Kernel blur = convolutionKernels[klen]; } else { // calculate our own kernel @@ -421,13 +423,15 @@ // blur with convolve operation ConvolveOp blurOp = new ConvolveOp(blur, ConvolveOp.EDGE_NO_OP, renderHint); - /* blur needs explicit destination image type for color *Java2D BUG* + /* blur needs explicit destination image type for color *Java2D BUG* */ + BufferedImage dest = null; if (img.getType() == BufferedImage.TYPE_3BYTE_BGR) { - logger.debug("blur: fixing destination image type"); - blurredImg = new BufferedImage(img.getWidth(), img.getHeight(), img + logger.debug("blur: fixing destination image type for "+img); + dest = new BufferedImage(img.getWidth(), img.getHeight(), img .getType()); - } */ - img = blurOp.filter(img, null); + } + img = blurOp.filter(img, dest); + logger.debug("blurred: "+img); } public void crop(int x_off, int y_off, int width, int height) @@ -471,7 +475,7 @@ */ int ncol = img.getColorModel().getNumColorComponents(); if ((ncol != 3) || (rgbm.length != 3) || (rgba.length != 3)) { - logger.debug("ERROR(enhance): unknown number of color bands or coefficients (" + logger.error("enhanceRGB: unknown number of color bands or coefficients (" + ncol + ")"); return; } @@ -557,7 +561,7 @@ float[][] combineFn = new float[1][4]; combineFn[0] = rgbOrdered(new float[] { 0.299f, 0.114f, 0.587f, 0f }); BandCombineOp op = new BandCombineOp(combineFn, renderHint); - // unfortunately BandCombineOp only works on Rasters so we create a + // BandCombineOp only works on Rasters so we create a // new image and use its Raster BufferedImage dest = new BufferedImage(img.getWidth(), img.getHeight(), BufferedImage.TYPE_BYTE_GRAY); @@ -568,7 +572,6 @@ * invert colors i.e. invert every channel */ logger.debug("Color op: inverting"); - // TODO: is this enough for all image types? LookupTable invtbl = null; ColorModel cm = img.getColorModel(); if (needsInvertRgba && cm.hasAlpha()) { @@ -624,7 +627,7 @@ trafo.preConcatenate(AffineTransform.getTranslateInstance(-xoff, -yoff)); // transform image rotOp = new AffineTransformOp(trafo, renderHint); - rotOp.filter(img, img); + img = rotOp.filter(img, null); // calculate new bounding box // Rectangle2D bounds = rotOp.getBounds2D(img); // crop new image (with self-made rounding) @@ -659,7 +662,7 @@ } AffineTransformOp mirOp = new AffineTransformOp(new AffineTransform(mx, 0, 0, my, tx, ty), renderHint); - mirOp.filter(img, img); + img = mirOp.filter(img, null); } public void dispose() {
--- a/servlet/src/digilib/servlet/Scaler.java Tue Mar 08 22:58:53 2011 +0100 +++ b/servlet/src/digilib/servlet/Scaler.java Wed Mar 09 11:03:29 2011 +0100 @@ -31,7 +31,7 @@ private static final long serialVersionUID = 5289386646192471549L; /** digilib servlet version (for all components) */ - public static final String version = "1.9.1a21"; + public static final String version = "1.9.1a22"; /** servlet error codes */ public static enum Error {UNKNOWN, AUTH, FILE, IMAGE};