annotate servlet/src/digilib/servlet/Scaler.java @ 140:c878ea574c29

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