Mercurial > hg > digilib-old
diff servlet/src/digilib/servlet/Scaler.java @ 148:837a633a0407
fixed bugs when using lots of prescaled images
| author | robcast |
|---|---|
| date | Fri, 22 Aug 2003 21:12:24 +0200 |
| parents | bdd6789d21e0 |
| children | 04ad64b2137a |
line wrap: on
line diff
--- a/servlet/src/digilib/servlet/Scaler.java Fri Aug 22 15:02:21 2003 +0200 +++ b/servlet/src/digilib/servlet/Scaler.java Fri Aug 22 21:12:24 2003 +0200 @@ -58,7 +58,7 @@ public class Scaler extends HttpServlet { // digilib servlet version (for all components) - public static final String dlVersion = "1.12b7"; + public static final String dlVersion = "1.13a2"; // Utils instance with debuglevel Utils util; @@ -447,10 +447,10 @@ && (fileToLoad.getSize().height <= expectedSourceSize.height)) || (autoRes && ((fileToLoad.getSize().width == expectedSourceSize.width) - || (fileToLoad.getSize().height <= expectedSourceSize.height))) + && (fileToLoad.getSize().height <= expectedSourceSize.height))) || (autoRes && ((fileToLoad.getSize().width <= expectedSourceSize.width) - || (fileToLoad.getSize().height == expectedSourceSize.height))) + && (fileToLoad.getSize().height == expectedSourceSize.height))) || (!autoRes && !scaleToFit && !cropToFit && !absoluteScale)) { util.dprintln(1, "Sending File as is.");