annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
1 /* Scaler -- Scaler servlet main class
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
2
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
3 Digital Image Library servlet components
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
4
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
5 Copyright (C) 2001, 2002, 2003 Robert Casties (robcast@mail.berlios.de)
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
6
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
7 This program is free software; you can redistribute it and/or modify it
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
9 Free Software Foundation; either version 2 of the License, or (at your
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
10 option) any later version.
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
11
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
12 Please read license.txt for the full details. A copy of the GPL
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
13 may be found at http://www.gnu.org/copyleft/lgpl.html
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
14
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
15 You should have received a copy of the GNU General Public License
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
16 along with this program; if not, write to the Free Software
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
18
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
19 */
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
20
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
21 package digilib.servlet;
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
22
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
23 import java.awt.Dimension;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
24 import java.awt.geom.AffineTransform;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
25 import java.awt.geom.NoninvertibleTransformException;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
26 import java.awt.geom.Rectangle2D;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
27 import java.io.File;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
28 import java.io.IOException;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
29 import java.util.List;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
30
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
31 import javax.servlet.ServletConfig;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
32 import javax.servlet.ServletContext;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
33 import javax.servlet.ServletException;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
34 import javax.servlet.http.HttpServlet;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
35 import javax.servlet.http.HttpServletRequest;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
36 import javax.servlet.http.HttpServletResponse;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
37
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
38 import digilib.Utils;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
39 import digilib.auth.AuthOpException;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
40 import digilib.auth.AuthOps;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
41 import digilib.image.DocuImage;
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
42 import digilib.image.DocuInfo;
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
43 import digilib.image.ImageLoaderDocuInfo;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
44 import digilib.image.ImageOpException;
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
45 import digilib.io.DocuDirCache;
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
46 import digilib.io.DocuFile;
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
47 import digilib.io.DocuFileset;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
48 import digilib.io.FileOpException;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
49 import digilib.io.FileOps;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
50
64
5ea1999befd4 New JAI ImageLoader plugin. Currently uses first beta version of the plugin.
robcast
parents: 62
diff changeset
51 //import tilecachetool.*;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
52
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
53 /**
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
54 * @author casties
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
55 *
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
56 */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
57 //public class Scaler extends HttpServlet implements SingleThreadModel {
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
58 public class Scaler extends HttpServlet {
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
59
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
60 // digilib servlet version (for all components)
148
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 147
diff changeset
61 public static final String dlVersion = "1.13a2";
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
62
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
63 // Utils instance with debuglevel
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
64 Utils util;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
65 // FileOps instance
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
66 FileOps fileOp;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
67 // AuthOps instance
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
68 AuthOps authOp;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
69 // ServletOps instance
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
70 ServletOps servletOp;
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
71 // DocuDirCache instance
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
72 DocuDirCache dirCache;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
73
94
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
74 // DigilibConfiguration instance
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
75 DigilibConfiguration dlConfig;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
76
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
77 // use authorization database
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
78 boolean useAuthentication = true;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
79
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
80 // EXPRIMENTAL
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
81 // try to enlarge cropping area for "oblique" angles
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
82 boolean wholeRotArea = false;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
83
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
84 /** Initialisation on first run.
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
85 *
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
86 * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
87 */
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
88 public void init(ServletConfig config) throws ServletException {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
89 super.init(config);
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
90
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
91 // Debuggin!
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
92 //TCTool tctool = new TCTool();
147
bdd6789d21e0 Fix for sending images that need no scaling.
robcast
parents: 145
diff changeset
93 System.out.println(
bdd6789d21e0 Fix for sending images that need no scaling.
robcast
parents: 145
diff changeset
94 "***** Digital Image Library Servlet (version "
bdd6789d21e0 Fix for sending images that need no scaling.
robcast
parents: 145
diff changeset
95 + dlVersion
bdd6789d21e0 Fix for sending images that need no scaling.
robcast
parents: 145
diff changeset
96 + ") *****");
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
97
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
98 // get our ServletContext
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
99 ServletContext context = config.getServletContext();
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
100 // see if there is a Configuration instance
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
101 dlConfig =
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
102 (DigilibConfiguration) context.getAttribute(
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
103 "digilib.servlet.configuration");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
104 if (dlConfig == null) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
105 // create new Configuration
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
106 try {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
107 dlConfig = new DigilibConfiguration(config);
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
108 context.setAttribute("digilib.servlet.configuration", dlConfig);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
109 } catch (Exception e) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
110 throw new ServletException(e);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
111 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
112 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
113 // set the servlet version
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
114 dlConfig.setServletVersion(dlVersion);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
115 // first we need an Utils
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
116 util = dlConfig.getUtil();
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
117 // set our AuthOps
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
118 useAuthentication = dlConfig.isUseAuthentication();
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
119 authOp = dlConfig.getAuthOp();
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
120 // FileOps instance
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
121 fileOp = new FileOps(util);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
122 // AuthOps instance
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
123 servletOp = new ServletOps(util);
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
124 // DocuDirCache instance
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
125 dirCache = dlConfig.getDirCache();
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
126 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
127
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
128 /** Process the HTTP Get request*/
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
129 public void doGet(HttpServletRequest request, HttpServletResponse response)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
130 throws ServletException, IOException {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
131 util.dprintln(1, "The servlet has received a GET!");
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
132 // create new request with defaults
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
133 DigilibRequest dlReq = new DigilibRequest();
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
134 // set with request parameters
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
135 dlReq.setWithRequest(request);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
136 // add DigilibRequest to ServletRequest
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
137 request.setAttribute("digilib.servlet.request", dlReq);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
138 // do the processing
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
139 processRequest(request, response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
140 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
141
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
142 /**Process the HTTP Post request*/
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
143 public void doPost(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
144 HttpServletRequest request,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
145 HttpServletResponse response)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
146 throws ServletException, IOException {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
147 util.dprintln(1, "The servlet has received a POST!");
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
148 // create new request with defaults
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
149 DigilibRequest dlReq = new DigilibRequest();
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
150 // set with request parameters
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
151 dlReq.setWithRequest(request);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
152 // add DigilibRequest to ServletRequest
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
153 request.setAttribute("digilib.servlet.request", dlReq);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
154 // do the processing
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
155 processRequest(request, response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
156 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
157
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
158 /** main request handler. */
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
159 void processRequest(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
160 HttpServletRequest request,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
161 HttpServletResponse response)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
162 throws ServletException, IOException {
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
163
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
164 // time for benchmarking
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
165 long startTime = System.currentTimeMillis();
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
166 // output mime/type
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
167 String mimeType = "image/png";
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
168
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
169 /*
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
170 * parameters for a session
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
171 */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
172
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
173 // scale the image file to fit window size i.e. respect dw,dh
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
174 boolean scaleToFit = true;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
175 // scale the image by a fixed factor only
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
176 boolean absoluteScale = false;
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
177 // only crop the image to fit
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
178 boolean cropToFit = false;
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
179 // try different resolution images automatically
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
180 boolean autoRes = true;
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
181 // use hires images (if autoRes == false)
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
182 boolean hiresOnly = false;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
183 // interpolation to use for scaling
142
f52a7664a807 Servlet version 1.12b3
robcast
parents: 140
diff changeset
184 int scaleQual = 1;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
185 // send html error message (or image file)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
186 boolean errorMsgHtml = false;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
187 // mirror the image
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
188 boolean doMirror = false;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
189 // angle of mirror axis
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
190 double mirrorAngle = 0;
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
191 // original (hires) image resolution
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
192 double origResX = 0;
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
193 double origResY = 0;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
194
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
195 /*
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
196 * request parameters
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
197 */
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
198
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
199 DigilibRequest dlRequest =
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
200 (DigilibRequest) request.getAttribute("digilib.servlet.request");
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
201
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
202 // destination image width
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
203 int paramDW = dlRequest.getDw();
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
204 // destination image height
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
205 int paramDH = dlRequest.getDh();
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
206 // dw and dh shouldn't be empty, if they are, set dw=dh
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
207 if (paramDW <= 0) {
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
208 paramDW = paramDH;
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
209 }
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
210 if (paramDH <= 0) {
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
211 paramDH = paramDW;
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
212 }
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
213 // relative area x_offset (0..1)
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
214 double paramWX = dlRequest.getWx();
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
215 // relative area y_offset
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
216 double paramWY = dlRequest.getWy();
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
217 // relative area width (0..1)
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
218 double paramWW = dlRequest.getWw();
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
219 // relative area height
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
220 double paramWH = dlRequest.getWh();
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
221 // scale factor (additional to dw/width, dh/height)
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
222 double paramWS = dlRequest.getWs();
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
223 // rotation angle
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
224 double paramROT = dlRequest.getRot();
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
225 // contrast enhancement
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
226 float paramCONT = dlRequest.getCont();
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
227 // brightness enhancement
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
228 float paramBRGT = dlRequest.getBrgt();
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
229 // color modification
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
230 float[] paramRGBM = dlRequest.getRgbm();
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
231 float[] paramRGBA = dlRequest.getRgba();
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
232 // destination resolution (DPI)
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
233 float paramDDPIX = dlRequest.getDdpix();
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
234 float paramDDPIY = dlRequest.getDdpiy();
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
235 if ((paramDDPIX == 0) || (paramDDPIY == 0)) {
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
236 // if X or Y resolution isn't set, use DDPI
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
237 paramDDPIX = dlRequest.getDdpi();
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
238 paramDDPIY = dlRequest.getDdpi();
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
239 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
240
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
241 /* operation mode: "fit": always fit to page,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
242 * "clip": send original resolution cropped, "file": send whole file (if
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
243 * allowed)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
244 */
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
245 if (dlRequest.isOption("clip")) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
246 scaleToFit = false;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
247 absoluteScale = false;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
248 cropToFit = true;
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
249 autoRes = true;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
250 } else if (dlRequest.isOption("fit")) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
251 scaleToFit = true;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
252 absoluteScale = false;
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
253 cropToFit = false;
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
254 autoRes = true;
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
255 } else if (dlRequest.isOption("osize")) {
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
256 scaleToFit = false;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
257 absoluteScale = true;
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
258 cropToFit = false;
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
259 autoRes = false;
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
260 hiresOnly = true;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
261 } else if (dlRequest.isOption("file")) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
262 scaleToFit = false;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
263 absoluteScale = false;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
264 if (dlConfig.isSendFileAllowed()) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
265 cropToFit = false;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
266 } else {
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
267 // crop to fit if send file not allowed
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
268 cropToFit = true;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
269 }
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
270 autoRes = false;
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
271 hiresOnly = true;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
272 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
273 // operation mode: "errtxt": error message in html, "errimg": error image
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
274 if (dlRequest.isOption("errtxt")) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
275 errorMsgHtml = true;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
276 } else if (dlRequest.isOption("errimg")) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
277 errorMsgHtml = false;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
278 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
279 // operation mode: "q0" - "q2": interpolation quality
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
280 if (dlRequest.isOption("q0")) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
281 scaleQual = 0;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
282 } else if (dlRequest.isOption("q1")) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
283 scaleQual = 1;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
284 } else if (dlRequest.isOption("q2")) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
285 scaleQual = 2;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
286 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
287 // operation mode: "lores": try to use scaled image, "hires": use unscaled image
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
288 // "autores": try best fitting resolution
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
289 if (dlRequest.isOption("lores")) {
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
290 autoRes = false;
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
291 hiresOnly = false;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
292 } else if (dlRequest.isOption("hires")) {
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
293 autoRes = false;
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
294 hiresOnly = true;
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
295 } else if (dlRequest.isOption("autores")) {
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
296 autoRes = true;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
297 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
298
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
299 //"big" try for all file/image actions
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
300 try {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
301
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
302 // new DocuImage instance
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
303 DocuImage docuImage = dlConfig.getDocuImageInstance();
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
304 if (docuImage == null) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
305 throw new ImageOpException("Unable to load DocuImage class!");
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
306 }
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
307
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
308 // new DocuInfo instance
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
309 DocuInfo docuInfo = new ImageLoaderDocuInfo();
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
310
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
311 // set interpolation quality
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
312 docuImage.setQuality(scaleQual);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
313
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
314 /*
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
315 * find the file to load/send
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
316 */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
317
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
318 // get PathInfo
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
319 String loadPathName = dlRequest.getFilePath();
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
320
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
321 /*
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
322 * check permissions
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
323 */
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
324 if (useAuthentication) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
325 // get a list of required roles (empty if no restrictions)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
326 List rolesRequired = authOp.rolesForPath(loadPathName, request);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
327 if (rolesRequired != null) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
328 util.dprintln(1, "Role required: " + rolesRequired);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
329 util.dprintln(2, "User: " + request.getRemoteUser());
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
330 // is the current request/user authorized?
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
331 if (!authOp.isRoleAuthorized(rolesRequired, request)) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
332 // send deny answer and abort
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
333 util.dprintln(1, "ERROR: access denied!");
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
334 if (errorMsgHtml) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
335 ServletOps.htmlMessage(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
336 "ERROR: Unauthorized access!",
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
337 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
338 } else {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
339 servletOp.sendFile(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
340 new File(dlConfig.getDenyImgFileName()),
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
341 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
342 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
343 return;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
344 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
345 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
346 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
347
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
348 // find the file(set)
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
349 DocuFile fileToLoad;
94
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
350 DocuFileset fileset =
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
351 dirCache.getFileset(loadPathName, dlRequest.getPn());
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
352 if (fileset == null) {
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
353 throw new FileOpException(
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
354 "File "
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
355 + loadPathName
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
356 + "("
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
357 + dlRequest.getPn()
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
358 + ") not found.");
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
359 }
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
360
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
361 /*
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
362 * calculate expected source image size
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
363 *
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
364 */
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
365 Dimension expectedSourceSize = new Dimension();
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
366 if (scaleToFit) {
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
367 double scale = (1 / Math.min(paramWW, paramWH)) * paramWS;
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
368 expectedSourceSize.setSize(paramDW * scale, paramDH * scale);
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
369 } else {
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
370 expectedSourceSize.setSize(
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
371 paramDW * paramWS,
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
372 paramDH * paramWS);
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
373 }
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
374
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
375 /*
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
376 * select a resolution
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
377 */
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
378 if (autoRes) {
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
379 // autores: use next higher resolution
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
380 fileToLoad =
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
381 fileset.getNextBigger(expectedSourceSize, docuInfo);
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
382 if (fileToLoad == null) {
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
383 // this is the highest we have
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
384 fileToLoad = fileset.get(0);
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
385 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
386 } else {
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
387 // enforced hires or lores
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
388 if (hiresOnly) {
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
389 // get first element
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
390 fileToLoad = fileset.get(0);
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
391 } else {
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
392 // enforced lores uses next smaller resolution
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
393 fileToLoad =
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
394 fileset.getNextSmaller(expectedSourceSize, docuInfo);
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
395 if (fileToLoad == null) {
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
396 // this is the smallest we have
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
397 fileToLoad = fileset.get(fileset.size() - 1);
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
398 }
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
399 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
400 }
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
401 util.dprintln(1, "Loading: " + fileToLoad.getFile());
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
402
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
403 if (absoluteScale) {
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
404 // get original resolution from metadata
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
405 fileset.checkMeta();
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
406 origResX = fileset.getResX();
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
407 origResY = fileset.getResY();
139
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
408 if ((origResX == 0) || (origResY == 0)) {
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
409 throw new ImageOpException("Missing image DPI information!");
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
410 }
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
411
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
412 if ((paramDDPIX == 0) || (paramDDPIY == 0)) {
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
413 throw new ImageOpException("Missing display DPI information!");
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
414 }
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
415 }
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
416
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
417 // check the source image
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
418 if (!fileToLoad.isChecked()) {
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
419 fileToLoad.check(docuInfo);
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
420 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
421 // get the source image type
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
422 mimeType = fileToLoad.getMimetype();
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
423 // decide if the image can be sent as is
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
424 boolean mimetypeSendable =
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
425 mimeType.equals("image/jpeg")
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
426 || mimeType.equals("image/png")
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
427 || mimeType.equals("image/gif");
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
428 boolean imagoOptions =
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
429 dlRequest.isOption("hmir")
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
430 || dlRequest.isOption("vmir")
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
431 || (paramROT != 0)
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
432 || (paramRGBM != null)
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
433 || (paramRGBA != null)
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
434 || (paramCONT != 0)
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
435 || (paramBRGT != 0);
139
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
436 boolean imageSendable = mimetypeSendable && !imagoOptions;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
437
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
438 /* if not autoRes and image smaller than requested
147
bdd6789d21e0 Fix for sending images that need no scaling.
robcast
parents: 145
diff changeset
439 * size then send as is.
bdd6789d21e0 Fix for sending images that need no scaling.
robcast
parents: 145
diff changeset
440 * if autoRes and image has requested size then send as is.
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
441 * if not autoScale and not scaleToFit nor cropToFit
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
442 * then send as is (mo=file)
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
443 */
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
444 if ((!autoRes
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
445 && imageSendable
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
446 && (fileToLoad.getSize().width <= expectedSourceSize.width)
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
447 && (fileToLoad.getSize().height <= expectedSourceSize.height))
147
bdd6789d21e0 Fix for sending images that need no scaling.
robcast
parents: 145
diff changeset
448 || (autoRes
bdd6789d21e0 Fix for sending images that need no scaling.
robcast
parents: 145
diff changeset
449 && ((fileToLoad.getSize().width == expectedSourceSize.width)
148
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 147
diff changeset
450 && (fileToLoad.getSize().height <= expectedSourceSize.height)))
147
bdd6789d21e0 Fix for sending images that need no scaling.
robcast
parents: 145
diff changeset
451 || (autoRes
bdd6789d21e0 Fix for sending images that need no scaling.
robcast
parents: 145
diff changeset
452 && ((fileToLoad.getSize().width <= expectedSourceSize.width)
148
837a633a0407 fixed bugs when using lots of prescaled images
robcast
parents: 147
diff changeset
453 && (fileToLoad.getSize().height == expectedSourceSize.height)))
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
454 || (!autoRes && !scaleToFit && !cropToFit && !absoluteScale)) {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
455
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
456 util.dprintln(1, "Sending File as is.");
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
457
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
458 servletOp.sendFile(fileToLoad.getFile(), response);
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
459
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
460 util.dprintln(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
461 1,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
462 "Done in "
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
463 + (System.currentTimeMillis() - startTime)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
464 + "ms");
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
465 return;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
466 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
467
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
468 /*
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
469 * crop and scale the image
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
470 */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
471
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
472 int imgWidth = 0;
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
473 int imgHeight = 0;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
474 // get image size
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
475 if (fileToLoad.getSize() == null) {
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
476 // size unknown so far
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
477 imgWidth = docuImage.getWidth();
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
478 imgHeight = docuImage.getHeight();
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
479 // remember size
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
480 fileToLoad.setSize(new Dimension(imgWidth, imgHeight));
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
481 } else {
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
482 imgWidth = fileToLoad.getSize().width;
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
483 imgHeight = fileToLoad.getSize().height;
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
484 }
94
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
485
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
486 util.dprintln(2, "IMG: " + imgWidth + "x" + imgHeight);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
487 util.dprintln(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
488 2,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
489 "time " + (System.currentTimeMillis() - startTime) + "ms");
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
490
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
491 // coordinates and scaling
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
492 double areaXoff;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
493 double areaYoff;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
494 double areaWidth;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
495 double areaHeight;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
496 double scaleX;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
497 double scaleY;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
498 double scaleXY;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
499
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
500 // coordinates using Java2D
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
501 // image size in pixels
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
502 Rectangle2D imgBounds =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
503 new Rectangle2D.Double(0, 0, imgWidth, imgHeight);
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
504 // user window area in [0,1] coordinates
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
505 Rectangle2D relUserArea =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
506 new Rectangle2D.Double(paramWX, paramWY, paramWW, paramWH);
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
507 // transform from relative [0,1] to image coordinates.
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
508 AffineTransform imgTrafo =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
509 AffineTransform.getScaleInstance(imgWidth, imgHeight);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
510 // transform user coordinate area to image coordinate area
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
511 Rectangle2D userImgArea =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
512 imgTrafo.createTransformedShape(relUserArea).getBounds2D();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
513
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
514 // calculate scaling factors based on inner user area
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
515 if (scaleToFit) {
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
516 areaWidth = userImgArea.getWidth();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
517 areaHeight = userImgArea.getHeight();
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
518 scaleX = paramDW / areaWidth * paramWS;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
519 scaleY = paramDH / areaHeight * paramWS;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
520 scaleXY = (scaleX > scaleY) ? scaleY : scaleX;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
521 } else if (absoluteScale) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
522 // absolute scale
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
523 scaleX = paramDDPIX / origResX;
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
524 scaleY = paramDDPIY / origResY;
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
525 // currently only same scale :-(
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
526 scaleXY = scaleX;
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
527 areaWidth = paramDW / scaleXY * paramWS;
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
528 areaHeight = paramDH / scaleXY * paramWS;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
529 // reset user area size
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
530 userImgArea.setRect(
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
531 userImgArea.getX(),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
532 userImgArea.getY(),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
533 areaWidth,
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
534 areaHeight);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
535 } else {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
536 // crop to fit
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
537 areaWidth = paramDW * paramWS;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
538 areaHeight = paramDH * paramWS;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
539 // reset user area size
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
540 userImgArea.setRect(
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
541 userImgArea.getX(),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
542 userImgArea.getY(),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
543 areaWidth,
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
544 areaHeight);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
545 scaleX = 1f;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
546 scaleY = 1f;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
547 scaleXY = 1f;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
548 }
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
549
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
550 // enlarge image area for rotations to cover additional pixels
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
551 Rectangle2D outerUserImgArea = userImgArea;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
552 Rectangle2D innerUserImgArea = userImgArea;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
553 if (wholeRotArea) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
554 if (paramROT != 0) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
555 try {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
556 // rotate user area coordinates around center of user area
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
557 AffineTransform rotTrafo =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
558 AffineTransform.getRotateInstance(
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
559 Math.toRadians(paramROT),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
560 userImgArea.getCenterX(),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
561 userImgArea.getCenterY());
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
562 // get bounds from rotated end position
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
563 innerUserImgArea =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
564 rotTrafo
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
565 .createTransformedShape(userImgArea)
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
566 .getBounds2D();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
567 // get bounds from back-rotated bounds
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
568 outerUserImgArea =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
569 rotTrafo
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
570 .createInverse()
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
571 .createTransformedShape(innerUserImgArea)
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
572 .getBounds2D();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
573 } catch (NoninvertibleTransformException e1) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
574 // this shouldn't happen anyway
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
575 e1.printStackTrace();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
576 }
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
577 }
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
578 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
579
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
580 util.dprintln(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
581 1,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
582 "Scale "
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
583 + scaleXY
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
584 + "("
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
585 + scaleX
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
586 + ","
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
587 + scaleY
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
588 + ") on "
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
589 + outerUserImgArea);
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
590
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
591 // clip area at the image border
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
592 outerUserImgArea = outerUserImgArea.createIntersection(imgBounds);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
593
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
594 areaWidth = outerUserImgArea.getWidth();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
595 areaHeight = outerUserImgArea.getHeight();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
596 areaXoff = outerUserImgArea.getX();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
597 areaYoff = outerUserImgArea.getY();
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
598
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
599 util.dprintln(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
600 2,
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
601 "crop: "
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
602 + areaXoff
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
603 + ","
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
604 + areaYoff
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
605 + " "
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
606 + areaWidth
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
607 + "x"
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
608 + areaHeight);
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
609
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
610 // check image parameters sanity
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
611 if ((areaWidth < 1)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
612 || (areaHeight < 1)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
613 || (scaleXY * areaWidth < 2)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
614 || (scaleXY * areaHeight < 2)) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
615 util.dprintln(1, "ERROR: invalid scale parameter set!");
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
616 throw new ImageOpException("Invalid scale parameter set!");
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
617 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
618
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
619 /*
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
620 * crop and scale image
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
621 */
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
622
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
623 // use subimage loading if possible
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
624 if (docuImage.isSubimageSupported()) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
625 System.out.println(
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
626 "Subimage: scale " + scaleXY + " = " + (1 / scaleXY));
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
627 double subf = 1d;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
628 double subsamp = 1d;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
629 if (scaleXY < 1) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
630 subf = 1 / scaleXY;
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
631 // for higher quality reduce subsample factor by minSubsample
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
632 if (scaleQual > 0) {
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
633 subsamp =
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
634 Math.max(
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
635 Math.floor(subf / dlConfig.getMinSubsample()),
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
636 1d);
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
637 } else {
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
638 subsamp = Math.floor(subf);
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
639 }
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
640 scaleXY = subsamp / subf;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
641 System.out.println(
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
642 "Using subsampling: " + subsamp + " rest " + scaleXY);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
643 }
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
644
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
645 docuImage.loadSubimage(
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
646 fileToLoad.getFile(),
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
647 outerUserImgArea.getBounds(),
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
648 (int) subsamp);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
649
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
650 System.out.println(
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
651 "SUBSAMP: "
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
652 + subsamp
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
653 + " -> "
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
654 + docuImage.getWidth()
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
655 + "x"
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
656 + docuImage.getHeight());
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
657
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
658 docuImage.scale(scaleXY);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
659
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
660 } else {
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
661 // else load and crop the whole file
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
662 docuImage.loadImage(fileToLoad.getFile());
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
663 docuImage.crop(
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
664 (int) areaXoff,
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
665 (int) areaYoff,
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
666 (int) areaWidth,
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
667 (int) areaHeight);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
668
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
669 docuImage.scale(scaleXY);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
670 }
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
671
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
672 // mirror image
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
673 // operation mode: "hmir": mirror horizontally, "vmir": mirror vertically
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
674 if (dlRequest.isOption("hmir")) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
675 docuImage.mirror(0);
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
676 }
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
677 if (dlRequest.isOption("vmir")) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
678 docuImage.mirror(90);
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
679 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
680
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
681 // rotate image
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
682 if (paramROT != 0) {
94
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
683 docuImage.rotate(paramROT);
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
684 if (wholeRotArea) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
685 // crop to the inner bounding box
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
686 double xcrop =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
687 docuImage.getWidth()
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
688 - innerUserImgArea.getWidth() * scaleXY;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
689 double ycrop =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
690 docuImage.getHeight()
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
691 - innerUserImgArea.getHeight() * scaleXY;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
692 if ((xcrop > 0) || (ycrop > 0)) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
693 // only crop smaller
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
694 xcrop = (xcrop > 0) ? xcrop : 0;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
695 ycrop = (ycrop > 0) ? ycrop : 0;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
696 // crop image
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
697 docuImage.crop(
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
698 (int) (xcrop / 2),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
699 (int) (ycrop / 2),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
700 (int) (docuImage.getWidth() - xcrop),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
701 (int) (docuImage.getHeight() - ycrop));
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
702 }
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
703 }
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
704
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
705 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
706
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
707 // color modification
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
708 if ((paramRGBM != null) || (paramRGBA != null)) {
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
709 // make shure we actually have two arrays
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
710 if (paramRGBM == null) {
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
711 paramRGBM = new float[3];
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
712 }
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
713 if (paramRGBA == null) {
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
714 paramRGBA = new float[3];
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
715 }
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
716 // calculate "contrast" values (c=2^x)
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
717 float[] mult = new float[3];
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
718 for (int i = 0; i < 3; i++) {
94
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
719 mult[i] = (float) Math.pow(2, (double) paramRGBM[i]);
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
720 }
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
721 docuImage.enhanceRGB(mult, paramRGBA);
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
722 }
94
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
723
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
724 // contrast and brightness enhancement
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
725 if ((paramCONT != 0) || (paramBRGT != 0)) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
726 double mult = Math.pow(2, paramCONT);
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
727 docuImage.enhance((float) mult, (float) paramBRGT);
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
728 }
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
729
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
730 util.dprintln(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
731 2,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
732 "time " + (System.currentTimeMillis() - startTime) + "ms");
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
733
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
734 /*
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
735 * write the resulting image
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
736 */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
737
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
738 // setup output -- if source is JPG then dest will be JPG else it's PNG
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
739 if (mimeType.equals("image/jpeg")
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
740 || mimeType.equals("image/jp2")) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
741 mimeType = "image/jpeg";
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
742 } else {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
743 mimeType = "image/png";
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
744 }
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
745 response.setContentType(mimeType);
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
746
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
747 // write the image
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
748 docuImage.writeImage(mimeType, response.getOutputStream());
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
749
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
750 util.dprintln(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
751 1,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
752 "Done in " + (System.currentTimeMillis() - startTime) + "ms");
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
753
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
754 /*
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
755 * error handling
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
756 */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
757
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
758 } // end of "big" try
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
759 catch (FileOpException e) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
760 util.dprintln(1, "ERROR: File IO Error: " + e);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
761 try {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
762 if (errorMsgHtml) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
763 ServletOps.htmlMessage(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
764 "ERROR: File IO Error: " + e,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
765 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
766 } else {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
767 servletOp.sendFile(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
768 new File(dlConfig.getErrorImgFileName()),
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
769 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
770 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
771 } catch (FileOpException ex) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
772 } // so we don't get a loop
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
773 return;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
774 } catch (AuthOpException e) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
775 util.dprintln(1, "ERROR: Authorization error: " + e);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
776 try {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
777 if (errorMsgHtml) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
778 ServletOps.htmlMessage(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
779 "ERROR: Authorization error: " + e,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
780 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
781 } else {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
782 servletOp.sendFile(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
783 new File(dlConfig.getErrorImgFileName()),
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
784 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
785 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
786 } catch (FileOpException ex) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
787 } // so we don't get a loop
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
788 return;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
789 } catch (ImageOpException e) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
790 util.dprintln(1, "ERROR: Image Error: " + e);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
791 try {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
792 if (errorMsgHtml) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
793 ServletOps.htmlMessage(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
794 "ERROR: Image Operation Error: " + e,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
795 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
796 } else {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
797 servletOp.sendFile(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
798 new File(dlConfig.getErrorImgFileName()),
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
799 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
800 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
801 } catch (FileOpException ex) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
802 } // so we don't get a loop
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
803 return;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
804 } catch (RuntimeException e) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
805 // JAI likes to throw RuntimeExceptions ;-(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
806 util.dprintln(1, "ERROR: Other Image Error: " + e);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
807 try {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
808 if (errorMsgHtml) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
809 ServletOps.htmlMessage(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
810 "ERROR: Other Image Operation Error: " + e,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
811 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
812 } else {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
813 servletOp.sendFile(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
814 new File(dlConfig.getErrorImgFileName()),
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
815 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
816 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
817 } catch (FileOpException ex) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
818 } // so we don't get a loop
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
819 return;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
820 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
821 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
822
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
823 } //Scaler class