Mercurial > hg > digilib-old

diff servlet/src/digilib/image/ImageLoaderImageInfoDocuInfo.java @ 170:d40922628e4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Servlet Version 1.16b2 with new DigilibParameter code. - more generic class for request parameters - like already done for DiglibConfig - changes in JSPs for new request stuff - changes in ImageSize class so size=0 is "wildcard" - missing dw and dh parameters now treated as wildcards - changed package name in imageinfo class
author robcast
date Wed, 29 Oct 2003 22:47:15 +0100
parents e743b853efca
children afe7ff98bb71
line wrap: on
line diff
--- a/servlet/src/digilib/image/ImageLoaderImageInfoDocuInfo.java	Wed Oct 29 22:45:51 2003 +0100
+++ b/servlet/src/digilib/image/ImageLoaderImageInfoDocuInfo.java	Wed Oct 29 22:47:15 2003 +0100
@@ -20,8 +20,6 @@
  */
 package digilib.image;
 
-import ImageInfo;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
@@ -31,9 +29,12 @@
 import javax.imageio.ImageReader;
 import javax.imageio.stream.ImageInputStream;
 
+import org.marcoschmidt.image.ImageInfo;
+
 import digilib.io.FileOpException;
 import digilib.io.FileOps;
 import digilib.io.ImageFile;
+import digilib.io.ImageFileset;
 
 /**
  * @author casties
@@ -43,6 +44,7 @@
 
 	/* check image size and type and store in ImageFile f */
 	public boolean checkFile(ImageFile imgf) throws IOException {
+		ImageFileset imgfs = imgf.getParent();
 		File f = imgf.getFile();
 		if (f == null) {
 			throw new IOException("File not found!");
@@ -59,6 +61,9 @@
 				new ImageSize(iif.getWidth(), iif.getHeight());
 			imgf.setSize(d);
 			imgf.setMimetype(iif.getMimeType());
+			if (imgfs != null) {
+				imgfs.setAspect(d);
+			}
 			raf.close();
 		} else {
 			// else use ImageReader
@@ -82,6 +87,9 @@
 			String t = reader.getFormatName();
 			t = FileOps.mimeForFile(f);
 			imgf.setMimetype(t);
+			if (imgfs != null) {
+				imgfs.setAspect(d);
+			}
 			// dispose the reader to free resources
 			reader.dispose();
 		}