Additional colour interreptations.

Author: tonytw1

common-lib/src/main/scala/com/gu/mediaservice/lib/imaging/ImageOperations.scala

@@ -287,6 +287,8 @@ object ImageOperations extends GridLogging {
           case Some(VipsInterpretation.INTERPRETATION_B_W) => Some("Greyscale")
           case Some(VipsInterpretation.INTERPRETATION_CMYK) => Some("CMYK")
           case Some(VipsInterpretation.INTERPRETATION_LAB) => Some("LAB")
+          case Some(VipsInterpretation.INTERPRETATION_LABS) => Some("LAB")
+          case Some(VipsInterpretation.INTERPRETATION_RGB16) => Some("RGB")
           case Some(VipsInterpretation.INTERPRETATION_sRGB) => Some("RGB")
           case _ => None
         }

common-lib/src/test/scala/com/gu/mediaservice/lib/imaging/ImageOperationsTest.scala

@@ -26,15 +26,15 @@ class ImageOperationsTest extends AnyFunSpec with Matchers with ScalaFutures {
       val image = fileAt("rgb-wo-profile.jpg")
       val colourModelFuture = ImageOperations.getImageInformation(image)
       whenReady(colourModelFuture) { colourModel =>
-        colourModel._3 should be (Some("RGB"))
+        colourModel._3 should be(Some("RGB"))
       }
     }
 
     it("should return RGB for a JPG image with RGB image data and an RGB embedded profile") {
       val image = fileAt("rgb-with-rgb-profile.jpg")
       val colourModelFuture = ImageOperations.getImageInformation(image)
-        whenReady(colourModelFuture) { colourModel =>
-          colourModel._3 should be(Some("RGB"))
+      whenReady(colourModelFuture) { colourModel =>
+        colourModel._3 should be(Some("RGB"))
       }
     }
 
@@ -50,23 +50,47 @@ class ImageOperationsTest extends AnyFunSpec with Matchers with ScalaFutures {
       val image = fileAt("rgb-with-cmyk-profile.jpg")
       val colourModelFuture = ImageOperations.getImageInformation(image)
       whenReady(colourModelFuture) { colourModel =>
-        colourModel._3 should be (Some("RGB"))
+        colourModel._3 should be(Some("RGB"))
       }
     }
 
     it("should return CMYK for a JPG image with CMYK image data") {
       val image = fileAt("cmyk.jpg")
       val colourModelFuture = ImageOperations.getImageInformation(image)
       whenReady(colourModelFuture) { colourModel =>
-        colourModel._3 should be (Some("CMYK"))
+        colourModel._3 should be(Some("CMYK"))
       }
     }
 
     it("should return Greyscale for a JPG image with greyscale image data and no embedded profile") {
       val image = fileAt("grayscale-wo-profile.jpg")
       val colourModelFuture = ImageOperations.getImageInformation(image)
       whenReady(colourModelFuture) { colourModel =>
-        colourModel._3 should be (Some("Greyscale"))
+        colourModel._3 should be(Some("Greyscale"))
+      }
+    }
+
+    it("should return TGB for a PNG image with 16 bit RGB image data") {
+      val image = fileAt("ProPhoto_32bit (3c0d253874a4a76559672e9e90333aa55a7e38e6) (1).png")
+      val colourModelFuture = ImageOperations.getImageInformation(image)
+      whenReady(colourModelFuture) { colourModel =>
+        colourModel._3 should be(Some("RGB"))
+      }
+    }
+
+    it("should return LAB for a TIFF image with LAB16 image data") {
+      val image = fileAt("Lab 16bpc (7d0b7c7b8e890d7e5d369093aa437bd833e20f71).tiff")
+      val colourModelFuture = ImageOperations.getImageInformation(image)
+      whenReady(colourModelFuture) { colourModel =>
+        colourModel._3 should be(Some("LAB"))
+      }
+    }
+
+    it("should return CMYK for a TIFF image with CMYK image data") {
+      val image = fileAt("ilkafranz_gracedent-4_NewsprintCMYK (f7e5fd4f0d4a9d3aba8acb65bb19ff936c3a03a9) (f7e5fd4f0d4a9d3aba8acb65bb19ff936c3a03a9).tiff")
+      val colourModelFuture = ImageOperations.getImageInformation(image)
+      whenReady(colourModelFuture) { colourModel =>
+        colourModel._3 should be(Some("CMYK"))
       }
     }
   }