# HG changeset patch
# User robcast
# Date 1098642229 -7200
# Node ID 126684ac4a376e3ac6f0dc809b01c218592b7cfc
# Parent  1e7cb24f2406414f655c4ec260033a0c54617c06
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 1e7cb24f2406 -r 126684ac4a37 servlet/src/digilib/image/ImageLoaderDocuImage.java
--- a/servlet/src/digilib/image/ImageLoaderDocuImage.java	Sun Oct 24 20:23:49 2004 +0200
+++ b/servlet/src/digilib/image/ImageLoaderDocuImage.java	Sun Oct 24 20:23:49 2004 +0200
@@ -134,7 +134,7 @@
 			// clean up old reader
 			dispose();
 		}
-		System.gc();
+		//System.gc();
 		RandomAccessFile rf = new RandomAccessFile(f.getFile(), "r");
 		ImageInputStream istream = new FileImageInputStream(rf);
 		//Iterator readers = ImageIO.getImageReaders(istream);
@@ -160,7 +160,7 @@
 	public void loadSubimage(ImageFile f, Rectangle region, int prescale)
 			throws FileOpException {
 		logger.debug("loadSubimage");
-		System.gc();
+		//System.gc();
 		try {
 			if ((reader == null) || (imgFile != f.getFile())) {
 				getReader(f);
diff -r 1e7cb24f2406 -r 126684ac4a37 servlet/src/digilib/image/ImageSize.java
--- a/servlet/src/digilib/image/ImageSize.java	Sun Oct 24 20:23:49 2004 +0200
+++ b/servlet/src/digilib/image/ImageSize.java	Sun Oct 24 20:23:49 2004 +0200
@@ -206,8 +206,8 @@
 	 * 
 	 * @return
 	 */
-	public double getAspect() {
-		return (height > 0) ? ((double) width / (double) height) : 0;
+	public float getAspect() {
+		return (height > 0) ? ((float) width / (float) height) : 0;
 	}
 	
 	/* (non-Javadoc)
@@ -215,7 +215,6 @@
 	 */
 	public String toString() {
 		String s = "[" + width + "x" + height + "]";
-		// TODO Auto-generated method stub
 		return s;
 	}
 }