Add support for icc profiles in images

IdamkinI · itext-teamcity · commit 1c01b0a88d45 · 2017-12-21T18:51:32.000+03:00
Replace cmps for files that use images with icc profiles.

DEVSIX-1714

Autoported commit.
Original commit hash: [a5af1aab7]
diff --git a/itext.tests/itext.layout.tests/itext/layout/ImageTest.cs b/itext.tests/itext.layout.tests/itext/layout/ImageTest.cs
@@ -524,6 +524,8 @@ public virtual void PngImageColorProfileTest() {
         /// <exception cref="System.IO.IOException"/>
         /// <exception cref="System.Exception"/>
         [NUnit.Framework.Test]
+        [LogMessage(iText.IO.LogMessageConstant.PNG_IMAGE_HAS_ICC_PROFILE_WITH_INCOMPATIBLE_NUMBER_OF_COLOR_COMPONENTS
+            )]
         public virtual void PngImageIncorrectColorProfileTest() {
             SimpleImageTest("pngIncorrectColorProfileTest.pdf", "png-incorrect-color-profile-test.png");
         }
diff --git a/itext.tests/itext.layout.tests/resources/itext/layout/ImageTest/cmp_pngColorProfileTest.pdf b/itext.tests/itext.layout.tests/resources/itext/layout/ImageTest/cmp_pngColorProfileTest.pdf
diff --git a/itext.tests/itext.layout.tests/resources/itext/layout/PositioningTest/cmp_showTextAlignedTest03.pdf b/itext.tests/itext.layout.tests/resources/itext/layout/PositioningTest/cmp_showTextAlignedTest03.pdf
diff --git a/itext/itext.io/itext/io/LogMessageConstant.cs b/itext/itext.io/itext/io/LogMessageConstant.cs
@@ -141,6 +141,17 @@ public const String ENCRYPTED_PAYLOAD_FILE_SPEC_SHALL_HAVE_AFRELATIONSHIP_FILED_
 
         public const String IMAGE_HAS_JPXDECODE_FILTER = "Image cannot be inline if it has JPXDecode filter. It will be added as an ImageXObject";
 
+        public const String IMAGE_HAS_ICC_PROFILE_WITH_INCOMPATIBLE_NUMBER_OF_COLOR_COMPONENTS_COMPARED_TO_COLOR_SPACE
+             = "Image has icc profile with incompatible number of color components compared to image color space. The icc profile will be ignored.";
+
+        public const String IMAGE_HAS_ICC_PROFILE_WITH_INCOMPATIBLE_NUMBER_OF_COLOR_COMPONENTS_COMPARED_TO_BASE_COLOR_SPACE_IN_INDEXED_COLOR_SPACE
+             = "Image has icc profile with incompatible number of color components compared to base color space in image indexed color space. The icc profile will be ignored.";
+
+        public const String IMAGE_HAS_INCORRECT_OR_UNSUPPORTED_BASE_COLOR_SPACE_IN_INDEXED_COLOR_SPACE_OVERRIDDEN_BY_ICC_PROFILE
+             = "Image has incorrect or unsupported base color space in indexed color space, it will be overridden by one based on embedded icc profile.";
+
+        public const String IMAGE_HAS_INCORRECT_OR_UNSUPPORTED_COLOR_SPACE_OVERRIDDEN_BY_ICC_PROFILE = "Image has incorrect or unsupported color space, that will be overridden by one based on embedded icc profile.";
+
         public const String IMAGE_HAS_MASK = "Image cannot be inline if it has a Mask";
 
         public const String IMAGE_SIZE_CANNOT_BE_MORE_4KB = "Inline image size cannot be more than 4KB. It will be added as an ImageXObject";
@@ -197,6 +208,8 @@ public const String ENCRYPTED_PAYLOAD_FILE_SPEC_SHALL_HAVE_AFRELATIONSHIP_FILED_
 
         public const String PDF_WRITER_CLOSING_FAILED = "PdfWriter closing failed due to the error occurred!";
 
+        public const String PNG_IMAGE_HAS_ICC_PROFILE_WITH_INCOMPATIBLE_NUMBER_OF_COLOR_COMPONENTS = "Png image has color profile with incompatible number of color components. It will be ignored.";
+
         public const String POPUP_ENTRY_IS_NOT_POPUP_ANNOTATION = "Popup entry in the markup annotations refers not to the annotation with Popup subtype.";
 
         public const String PROPERTY_IN_PERCENTS_NOT_SUPPORTED = "Property {0} in percents is not supported";
diff --git a/itext/itext.io/itext/io/image/PngImageHelper.cs b/itext/itext.io/itext/io/image/PngImageHelper.cs
@@ -45,6 +45,7 @@ source product.
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using Common.Logging;
 using iText.IO.Colors;
 using iText.IO.Font;
 using iText.IO.Source;
@@ -214,6 +215,12 @@ public static void ProcessImage(ImageData image) {
         /// <exception cref="System.IO.IOException"/>
         private static void ProcessPng(Stream pngStream, PngImageHelper.PngParameters png) {
             ReadPng(pngStream, png);
+            if (png.iccProfile != null && png.iccProfile.GetNumComponents() != GetExpectedNumberOfColorComponents(png)
+                ) {
+                LogManager.GetLogger(typeof(PngImageHelper)).Error(iText.IO.LogMessageConstant.PNG_IMAGE_HAS_ICC_PROFILE_WITH_INCOMPATIBLE_NUMBER_OF_COLOR_COMPONENTS
+                    );
+                png.iccProfile = null;
+            }
             try {
                 int pal0 = 0;
                 int palIdx = 0;
@@ -407,6 +414,10 @@ private static Object GetColorspace(PngImageHelper.PngParameters png) {
             }
         }
 
+        private static int GetExpectedNumberOfColorComponents(PngImageHelper.PngParameters png) {
+            return (png.colorType & 2) == 0 ? 1 : 3;
+        }
+
         /// <exception cref="System.IO.IOException"/>
         private static void ReadPng(Stream pngStream, PngImageHelper.PngParameters png) {
             for (int i = 0; i < PNGID.Length; i++) {
diff --git a/itext/itext.kernel/itext/kernel/pdf/colorspace/PdfCieBasedCs.cs b/itext/itext.kernel/itext/kernel/pdf/colorspace/PdfCieBasedCs.cs
@@ -205,6 +205,15 @@ public override int GetNumberOfComponents() {
 
             public static PdfStream GetIccProfileStream(Stream iccStream) {
                 IccProfile iccProfile = IccProfile.GetInstance(iccStream);
+                return GetIccProfileStream(iccProfile);
+            }
+
+            public static PdfStream GetIccProfileStream(Stream iccStream, float[] range) {
+                IccProfile iccProfile = IccProfile.GetInstance(iccStream);
+                return GetIccProfileStream(iccProfile, range);
+            }
+
+            public static PdfStream GetIccProfileStream(IccProfile iccProfile) {
                 PdfStream stream = new PdfStream(iccProfile.GetData());
                 stream.Put(PdfName.N, new PdfNumber(iccProfile.GetNumComponents()));
                 switch (iccProfile.GetNumComponents()) {
@@ -230,8 +239,8 @@ public static PdfStream GetIccProfileStream(Stream iccStream) {
                 return stream;
             }
 
-            public static PdfStream GetIccProfileStream(Stream iccStream, float[] range) {
-                PdfStream stream = GetIccProfileStream(iccStream);
+            public static PdfStream GetIccProfileStream(IccProfile iccProfile, float[] range) {
+                PdfStream stream = GetIccProfileStream(iccProfile);
                 stream.Put(PdfName.Range, new PdfArray(range));
                 return stream;
             }
diff --git a/itext/itext.kernel/itext/kernel/pdf/xobject/PdfImageXObject.cs b/itext/itext.kernel/itext/kernel/pdf/xobject/PdfImageXObject.cs
@@ -44,11 +44,14 @@ source product.
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Common.Logging;
 using iText.IO.Codec;
+using iText.IO.Colors;
 using iText.IO.Image;
 using iText.Kernel;
 using iText.Kernel.Pdf;
 using iText.Kernel.Pdf.Canvas.Wmf;
+using iText.Kernel.Pdf.Colorspace;
 using iText.Kernel.Pdf.Filters;
 
 namespace iText.Kernel.Pdf.Xobject {
@@ -403,6 +406,58 @@ private static PdfStream CreatePdfStream(ImageData image, iText.Kernel.Pdf.Xobje
             if (additional != null) {
                 stream.PutAll(additional);
             }
+            IccProfile iccProfile = image.GetProfile();
+            if (iccProfile != null) {
+                PdfStream iccProfileStream = PdfCieBasedCs.IccBased.GetIccProfileStream(iccProfile);
+                PdfArray iccBasedColorSpace = new PdfArray();
+                iccBasedColorSpace.Add(PdfName.ICCBased);
+                iccBasedColorSpace.Add(iccProfileStream);
+                PdfObject colorSpaceObject = stream.Get(PdfName.ColorSpace);
+                bool iccProfileShouldBeApplied = true;
+                if (colorSpaceObject != null) {
+                    PdfColorSpace cs = PdfColorSpace.MakeColorSpace(colorSpaceObject);
+                    if (cs == null) {
+                        LogManager.GetLogger(typeof(iText.Kernel.Pdf.Xobject.PdfImageXObject)).Error(iText.IO.LogMessageConstant.IMAGE_HAS_INCORRECT_OR_UNSUPPORTED_COLOR_SPACE_OVERRIDDEN_BY_ICC_PROFILE
+                            );
+                    }
+                    else {
+                        if (cs is PdfSpecialCs.Indexed) {
+                            PdfColorSpace baseCs = ((PdfSpecialCs.Indexed)cs).GetBaseCs();
+                            if (baseCs == null) {
+                                LogManager.GetLogger(typeof(iText.Kernel.Pdf.Xobject.PdfImageXObject)).Error(iText.IO.LogMessageConstant.IMAGE_HAS_INCORRECT_OR_UNSUPPORTED_BASE_COLOR_SPACE_IN_INDEXED_COLOR_SPACE_OVERRIDDEN_BY_ICC_PROFILE
+                                    );
+                            }
+                            else {
+                                if (baseCs.GetNumberOfComponents() != iccProfile.GetNumComponents()) {
+                                    LogManager.GetLogger(typeof(iText.Kernel.Pdf.Xobject.PdfImageXObject)).Error(iText.IO.LogMessageConstant.IMAGE_HAS_ICC_PROFILE_WITH_INCOMPATIBLE_NUMBER_OF_COLOR_COMPONENTS_COMPARED_TO_BASE_COLOR_SPACE_IN_INDEXED_COLOR_SPACE
+                                        );
+                                    iccProfileShouldBeApplied = false;
+                                }
+                                else {
+                                    iccProfileStream.Put(PdfName.Alternate, baseCs.GetPdfObject());
+                                }
+                            }
+                            if (iccProfileShouldBeApplied) {
+                                ((PdfArray)colorSpaceObject).Set(1, iccBasedColorSpace);
+                                iccProfileShouldBeApplied = false;
+                            }
+                        }
+                        else {
+                            if (cs.GetNumberOfComponents() != iccProfile.GetNumComponents()) {
+                                LogManager.GetLogger(typeof(iText.Kernel.Pdf.Xobject.PdfImageXObject)).Error(iText.IO.LogMessageConstant.IMAGE_HAS_ICC_PROFILE_WITH_INCOMPATIBLE_NUMBER_OF_COLOR_COMPONENTS_COMPARED_TO_COLOR_SPACE
+                                    );
+                                iccProfileShouldBeApplied = false;
+                            }
+                            else {
+                                iccProfileStream.Put(PdfName.Alternate, colorSpaceObject);
+                            }
+                        }
+                    }
+                }
+                if (iccProfileShouldBeApplied) {
+                    stream.Put(PdfName.ColorSpace, iccBasedColorSpace);
+                }
+            }
             if (image.IsMask() && (image.GetBpc() == 1 || image.GetBpc() > 0xff)) {
                 stream.Put(PdfName.ImageMask, PdfBoolean.TRUE);
             }
diff --git a/port-hash b/port-hash
@@ -1 +1 @@
-58207a6e0bf46d2d6333a2e8e44db4df58f7052b
+a5af1aab7f5ff1918972fc3e2c5246040ccbf1f5

Original file line number	Diff line number	Diff line change
`@@ -524,6 +524,8 @@ public virtual void PngImageColorProfileTest() {`
`524`	`524`	`/// <exception cref="System.IO.IOException"/>`
`525`	`525`	`/// <exception cref="System.Exception"/>`
`526`	`526`	`[NUnit.Framework.Test]`
	`527`	`+ [LogMessage(iText.IO.LogMessageConstant.PNG_IMAGE_HAS_ICC_PROFILE_WITH_INCOMPATIBLE_NUMBER_OF_COLOR_COMPONENTS`
	`528`	`+ )]`
`527`	`529`	`public virtual void PngImageIncorrectColorProfileTest() {`
`528`	`530`	`SimpleImageTest("pngIncorrectColorProfileTest.pdf", "png-incorrect-color-profile-test.png");`
`529`	`531`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-58207a6e0bf46d2d6333a2e8e44db4df58f7052b`
	`1`	`+a5af1aab7f5ff1918972fc3e2c5246040ccbf1f5`