# HG changeset patch
# User robcast
# Date 1098642229 -7200
# Node ID 1e7cb24f2406414f655c4ec260033a0c54617c06
# Parent  ffafe3e470fbfa951cbd9d0321057bc6483a6e03
Servlet version 1.5.0b -- the beginning of the next generation :-)
- code restructuring to improve scaleability
- new Initialiser servlet that must be run first
- image transformation work moved to DigilibImageWorker class
- Maximum number of concurrent threads limited by Semaphore
- old JIMI toolkit implementation removed

diff -r ffafe3e470fb -r 1e7cb24f2406 servlet/src/digilib/image/JIMIDocuImage.java
--- a/servlet/src/digilib/image/JIMIDocuImage.java	Mon Oct 18 15:31:28 2004 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-/* JAIDocuImage -- Image class implementation using JIMI toolkit
-
-  Digital Image Library servlet components
-
-  Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
-
-  This program is free software; you can redistribute  it and/or modify it
-  under  the terms of  the GNU General  Public License as published by the
-  Free Software Foundation;  either version 2 of the  License, or (at your
-  option) any later version.
-   
-  Please read license.txt for the full details. A copy of the GPL
-  may be found at http://www.gnu.org/copyleft/lgpl.html
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-package digilib.image;
-
-import java.awt.image.FilteredImageSource;
-import java.awt.image.ImageFilter;
-import java.awt.image.ImageProducer;
-import java.io.OutputStream;
-
-import com.sun.jimi.core.Jimi;
-import com.sun.jimi.core.JimiException;
-import com.sun.jimi.core.filters.AreaAverageScaleFilter;
-import com.sun.jimi.core.filters.ReplicatingScaleFilter;
-import com.sun.jimi.core.raster.JimiRasterImage;
-
-import digilib.io.ImageFile;
-import digilib.io.FileOpException;
-
-/** Implementation of DocuImage using the JIMI image Library. */
-public class JIMIDocuImage extends DocuImageImpl {
-
-	private JimiRasterImage img;
-	private ImageProducer imgp;
-	private int imgWidth = 0;
-	private int imgHeight = 0;
-
-	/**
-	 *  load image file
-	 */
-	public void loadImage(ImageFile f) throws FileOpException {
-		System.gc();
-		try {
-			img = Jimi.getRasterImage(f.getFile().toURL());
-		} catch (java.net.MalformedURLException e) {
-			logger.debug("ERROR(loadImage): MalformedURLException");
-		} catch (JimiException e) {
-			logger.debug("ERROR(loadImage): JIMIException");
-			throw new FileOpException("Unable to load File!" + e);
-		}
-		if (img == null) {
-			logger.debug("ERROR(loadImage): unable to load file");
-			throw new FileOpException("Unable to load File!");
-		}
-		imgp = img.getImageProducer();
-		imgWidth = img.getWidth();
-		imgHeight = img.getHeight();
-	}
-
-	/**
-	 *  write image of type mt to Stream
-	 */
-	public void writeImage(String mt, OutputStream ostream)
-		throws FileOpException {
-		try {
-			// render output
-			Jimi.putImage(mt, imgp, ostream);
-
-		} catch (JimiException e) {
-			throw new FileOpException("Error writing image!" + e);
-		}
-	}
-
-	public int getWidth() {
-		return imgWidth;
-	}
-
-	public int getHeight() {
-		return imgHeight;
-	}
-
-	public void scale(double scale, double scaleY) throws ImageOpException {
-
-		ImageFilter scaleFilter;
-		int destWidth = (int) (scale * (float) imgWidth);
-		int destHeight = (int) (scale * (float) imgHeight);
-
-		// setup scale and interpolation quality
-		if (quality > 0) {
-			logger.debug("quality q1");
-			scaleFilter = new AreaAverageScaleFilter(destWidth, destHeight);
-		} else {
-			logger.debug("quality q0");
-			scaleFilter = new ReplicatingScaleFilter(destWidth, destHeight);
-		}
-
-		ImageProducer scaledImg = new FilteredImageSource(imgp, scaleFilter);
-
-		if (scaledImg == null) {
-			throw new ImageOpException("Unable to scale");
-		}
-
-		imgp = scaledImg;
-		imgWidth = destWidth;
-		imgHeight = destHeight;
-	}
-
-	public void crop(int x_off, int y_off, int width, int height)
-		throws ImageOpException {
-		// setup Crop
-		ImageProducer croppedImg =
-			img.getCroppedImageProducer(x_off, y_off, width, height);
-
-		if (croppedImg == null) {
-			throw new ImageOpException("Unable to crop");
-		}
-		imgp = croppedImg;
-		imgWidth = width;
-		imgHeight = height;
-	}
-
-	/* (non-Javadoc)
-	 * @see digilib.image.DocuImage#dispose()
-	 */
-	public void dispose() {
-		img = null;
-		imgp = null;
-	}
-
-}