annotate servlet/src/digilib/servlet/Scaler.java @ 149:04ad64b2137a

Servlet version 1.14b1 - better performance with thumbnails (really, this time :-) - new DocuInfo class - new Directory class - DocuFile uses String and Directory as data members - parameter rearrangements
author robcast
date Tue, 26 Aug 2003 22:28:43 +0200
parents 837a633a0407
children bc8df0133c04
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
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1
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
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
23 import java.awt.geom.AffineTransform;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
24 import java.awt.geom.NoninvertibleTransformException;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
25 import java.awt.geom.Rectangle2D;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
26 import java.io.File;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
27 import java.io.IOException;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
28 import java.util.List;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
29
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
30 import javax.servlet.ServletConfig;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
31 import javax.servlet.ServletContext;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
32 import javax.servlet.ServletException;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
33 import javax.servlet.http.HttpServlet;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
34 import javax.servlet.http.HttpServletRequest;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
35 import javax.servlet.http.HttpServletResponse;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
36
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
37 import digilib.Utils;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
38 import digilib.auth.AuthOpException;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
39 import digilib.auth.AuthOps;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
40 import digilib.image.DocuImage;
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
41 import digilib.image.DocuInfo;
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
42 import digilib.image.ImageLoaderImageInfoDocuInfo;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
43 import digilib.image.ImageOpException;
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
44 import digilib.image.ImageSize;
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)
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
61 public static final String dlVersion = "1.14b1";
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;
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
179 // send the file as is
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
180 boolean sendFile = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
181 // use low resolution images only
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
182 boolean loresOnly = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
183 // use hires images only
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
184 boolean hiresOnly = false;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
185 // interpolation to use for scaling
142
f52a7664a807 Servlet version 1.12b3
robcast
parents: 140
diff changeset
186 int scaleQual = 1;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
187 // send html error message (or image file)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
188 boolean errorMsgHtml = false;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
189 // mirror the image
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
190 boolean doMirror = false;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
191 // angle of mirror axis
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
192 double mirrorAngle = 0;
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
193 // original (hires) image resolution
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
194 double origResX = 0;
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
195 double origResY = 0;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
196
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
197 /*
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
198 * request parameters
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
199 */
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
200
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
201 DigilibRequest dlRequest =
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
202 (DigilibRequest) request.getAttribute("digilib.servlet.request");
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
203
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
204 // destination image width
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
205 int paramDW = dlRequest.getDw();
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
206 // destination image height
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
207 int paramDH = dlRequest.getDh();
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
208 // dw and dh shouldn't be empty, if they are, set dw=dh
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
209 if (paramDW <= 0) {
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
210 paramDW = paramDH;
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
211 }
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
212 if (paramDH <= 0) {
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
213 paramDH = paramDW;
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
214 }
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
215 // relative area x_offset (0..1)
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
216 double paramWX = dlRequest.getWx();
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
217 // relative area y_offset
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
218 double paramWY = dlRequest.getWy();
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
219 // relative area width (0..1)
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
220 double paramWW = dlRequest.getWw();
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
221 // relative area height
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
222 double paramWH = dlRequest.getWh();
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
223 // scale factor (additional to dw/width, dh/height)
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
224 double paramWS = dlRequest.getWs();
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
225 // rotation angle
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
226 double paramROT = dlRequest.getRot();
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
227 // contrast enhancement
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
228 float paramCONT = dlRequest.getCont();
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
229 // brightness enhancement
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
230 float paramBRGT = dlRequest.getBrgt();
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
231 // color modification
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
232 float[] paramRGBM = dlRequest.getRgbm();
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
233 float[] paramRGBA = dlRequest.getRgba();
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
234 // destination resolution (DPI)
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
235 float paramDDPIX = dlRequest.getDdpix();
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
236 float paramDDPIY = dlRequest.getDdpiy();
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
237 if ((paramDDPIX == 0) || (paramDDPIY == 0)) {
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
238 // if X or Y resolution isn't set, use DDPI
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
239 paramDDPIX = dlRequest.getDdpi();
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
240 paramDDPIY = dlRequest.getDdpi();
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
241 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
242
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
243 /* operation mode: "fit": always fit to page,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
244 * "clip": send original resolution cropped, "file": send whole file (if
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
245 * allowed)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
246 */
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
247 if (dlRequest.isOption("clip")) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
248 scaleToFit = false;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
249 absoluteScale = false;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
250 cropToFit = true;
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
251 sendFile = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
252 hiresOnly = true;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
253 } else if (dlRequest.isOption("fit")) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
254 scaleToFit = true;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
255 absoluteScale = false;
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
256 cropToFit = false;
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
257 sendFile = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
258 hiresOnly = false;
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
259 } else if (dlRequest.isOption("osize")) {
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
260 scaleToFit = false;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
261 absoluteScale = true;
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
262 cropToFit = false;
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
263 sendFile = false;
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
264 hiresOnly = true;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
265 } else if (dlRequest.isOption("file")) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
266 scaleToFit = false;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
267 absoluteScale = false;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
268 if (dlConfig.isSendFileAllowed()) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
269 cropToFit = false;
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
270 sendFile = true;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
271 } else {
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
272 // crop to fit if send file not allowed
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
273 cropToFit = true;
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
274 sendFile = false;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
275 }
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
276 hiresOnly = true;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
277 }
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
278 // operation mode: "lores": try to use scaled image, "hires": use unscaled image
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
279 // "autores": try best fitting resolution
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
280 if (dlRequest.isOption("lores")) {
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
281 loresOnly = true;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
282 hiresOnly = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
283 } else if (dlRequest.isOption("hires")) {
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
284 loresOnly = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
285 hiresOnly = true;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
286 } else if (dlRequest.isOption("autores")) {
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
287 loresOnly = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
288 hiresOnly = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
289 }
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
290 // operation mode: "errtxt": error message in html, "errimg": error image
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
291 if (dlRequest.isOption("errtxt")) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
292 errorMsgHtml = true;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
293 } else if (dlRequest.isOption("errimg")) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
294 errorMsgHtml = false;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
295 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
296 // operation mode: "q0" - "q2": interpolation quality
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
297 if (dlRequest.isOption("q0")) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
298 scaleQual = 0;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
299 } else if (dlRequest.isOption("q1")) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
300 scaleQual = 1;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
301 } else if (dlRequest.isOption("q2")) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
302 scaleQual = 2;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
303 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
304
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
305 //"big" try for all file/image actions
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
306 try {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
307
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
308 // DocuFileset of the image to load
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
309 DocuFileset fileset = null;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
310
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
311 // new DocuInfo instance
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
312 DocuInfo docuInfo = new ImageLoaderImageInfoDocuInfo();
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;
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
350 fileset = dirCache.getFileset(loadPathName, dlRequest.getPn());
94
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
351 if (fileset == null) {
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
352 throw new FileOpException(
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
353 "File "
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
354 + loadPathName
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
355 + "("
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
356 + dlRequest.getPn()
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
357 + ") not found.");
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
358 }
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
359
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
360 /*
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
361 * calculate expected source image size
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
362 *
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
363 */
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
364 ImageSize expectedSourceSize = new ImageSize();
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
365 if (scaleToFit) {
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
366 double scale = (1 / Math.min(paramWW, paramWH)) * paramWS;
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
367 expectedSourceSize.setSize(
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
368 (int) (paramDW * scale),
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
369 (int) (paramDH * scale));
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
370 } else {
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
371 expectedSourceSize.setSize(
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
372 (int) (paramDW * paramWS),
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
373 (int) (paramDH * paramWS));
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
374 }
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
375
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
376 /*
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
377 * select a resolution
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
378 */
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
379 if (hiresOnly) {
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
380 // get first element (= highest resolution)
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
381 fileToLoad = fileset.get(0);
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
382 } else if (loresOnly) {
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
383 // enforced lores uses next smaller resolution
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
384 fileToLoad =
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
385 fileset.getNextSmaller(expectedSourceSize, docuInfo);
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
386 if (fileToLoad == null) {
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
387 // this is the smallest we have
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
388 fileToLoad = fileset.get(fileset.size() - 1);
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
389 }
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
390 } else {
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
391 // autores: use next higher resolution
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
392 fileToLoad =
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
393 fileset.getNextBigger(expectedSourceSize, docuInfo);
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
394 if (fileToLoad == null) {
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
395 // this is the highest we have
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
396 fileToLoad = fileset.get(0);
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
397 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
398 }
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
399 util.dprintln(1, "Loading: " + fileToLoad.getFile());
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
400
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
401 if (absoluteScale) {
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
402 // get original resolution from metadata
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
403 fileset.checkMeta();
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
404 origResX = fileset.getResX();
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
405 origResY = fileset.getResY();
139
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
406 if ((origResX == 0) || (origResY == 0)) {
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
407 throw new ImageOpException("Missing image DPI information!");
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
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
410 if ((paramDDPIX == 0) || (paramDDPIY == 0)) {
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
411 throw new ImageOpException("Missing display DPI information!");
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
412 }
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
413 }
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
414
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
415 // check the source image
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
416 if (!fileToLoad.isChecked()) {
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
417 docuInfo.checkFile(fileToLoad);
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
418 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
419 // get the source image type
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
420 mimeType = fileToLoad.getMimetype();
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
421 // get the source image size
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
422 ImageSize imgSize = fileToLoad.getSize();
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
423
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
424 // decide if the image can be sent as is
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
425 boolean mimetypeSendable =
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
426 mimeType.equals("image/jpeg")
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
427 || mimeType.equals("image/png")
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
428 || mimeType.equals("image/gif");
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
429 boolean imagoOptions =
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
430 dlRequest.isOption("hmir")
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
431 || dlRequest.isOption("vmir")
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
432 || (paramROT != 0)
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
433 || (paramRGBM != null)
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
434 || (paramRGBA != null)
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
435 || (paramCONT != 0)
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
436 || (paramBRGT != 0);
139
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
437 boolean imageSendable = mimetypeSendable && !imagoOptions;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
438
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
439 /* if not autoRes and image smaller than requested
147
bdd6789d21e0 Fix for sending images that need no scaling.
robcast
parents: 145
diff changeset
440 * size then send as is.
bdd6789d21e0 Fix for sending images that need no scaling.
robcast
parents: 145
diff changeset
441 * if autoRes and image has requested size then send as is.
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
442 * if not autoScale and not scaleToFit nor cropToFit
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
443 * then send as is (mo=file)
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
444 */
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
445 if ((loresOnly
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
446 && imageSendable
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
447 && fileToLoad.getSize().isSmallerThan(expectedSourceSize))
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
448 || (!(loresOnly || hiresOnly) && fileToLoad.getSize().fitsIn(expectedSourceSize))
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
449 || sendFile) {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
450
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
451 util.dprintln(1, "Sending File as is.");
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
452
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
453 servletOp.sendFile(fileToLoad.getFile(), response);
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
454
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
455 util.dprintln(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
456 1,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
457 "Done in "
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
458 + (System.currentTimeMillis() - startTime)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
459 + "ms");
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
460 return;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
461 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
462
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
463 // new DocuImage instance
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
464 DocuImage docuImage = dlConfig.getDocuImageInstance();
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
465 if (docuImage == null) {
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
466 throw new ImageOpException("Unable to load DocuImage class!");
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
467 }
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
468
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
469 // set interpolation quality
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
470 docuImage.setQuality(scaleQual);
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
471
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
472 /*
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
473 * crop and scale the image
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
474 */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
475
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
476 util.dprintln(
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
477 2,
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
478 "IMG: " + imgSize.getWidth() + "x" + imgSize.getHeight());
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
479 util.dprintln(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
480 2,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
481 "time " + (System.currentTimeMillis() - startTime) + "ms");
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
482
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
483 // coordinates and scaling
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
484 double areaXoff;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
485 double areaYoff;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
486 double areaWidth;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
487 double areaHeight;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
488 double scaleX;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
489 double scaleY;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
490 double scaleXY;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
491
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
492 // coordinates using Java2D
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
493 // image size in pixels
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
494 Rectangle2D imgBounds =
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
495 new Rectangle2D.Double(
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
496 0,
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
497 0,
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
498 imgSize.getWidth(),
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
499 imgSize.getHeight());
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
500 // user window area in [0,1] coordinates
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
501 Rectangle2D relUserArea =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
502 new Rectangle2D.Double(paramWX, paramWY, paramWW, paramWH);
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
503 // transform from relative [0,1] to image coordinates.
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
504 AffineTransform imgTrafo =
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
505 AffineTransform.getScaleInstance(
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
506 imgSize.getWidth(),
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
507 imgSize.getHeight());
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
508 // transform user coordinate area to image coordinate area
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
509 Rectangle2D userImgArea =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
510 imgTrafo.createTransformedShape(relUserArea).getBounds2D();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
511
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
512 // calculate scaling factors based on inner user area
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
513 if (scaleToFit) {
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
514 areaWidth = userImgArea.getWidth();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
515 areaHeight = userImgArea.getHeight();
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
516 scaleX = paramDW / areaWidth * paramWS;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
517 scaleY = paramDH / areaHeight * paramWS;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
518 scaleXY = (scaleX > scaleY) ? scaleY : scaleX;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
519 } else if (absoluteScale) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
520 // absolute scale
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
521 scaleX = paramDDPIX / origResX;
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
522 scaleY = paramDDPIY / origResY;
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
523 // currently only same scale :-(
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
524 scaleXY = scaleX;
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
525 areaWidth = paramDW / scaleXY * paramWS;
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
526 areaHeight = paramDH / scaleXY * paramWS;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
527 // reset user area size
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
528 userImgArea.setRect(
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
529 userImgArea.getX(),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
530 userImgArea.getY(),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
531 areaWidth,
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
532 areaHeight);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
533 } else {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
534 // crop to fit
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
535 areaWidth = paramDW * paramWS;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
536 areaHeight = paramDH * paramWS;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
537 // reset user area size
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
538 userImgArea.setRect(
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
539 userImgArea.getX(),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
540 userImgArea.getY(),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
541 areaWidth,
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
542 areaHeight);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
543 scaleX = 1f;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
544 scaleY = 1f;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
545 scaleXY = 1f;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
546 }
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
547
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
548 // enlarge image area for rotations to cover additional pixels
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
549 Rectangle2D outerUserImgArea = userImgArea;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
550 Rectangle2D innerUserImgArea = userImgArea;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
551 if (wholeRotArea) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
552 if (paramROT != 0) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
553 try {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
554 // rotate user area coordinates around center of user area
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
555 AffineTransform rotTrafo =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
556 AffineTransform.getRotateInstance(
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
557 Math.toRadians(paramROT),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
558 userImgArea.getCenterX(),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
559 userImgArea.getCenterY());
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
560 // get bounds from rotated end position
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
561 innerUserImgArea =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
562 rotTrafo
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
563 .createTransformedShape(userImgArea)
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
564 .getBounds2D();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
565 // get bounds from back-rotated bounds
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
566 outerUserImgArea =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
567 rotTrafo
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
568 .createInverse()
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
569 .createTransformedShape(innerUserImgArea)
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
570 .getBounds2D();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
571 } catch (NoninvertibleTransformException e1) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
572 // this shouldn't happen anyway
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
573 e1.printStackTrace();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
574 }
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
575 }
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
576 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
577
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
578 util.dprintln(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
579 1,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
580 "Scale "
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
581 + scaleXY
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
582 + "("
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
583 + scaleX
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
584 + ","
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
585 + scaleY
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
586 + ") on "
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
587 + outerUserImgArea);
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
588
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
589 // clip area at the image border
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
590 outerUserImgArea = outerUserImgArea.createIntersection(imgBounds);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
591
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
592 areaWidth = outerUserImgArea.getWidth();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
593 areaHeight = outerUserImgArea.getHeight();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
594 areaXoff = outerUserImgArea.getX();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
595 areaYoff = outerUserImgArea.getY();
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
596
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
597 util.dprintln(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
598 2,
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
599 "crop: "
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
600 + areaXoff
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
601 + ","
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
602 + areaYoff
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
603 + " "
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
604 + areaWidth
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
605 + "x"
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
606 + areaHeight);
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
607
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
608 // check image parameters sanity
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
609 if ((areaWidth < 1)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
610 || (areaHeight < 1)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
611 || (scaleXY * areaWidth < 2)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
612 || (scaleXY * areaHeight < 2)) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
613 util.dprintln(1, "ERROR: invalid scale parameter set!");
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
614 throw new ImageOpException("Invalid scale parameter set!");
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
615 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
616
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
617 /*
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
618 * crop and scale image
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
619 */
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
620
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
621 // use subimage loading if possible
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
622 if (docuImage.isSubimageSupported()) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
623 System.out.println(
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
624 "Subimage: scale " + scaleXY + " = " + (1 / scaleXY));
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
625 double subf = 1d;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
626 double subsamp = 1d;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
627 if (scaleXY < 1) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
628 subf = 1 / scaleXY;
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
629 // for higher quality reduce subsample factor by minSubsample
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
630 if (scaleQual > 0) {
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
631 subsamp =
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
632 Math.max(
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
633 Math.floor(subf / dlConfig.getMinSubsample()),
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
634 1d);
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
635 } else {
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
636 subsamp = Math.floor(subf);
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
637 }
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
638 scaleXY = subsamp / subf;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
639 System.out.println(
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
640 "Using subsampling: " + subsamp + " rest " + scaleXY);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
641 }
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
642
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
643 docuImage.loadSubimage(
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
644 fileToLoad,
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
645 outerUserImgArea.getBounds(),
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
646 (int) subsamp);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
647
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
648 System.out.println(
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
649 "SUBSAMP: "
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
650 + subsamp
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
651 + " -> "
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
652 + docuImage.getWidth()
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
653 + "x"
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
654 + docuImage.getHeight());
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
655
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
656 docuImage.scale(scaleXY, scaleXY);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
657
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
658 } else {
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
659 // else load and crop the whole file
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
660 docuImage.loadImage(fileToLoad);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
661 docuImage.crop(
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
662 (int) areaXoff,
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
663 (int) areaYoff,
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
664 (int) areaWidth,
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
665 (int) areaHeight);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
666
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
667 docuImage.scale(scaleXY, scaleXY);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
668 }
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 // mirror image
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
671 // operation mode: "hmir": mirror horizontally, "vmir": mirror vertically
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
672 if (dlRequest.isOption("hmir")) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
673 docuImage.mirror(0);
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
674 }
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
675 if (dlRequest.isOption("vmir")) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
676 docuImage.mirror(90);
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
677 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
678
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
679 // rotate image
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
680 if (paramROT != 0) {
94
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
681 docuImage.rotate(paramROT);
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
682 if (wholeRotArea) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
683 // crop to the inner bounding box
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
684 double xcrop =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
685 docuImage.getWidth()
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
686 - innerUserImgArea.getWidth() * scaleXY;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
687 double ycrop =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
688 docuImage.getHeight()
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
689 - innerUserImgArea.getHeight() * scaleXY;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
690 if ((xcrop > 0) || (ycrop > 0)) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
691 // only crop smaller
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
692 xcrop = (xcrop > 0) ? xcrop : 0;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
693 ycrop = (ycrop > 0) ? ycrop : 0;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
694 // crop image
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
695 docuImage.crop(
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
696 (int) (xcrop / 2),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
697 (int) (ycrop / 2),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
698 (int) (docuImage.getWidth() - xcrop),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
699 (int) (docuImage.getHeight() - ycrop));
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
700 }
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
701 }
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
702
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
703 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
704
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
705 // color modification
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
706 if ((paramRGBM != null) || (paramRGBA != null)) {
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
707 // make shure we actually have two arrays
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
708 if (paramRGBM == null) {
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
709 paramRGBM = new float[3];
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
710 }
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
711 if (paramRGBA == null) {
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
712 paramRGBA = new float[3];
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
713 }
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
714 // calculate "contrast" values (c=2^x)
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
715 float[] mult = new float[3];
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
716 for (int i = 0; i < 3; i++) {
94
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
717 mult[i] = (float) Math.pow(2, (double) paramRGBM[i]);
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
718 }
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
719 docuImage.enhanceRGB(mult, paramRGBA);
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
720 }
94
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
721
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
722 // contrast and brightness enhancement
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
723 if ((paramCONT != 0) || (paramBRGT != 0)) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
724 double mult = Math.pow(2, paramCONT);
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
725 docuImage.enhance((float) mult, (float) paramBRGT);
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
726 }
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
727
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
728 util.dprintln(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
729 2,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
730 "time " + (System.currentTimeMillis() - startTime) + "ms");
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
731
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
732 /*
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
733 * write the resulting image
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
734 */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
735
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
736 // 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
737 if (mimeType.equals("image/jpeg")
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
738 || mimeType.equals("image/jp2")) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
739 mimeType = "image/jpeg";
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
740 } else {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
741 mimeType = "image/png";
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
742 }
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
743 response.setContentType(mimeType);
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
744
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
745 // write the image
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
746 docuImage.writeImage(mimeType, response.getOutputStream());
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
747
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
748 util.dprintln(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
749 1,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
750 "Done in " + (System.currentTimeMillis() - startTime) + "ms");
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
751
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
752 /*
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
753 * error handling
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
754 */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
755
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
756 } // end of "big" try
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
757 catch (FileOpException e) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
758 util.dprintln(1, "ERROR: File IO Error: " + e);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
759 try {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
760 if (errorMsgHtml) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
761 ServletOps.htmlMessage(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
762 "ERROR: File IO Error: " + e,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
763 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
764 } else {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
765 servletOp.sendFile(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
766 new File(dlConfig.getErrorImgFileName()),
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
767 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
768 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
769 } catch (FileOpException ex) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
770 } // so we don't get a loop
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
771 } catch (AuthOpException e) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
772 util.dprintln(1, "ERROR: Authorization error: " + e);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
773 try {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
774 if (errorMsgHtml) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
775 ServletOps.htmlMessage(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
776 "ERROR: Authorization error: " + e,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
777 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
778 } else {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
779 servletOp.sendFile(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
780 new File(dlConfig.getErrorImgFileName()),
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
781 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
782 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
783 } catch (FileOpException ex) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
784 } // so we don't get a loop
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
785 } catch (ImageOpException e) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
786 util.dprintln(1, "ERROR: Image Error: " + e);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
787 try {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
788 if (errorMsgHtml) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
789 ServletOps.htmlMessage(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
790 "ERROR: Image Operation Error: " + e,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
791 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
792 } else {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
793 servletOp.sendFile(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
794 new File(dlConfig.getErrorImgFileName()),
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 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
797 } catch (FileOpException ex) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
798 } // so we don't get a loop
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
799 } catch (RuntimeException e) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
800 // JAI likes to throw RuntimeExceptions ;-(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
801 util.dprintln(1, "ERROR: Other Image Error: " + e);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
802 try {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
803 if (errorMsgHtml) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
804 ServletOps.htmlMessage(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
805 "ERROR: Other Image Operation Error: " + e,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
806 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
807 } else {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
808 servletOp.sendFile(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
809 new File(dlConfig.getErrorImgFileName()),
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
810 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
811 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
812 } catch (FileOpException ex) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
813 } // so we don't get a loop
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
814
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
815 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
816 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
817
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
818 } //Scaler class