Merge branch 'master' into release-2.12 and bump version to 2.12.2.

Author: robcast

.github/workflows/docker-image.yml

@@ -11,23 +11,23 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Log in to the Github registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push master branch snapshot
         if: ${{ github.ref == 'refs/heads/master' }}
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           file: build/docker/Dockerfile
           push: true
@@ -38,15 +38,15 @@ jobs:
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         if: ${{ startsWith(github.ref, 'refs/tags/') }}
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: |
             robcast/digilib
             ghcr.io/robcast/digilib
 
       - name: Build and push tagged version
         if: ${{ startsWith(github.ref, 'refs/tags/') }}
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           file: build/docker/Dockerfile
           push: true

.github/workflows/maven.yml

@@ -11,35 +11,42 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: '11'
         distribution: 'adopt'
     - name: Cache Maven packages
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ runner.os }}-m2
 
-    - name: Checkout artifact repo
-      uses: actions/checkout@v2
+    - name: Checkout artifact repo (for release)
+      if: startsWith(github.ref, 'refs/tags/')
+      uses: actions/checkout@v3
       with:
         repository: robcast/digilib-repo
         ref: gh-pages
         path: digilib-repo
-    - name: Copy existing maven-repo
+    - name: Copy existing maven-repo (for release)
+      if: startsWith(github.ref, 'refs/tags/')
       run: |
         mkdir -p target/site/maven-repo
         cp -rp digilib-repo/maven-repo/* target/site/maven-repo/
         
-    - name: Build with tests and javadoc using Maven
-      run: mvn -Pbuild-all -DskipTests=false javadoc:aggregate deploy -DaltDeploymentRepository=repo::default::file:target/site/maven-repo -B
+    - name: Build tests using Maven
+      run: mvn -Pbuild-all -DskipTests=false test -B
 
-    - name: Deploy javadoc and maven-repo to digilib-repo
-      uses: crazy-max/ghaction-github-pages@v2
+    - name: Deploy javadoc and Maven artefacts (for release)
+      if: startsWith(github.ref, 'refs/tags/')
+      run: mvn -Pbuild-all javadoc:aggregate deploy -DaltDeploymentRepository=repo::default::file:target/site/maven-repo -B
+
+    - name: Deploy javadoc and maven-repo to digilib-repo (for release)
+      if: startsWith(github.ref, 'refs/tags/')
+      uses: crazy-max/ghaction-github-pages@v3
       with:
         repo: robcast/digilib-repo
         target_branch: gh-pages
@@ -53,14 +60,14 @@ jobs:
 
     - name: Deploy html site to gh-pages
       if: ${{ github.ref == 'refs/heads/master' }}
-      uses: crazy-max/ghaction-github-pages@v2
+      uses: crazy-max/ghaction-github-pages@v3
       with:
         target_branch: gh-pages
         build_dir: doc/target/site
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: add WAR to GH Release
+    - name: add WAR to GH Release (for release)
       if: startsWith(github.ref, 'refs/tags/')
       uses: softprops/action-gh-release@v1
       with:

common-cdstar/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.12.1</version>
+    <version>2.12.2</version>
   </parent>
 
   <artifactId>digilib-common-cdstar</artifactId>
@@ -31,14 +31,12 @@
       <version>4.5.13</version>
     </dependency>
     <dependency>
-      <groupId>javax.json</groupId>
-      <artifactId>javax.json-api</artifactId>
-      <version>1.1</version><!--$NO-MVN-MAN-VER$--><!-- use 1.1 instead of global 1.0 -->
+      <groupId>jakarta.json</groupId>
+      <artifactId>jakarta.json-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.glassfish</groupId>
-      <artifactId>javax.json</artifactId>
-      <version>1.1.4</version><!-- use 1.1 instead of global 1.0 -->
+      <artifactId>jakarta.json</artifactId>
     </dependency>
   </dependencies>
 </project>

common-cdstar/src/main/java/digilib/io/CdstarArchiveDocuDirectory.java

@@ -31,11 +31,11 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonValue;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;

common/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.12.1</version>
+    <version>2.12.2</version>
   </parent>
 
   <artifactId>digilib-common</artifactId>

common/src/main/java/digilib/conf/DigilibConfiguration.java

@@ -64,7 +64,7 @@ public class DigilibConfiguration extends ParameterMap {
      * @return the version
      */
     public static String getClassVersion() {
-        return "2.12.1";
+        return "2.12.2";
     }
 
     /* non-static getVersion for Java inheritance */

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

@@ -566,7 +566,7 @@ public ImageInput getInput() throws IOException {
             if (input == null || input.getMimetype() == null) {
                 throw new FileOpException("Unable to load " + input);
             }
-            logger.info("Planning to load: {}", input);
+            logger.debug("Image input: {}", input);
         }
         return input;
     }

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

@@ -82,6 +82,7 @@
 
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
 import digilib.io.FileOpException;
 import digilib.io.FileOps;
