Mercurial > hg > digilib-old

comparison servlet/src/digilib/servlet/Scaler.java @ 148:837a633a0407

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed bugs when using lots of prescaled images
author robcast
date Fri, 22 Aug 2003 21:12:24 +0200
parents bdd6789d21e0
children 04ad64b2137a
comparison
equal deleted inserted replaced
147:bdd6789d21e0 148:837a633a0407
56 */ 56 */
57 //public class Scaler extends HttpServlet implements SingleThreadModel { 57 //public class Scaler extends HttpServlet implements SingleThreadModel {
58 public class Scaler extends HttpServlet { 58 public class Scaler extends HttpServlet {
59 59
60 // digilib servlet version (for all components) 60 // digilib servlet version (for all components)
61 public static final String dlVersion = "1.12b7"; 61 public static final String dlVersion = "1.13a2";
62 62
63 // Utils instance with debuglevel 63 // Utils instance with debuglevel
64 Utils util; 64 Utils util;
65 // FileOps instance 65 // FileOps instance
66 FileOps fileOp; 66 FileOps fileOp;
445 && imageSendable 445 && imageSendable
446 && (fileToLoad.getSize().width <= expectedSourceSize.width) 446 && (fileToLoad.getSize().width <= expectedSourceSize.width)
447 && (fileToLoad.getSize().height <= expectedSourceSize.height)) 447 && (fileToLoad.getSize().height <= expectedSourceSize.height))
448 || (autoRes 448 || (autoRes
449 && ((fileToLoad.getSize().width == expectedSourceSize.width) 449 && ((fileToLoad.getSize().width == expectedSourceSize.width)
450 || (fileToLoad.getSize().height <= expectedSourceSize.height))) 450 && (fileToLoad.getSize().height <= expectedSourceSize.height)))
451 || (autoRes 451 || (autoRes
452 && ((fileToLoad.getSize().width <= expectedSourceSize.width) 452 && ((fileToLoad.getSize().width <= expectedSourceSize.width)
453 || (fileToLoad.getSize().height == expectedSourceSize.height))) 453 && (fileToLoad.getSize().height == expectedSourceSize.height)))
454 || (!autoRes && !scaleToFit && !cropToFit && !absoluteScale)) { 454 || (!autoRes && !scaleToFit && !cropToFit && !absoluteScale)) {
455 455
456 util.dprintln(1, "Sending File as is."); 456 util.dprintln(1, "Sending File as is.");
457 457
458 servletOp.sendFile(fileToLoad.getFile(), response); 458 servletOp.sendFile(fileToLoad.getFile(), response);