Handle grayscale JP2s with RGB color profiles

This installs the patch from uclouvain/openjpeg#1207 to handle the case where an image has a color profile which is not compatible with the actual channel definitions.

Author: acdha

Dockerfile

@@ -1,14 +1,48 @@
+FROM debian:buster AS builder
+
+ENV DEBIAN_FRONTEND="noninteractive"
+
+# Enable deb-src repos so we can retrieve the packages used to build libopenjp2:
+RUN sed -i -e '/^deb/p; s/^deb /deb-src /' /etc/apt/sources.list
+
+RUN apt-get update -qqy && apt-get dist-upgrade -qqy && apt-get install -qqy quilt devscripts && apt-get build-dep -qy libopenjp2-tools
+
+RUN adduser --system --group builder
+RUN install -d -o builder -g builder /build
+
+USER builder
+
+WORKDIR /build
+
+RUN apt-get source openjpeg2
+
+WORKDIR /build/openjpeg2-2.3.0
+ENV QUILT_PATCHES=debian/patches
+
+# Add the patch from https://github.com/uclouvain/openjpeg/issues/1207
+COPY handle_colorspace_conflicts.patch /build/
+
+# Apply the patch to the local source directory
+RUN quilt import /build/handle_colorspace_conflicts.patch
+RUN quilt push -a -v
+
+# Build all of the openjpeg2 packages
+RUN debuild -uc -us
+
 FROM debian:buster
 
 EXPOSE 8182
 
 VOLUME /imageroot
 
-# Update packages and install tools
 RUN apt-get update -qy && apt-get dist-upgrade -qy && \
-    apt-get install -qy --no-install-recommends curl imagemagick libopenjp2-tools ffmpeg gettext unzip default-jre-headless && \
+    apt-get install -qy --no-install-recommends curl imagemagick ffmpeg gettext unzip default-jre-headless && \
     apt-get -qqy autoremove && apt-get -qqy autoclean
 
+# Install the patched openjpeg2 tools
+COPY --from=builder /build/*.deb /tmp/
+RUN dpkg -i /tmp/libopenjp2-*.deb /tmp/libopenjp2-tools-*.deb
+
 # Run non privileged
 RUN adduser --system cantaloupe
 

handle_colorspace_conflicts.patch

@@ -0,0 +1,13 @@
+--- a/src/bin/common/color.c 2019-08-08 00:45:01.903651387 +0200
++++ b/src/bin/common/color.c 2019-08-08 00:39:24.442674016 +0200
+@@ -488,6 +488,10 @@
+     if (out_space == cmsSigRgbData) { /* enumCS 16 */
+         unsigned int i, nr_comp = image->numcomps;
+
++        if (nr_comp < 3) { /* GRAY or GRAYA, not RGB or RGBA */
++            cmsCloseProfile(in_prof);
++            return;
++        }
+         if (nr_comp > 4) {
+             nr_comp = 4;
+         }