Mercurial > hg > digilib-old

comparison servlet/src/digilib/image/ImageLoaderDocuImage.java @ 563:686086d6e6d6 digilibPDF

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more refactoring and rearranging more enums pdf and image generation still works
author robcast
date Fri, 17 Dec 2010 20:42:25 +0100
parents 5ff500d6812a
children 4c51d71aef13
comparison
equal deleted inserted replaced
562:baaa5bab5e16 563:686086d6e6d6
121 String[] formats = ImageIO.getReaderFormatNames(); 121 String[] formats = ImageIO.getReaderFormatNames();
122 return Arrays.asList(formats).iterator(); 122 return Arrays.asList(formats).iterator();
123 } 123 }
124 124
125 /** Check image size and type and store in ImageFile f */ 125 /** Check image size and type and store in ImageFile f */
126 public boolean identify(ImageFile imgf) throws IOException { 126 public ImageFile identify(ImageFile imageFile) throws IOException {
127 // try parent method first 127 // try parent method first
128 if (super.identify(imgf)) { 128 ImageFile imf = super.identify(imageFile);
129 return true; 129 if (imf != null) {
130 return imf;
130 } 131 }
131 // fileset to store the information 132 // fileset to store the information
132 ImageFileset imgfs = imgf.getParent(); 133 ImageFileset imgfs = imageFile.getParent();
133 File f = imgf.getFile(); 134 File f = imageFile.getFile();
134 if (f == null) { 135 if (f == null) {
135 throw new IOException("File not found!"); 136 throw new IOException("File not found!");
136 } 137 }
137 logger.debug("identifying (ImageIO) " + f); 138 logger.debug("identifying (ImageIO) " + f);
138 /* 139 /*
150 + readers.next().getClass()); 151 + readers.next().getClass());
151 } 152 }
152 try { 153 try {
153 reader.setInput(istream); 154 reader.setInput(istream);
154 ImageSize d = new ImageSize(reader.getWidth(0), reader.getHeight(0)); 155 ImageSize d = new ImageSize(reader.getWidth(0), reader.getHeight(0));
155 imgf.setSize(d); 156 imageFile.setSize(d);
156 //String t = reader.getFormatName(); 157 //String t = reader.getFormatName();
157 String t = FileOps.mimeForFile(f); 158 String t = FileOps.mimeForFile(f);
158 imgf.setMimetype(t); 159 imageFile.setMimetype(t);
159 //logger.debug(" format:"+t); 160 //logger.debug(" format:"+t);
160 if (imgfs != null) { 161 if (imgfs != null) {
161 imgfs.setAspect(d); 162 imgfs.setAspect(d);
162 } 163 }
163 return true; 164 return imageFile;
164 } finally { 165 } finally {
165 // dispose the reader to free resources 166 // dispose the reader to free resources
166 reader.dispose(); 167 reader.dispose();
167 raf.close(); 168 raf.close();
168 } 169 }