Mercurial > hg > digilib

changeset 1207:89880f24a007

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make sure zoomed images are not sent-as-is.
author robcast
date Mon, 22 Jul 2013 20:04:26 +0200
parents ad17716ebc54
children ee5d2ce6b11a
files common/src/main/java/digilib/image/ImageJobDescription.java
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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;
     }