# HG changeset patch # User robcast # Date 1374516266 -7200 # Node ID 89880f24a00732195be1a9bcf42158ee4f596e6f # Parent ad17716ebc549e62f5dbb7ed35de1377d5aafaad make sure zoomed images are not sent-as-is. diff -r ad17716ebc54 -r 89880f24a007 common/src/main/java/digilib/image/ImageJobDescription.java --- a/common/src/main/java/digilib/image/ImageJobDescription.java Mon Jul 22 19:26:43 2013 +0200 +++ b/common/src/main/java/digilib/image/ImageJobDescription.java Mon Jul 22 20:04:26 2013 +0200 @@ -628,12 +628,14 @@ if (imageSendable == null) { String mimeType = getMimeType(); imageSendable = (mimeType != null - && (mimeType.equals("image/jpeg") || mimeType.equals("image/png") || mimeType.equals("image/gif")) && !(hasOption("hmir") - || hasOption("vmir") + && (mimeType.equals("image/jpeg") || mimeType.equals("image/png") || mimeType.equals("image/gif")) + && !(getAsFloat("wx") > 0f || getAsFloat("wy") > 0f || getAsFloat("ww") < 1f || getAsFloat("wh") < 1f + || hasOption("vmir") || hasOption("hmir") || (getAsFloat("rot") != 0.0) || (getRGBM() != null) || (getRGBA() != null) - || (this.getColOp() != null) || (getAsFloat("cont") != 0.0) || (getAsFloat("brgt") != 0.0))); + || (this.getColOp() != null) + || (getAsFloat("cont") != 0.0) || (getAsFloat("brgt") != 0.0))); } return imageSendable; }