@@ -94,7 +95,7 @@
 public class ImageLoaderDocuImage extends ImageInfoDocuImage {
 
     /** DocuImage version */
-    public static final String version = "ImageLoaderDocuImage 2.3.1";
+    public static final String version = "ImageLoaderDocuImage 2.4.1";
 
     /** image object */
     protected BufferedImage img;
@@ -132,8 +133,6 @@ protected static enum Hacks {
         needsRescaleRgba,
         /** destination image type for LookupOp(mapBgrByteTable) needs to be (A)BGR */ 
         needsMapBgr, 
-        /** set destination type for blur operation */
-        forceDestForBlur, 
         /** set destination type for scale operation */
         forceDestForScaleCustom,
         /** JPEG writer can't deal with RGBA */
@@ -146,7 +145,7 @@ protected static enum Hacks {
         force16BitTo8,
         /** convert images with 16 bit depth to sRGB (and 8 bit depth) */ 
         force16BitToSrgb8
-        }
+    }
 
     /** active hacks */
     protected static EnumMap<Hacks, Boolean> imageHacks = new EnumMap<Hacks, Boolean>(Hacks.class);
@@ -431,6 +430,7 @@ protected void changeRasterToSrgb(BufferedImage img, ICC_Profile realProfile) {
      * @return
      */
     protected BufferedImage changeTo8BitDepth(BufferedImage bi) {
+        // method suggested by Harald K in https://stackoverflow.com/a/74995441/4912
         ColorModel cm = bi.getColorModel();
         ColorSpace cs = cm.getColorSpace();
         boolean hasAlpha = cm.hasAlpha();
@@ -487,17 +487,24 @@ public void setElem(int bank, int i, int val) {
      * @return
      */
     protected BufferedImage changeTo8BitNoAlpha(BufferedImage bi) {
+        BufferedImage newBi;
         ColorModel cm = bi.getColorModel();
-        int transferType = DataBuffer.TYPE_BYTE;
-        ColorSpace newCs = cm.getColorSpace();
-        ColorModel newCm = new ComponentColorModel(newCs, false, false, Transparency.OPAQUE, transferType);
-        WritableRaster newRaster = newCm.createCompatibleWritableRaster(bi.getWidth(), bi.getHeight());
-        // use child Raster with only color components (bands 0,1,2)
-        final int[] colorBands = new int[] { 0, 1, 2 };
-        WritableRaster colorRaster = bi.getRaster().createWritableChild(0, 0, bi.getWidth(), bi.getHeight(), 0, 0,
-                colorBands);
-        BufferedImage newBi = new BufferedImage(newCm, newRaster, false, null);
-        newBi.setData(colorRaster);
+        if (cm instanceof ComponentColorModel || cm instanceof DirectColorModel) {
+            ColorSpace newCs = cm.getColorSpace();
+            ColorModel newCm = new ComponentColorModel(newCs, false, false, Transparency.OPAQUE, DataBuffer.TYPE_BYTE);
+            WritableRaster newRaster = newCm.createCompatibleWritableRaster(bi.getWidth(), bi.getHeight());
+            // use child Raster with only color components (bands 0,1,2)
+            final int[] colorBands = new int[] { 0, 1, 2 };
+            WritableRaster colorRaster = bi.getRaster().createWritableChild(0, 0, bi.getWidth(), bi.getHeight(), 0, 0,
+                    colorBands);
+            newBi = new BufferedImage(newCm, newRaster, false, null);
+            newBi.setData(colorRaster);
+        } else {
+            logger.debug("changeTo8BitNonAlpha: converting to sRGB");
+            ColorConvertOp cco = new ColorConvertOp(ColorSpace.getInstance(ColorSpace.CS_sRGB), renderHint);
+            BufferedImage dest = new BufferedImage(bi.getWidth(), bi.getHeight(), BufferedImage.TYPE_INT_RGB);
+            newBi = cco.filter(bi, dest);
+        }
         return newBi;
     }
 
@@ -663,9 +670,10 @@ protected ICC_Profile getPngColorProfile(ImageReader reader) throws IOException
         ICC_Profile profile = null;
         IIOMetadata meta = reader.getImageMetadata(0);
         IIOMetadataNode dom = (IIOMetadataNode) meta.getAsTree(meta.getNativeMetadataFormatName());
-        IIOMetadataNode iccpNode = (IIOMetadataNode) dom.getElementsByTagName("iCCP").item(0);
-        if (iccpNode != null) {
+        NodeList iccpNodes = dom.getElementsByTagName("iCCP");
+        if (iccpNodes.getLength() > 0) {
             logger.debug("extracting iCCP profile from PNG.");
+            IIOMetadataNode iccpNode = (IIOMetadataNode) iccpNodes.item(0);
             NamedNodeMap atts = iccpNode.getAttributes();
             //String name = atts.getNamedItem("profileName").getNodeValue();
             String compression = atts.getNamedItem("compressionMethod").getNodeValue();
@@ -740,7 +748,7 @@ public void loadSubimage(ImageInput ii, Rectangle region, int prescale) throws F
                         cm = img.getColorModel();
                         cs = cm.getColorSpace();
                     } catch (Exception e) {
-                        logger.warn("Converting image to 8bit failed! Trying to convert to sRGB: {}", e);
+                        logger.warn("Converting image to 8bit failed! Trying to convert to sRGB: {}", e.toString());
                         convertToSrgb = true;
                     }
                 }

doc/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>digilib</groupId>
     <artifactId>digilib</artifactId>
-    <version>2.12.1</version>
+    <version>2.12.2</version>
   </parent>
   <artifactId>digilib-doc</artifactId>
   <packaging>pom</packaging>

frontend-greyskin/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>digilib</groupId>
 		<artifactId>digilib</artifactId>
-		<version>2.12.1</version>
+		<version>2.12.2</version>
 	</parent>
 	<artifactId>digilib-frontend-greyskin</artifactId>
 	<packaging>war</packaging>