# HG changeset patch
# User robcast
# Date 1447432348 -3600
# Node ID a1f51d39f23b568cf84c165546f78b48aa323bfc
# Parent  ca07154c4dd2a1338fa5484dc6f0fe1144eeb6aa# Parent  1616ea71929011a65382875784591b4c8f543633
Merge from default branch
 1616ea71929011a65382875784591b4c8f543633

diff -r ca07154c4dd2 -r a1f51d39f23b common/src/main/java/digilib/conf/DigilibConfiguration.java
--- a/common/src/main/java/digilib/conf/DigilibConfiguration.java	Fri Nov 13 15:16:03 2015 +0100
+++ b/common/src/main/java/digilib/conf/DigilibConfiguration.java	Fri Nov 13 17:32:28 2015 +0100
@@ -57,7 +57,7 @@
 
     /** digilib version */
     public static String getClassVersion() {
-        return "2.3.6";
+        return "2.3.7";
     }
 
     /* non-static getVersion for Java inheritance */
diff -r ca07154c4dd2 -r a1f51d39f23b common/src/main/java/digilib/conf/DigilibRequest.java
--- a/common/src/main/java/digilib/conf/DigilibRequest.java	Fri Nov 13 15:16:03 2015 +0100
+++ b/common/src/main/java/digilib/conf/DigilibRequest.java	Fri Nov 13 17:32:28 2015 +0100
@@ -585,6 +585,8 @@
                 // color is default anyway
             } else if (quality.equals("gray") || quality.equals("grey")) {
                 setValueFromString("colop", "grayscale");
+            } else if (quality.equals("bitonal")) {
+                setValueFromString("colop", "bitonal");
             } else {
                 errorMessage = "Invalid quality parameter in IIIF path!";
                 logger.error(errorMessage);
diff -r ca07154c4dd2 -r a1f51d39f23b common/src/main/java/digilib/image/DocuImage.java
--- a/common/src/main/java/digilib/image/DocuImage.java	Fri Nov 13 15:16:03 2015 +0100
+++ b/common/src/main/java/digilib/image/DocuImage.java	Fri Nov 13 17:32:28 2015 +0100
@@ -244,7 +244,7 @@
      * 
      */
     public enum ColorOp {
-        GRAYSCALE, NTSC_GRAY, INVERT, MAP_GRAY_BGR
+        GRAYSCALE, NTSC_GRAY, INVERT, MAP_GRAY_BGR, BITONAL
     };
 
     /**
diff -r ca07154c4dd2 -r a1f51d39f23b common/src/main/java/digilib/image/ImageLoaderDocuImage.java
--- a/common/src/main/java/digilib/image/ImageLoaderDocuImage.java	Fri Nov 13 15:16:03 2015 +0100
+++ b/common/src/main/java/digilib/image/ImageLoaderDocuImage.java	Fri Nov 13 17:32:28 2015 +0100
@@ -772,6 +772,17 @@
             BufferedImage dest = new BufferedImage(img.getWidth(), img.getHeight(), BufferedImage.TYPE_BYTE_GRAY);
             op.filter(img.getRaster(), dest.getRaster());
             img = dest;
+        } else if (colop == ColorOp.BITONAL) {
+            /*
+             * convert image to bitonal black and white
+             * (nothing clever is done)
+             */
+            logger.debug("Color op: bitonal");
+            logger.debug("img=" + img);
+            BufferedImage dest = new BufferedImage(img.getWidth(), img.getHeight(), BufferedImage.TYPE_BYTE_BINARY);
+            dest.createGraphics().drawImage(img, null, 0, 0);
+            img = dest;
+            logger.debug("bitonal img=" + img);
         } else if (colop == ColorOp.INVERT) {
             /*
              * invert colors i.e. invert every channel
diff -r ca07154c4dd2 -r a1f51d39f23b doc/src/site/markdown/iiif-api.md
--- a/doc/src/site/markdown/iiif-api.md	Fri Nov 13 15:16:03 2015 +0100
+++ b/doc/src/site/markdown/iiif-api.md	Fri Nov 13 17:32:28 2015 +0100
@@ -2,7 +2,7 @@
 
 The Scaler servlet provides not only its native [Scaler API](scaler-api.html) but also an API compliant to the standards of the International Image Interoperability Framework http://iiif.io.
 
-As of version 2.3.6 digilib supports the [IIIF Image API version 2](http://iiif.io/api/image/2.0/) at [compliance level 2](http://iiif.io/api/image/2.0/compliance.html) (except bitonal quality). You can switch between API version 1.1 and 2.0 support with the `iiif-api-version` parameter in [digilib-config](digilib-config.html),  
+As of version 2.3.7 digilib supports the [IIIF Image API version 2](http://iiif.io/api/image/2.0/) at [compliance level 2](http://iiif.io/api/image/2.0/compliance.html). You can switch between API version 1.1 and 2.0 support with the `iiif-api-version` parameter in [digilib-config](digilib-config.html),  
 
 IIIF Image API URLs for an image request have the form:
 
diff -r ca07154c4dd2 -r a1f51d39f23b webapp/src/main/webapp/jquery/jquery.digilib.js
--- a/webapp/src/main/webapp/jquery/jquery.digilib.js	Fri Nov 13 15:16:03 2015 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.js	Fri Nov 13 17:32:28 2015 +0100
@@ -45,7 +45,7 @@
 
     var defaults = {
         // version of this script
-        'version' : 'jquery.digilib.js 2.3.6',
+        'version' : 'jquery.digilib.js 2.3.7',
         // logo url
         'logoUrl' : 'img/digilib-logo-text1.png',
         // homepage url (behind logo)