Merge pull request #68 from robcast/webp-support

Fix webp forced output type.

Author: robcast

common/src/main/java/digilib/image/ImageJobDescription.java

@@ -1134,8 +1134,10 @@ public boolean isImageSendable() throws IOException {
             		// input image is browser compatible
                     && input.hasTag(ImageInput.InputTag.SENDABLE)
                     // no forced type conversion
+                    // TODO: use getOutputMimeType
                     && !(request.hasOption(DigilibOption.jpg) && !mimeType.equals("image/jpeg"))
                     && !(request.hasOption(DigilibOption.png) && !mimeType.equals("image/png"))
+                    && !(request.hasOption(DigilibOption.webp) && !mimeType.equals("image/webp"))
                     // no zooming
                     && !isZoomRequested()
                     // no other image operations

common/src/main/java/digilib/io/FileOps.java

@@ -48,7 +48,8 @@ public class FileOps {
             { "fpx", "image/fpx" }, { "svg", "image/svg+xml" },
 			{ "txt", "text/plain" }, { "html", "text/html" },
 			{ "htm", "text/html" }, { "xml", "text/xml" },
-			{ "meta", "text/xml" }, { "json", "application/json" }
+			{ "meta", "text/xml" }, { "json", "application/json" },
+			{ "webp", "image/webp" }
 			};
 
 	public static Map<String, String> fileTypes;

servlet/src/main/java/digilib/servlet/ServletOps.java

@@ -313,22 +313,9 @@ public static void sendImage(DocuImage img, String mimeType, HttpServletResponse
             return;
         }
         try {
-            /*
-             * determine the content-type: if mime type is set use that otherwise if source
-             * is JPG then dest will be JPG else it's PNG
-             */
             if (mimeType == null) {
-                mimeType = img.getMimetype();
-                if (mimeType == null) {
-                    // still no mime-type
-                    logger.warn("sendImage without mime-type! using image/jpeg.");
-                    mimeType = "image/jpeg";
-                }
-            }
-            if ((mimeType.equals("image/jpeg") || mimeType.equals("image/jp2") || mimeType.equals("image/fpx"))) {
+                logger.warn("sendImage without mime-type! using image/jpeg.");
                 mimeType = "image/jpeg";
-            } else {
-                mimeType = "image/png";
             }
             // set the content type
             response.setContentType(mimeType);

servlet2/src/main/java/digilib/servlet/Scaler.java

@@ -291,13 +291,8 @@ public void processRequest(HttpServletRequest request, HttpServletResponse respo
             Future<DocuImage> jobResult = imageJobCenter.submit(job);
             // wait for result
             DocuImage img = jobResult.get();
-            // forced destination image type
-            String mt = null;
-            if (jobTicket.getRequest().hasOption(DigilibOption.jpg)) {
-                mt = "image/jpeg";
-            } else if (jobTicket.getRequest().hasOption(DigilibOption.png)) {
-                mt = "image/png";
-            }
+            // get destination image type
+            String mt = jobTicket.getOutputMimeType();
             // send image
             ServletOps.sendImage(img, mt, response, logger);
             logger.debug("Job Processing Time: " + (System.currentTimeMillis() - startTime) + "ms");

servlet3/src/main/java/digilib/servlet/AsyncServletWorker.java

@@ -7,7 +7,7 @@
  * Worker class for the asynchronous Servlet API.
  * 
  * %%
- * Copyright (C) 2011 - 2013 MPIWG Berlin
+ * Copyright (C) 2011 - 2025 MPIWG Berlin
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as 
@@ -38,7 +38,6 @@
 import org.slf4j.LoggerFactory;
 
 import digilib.conf.DigilibConfiguration;
-import digilib.conf.DigilibOption;
 import digilib.image.DocuImage;
 import digilib.image.ImageJobDescription;
 import digilib.image.ImageOpException;
@@ -108,14 +107,10 @@ public void run() {
                 return;
             }
             /*
-             * set forced destination image type
+             * get destination image type
              */
-            String mt = null;
-            if (jobinfo.getRequest().hasOption(DigilibOption.jpg)) {
-                mt = "image/jpeg";
-            } else if (jobinfo.getRequest().hasOption(DigilibOption.png)) {
-                mt = "image/png";
-            }
+            String mt = jobinfo.getOutputMimeType();
+            
             /*
              *  send the image
              */