Update System.Drawing to reflect GDI+ changes (#32873)

* Update System.Drawing to reflect GDI+ changes - Add support ValueTypePointer encoder parameters - Support ColorSpace, ImageItems and SaveAsCmyk encoders * Skip test on NetFx * Add XML documentation
dotnet · Mar 19, 2020 · e3fd0e0 · e3fd0e0
1 parent a6f805d
commit e3fd0e0
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 1 deletion.
diff --git a/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.cs b/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.cs
@@ -2105,6 +2105,9 @@ public sealed partial class Encoder
         public static readonly System.Drawing.Imaging.Encoder ScanMethod;
         public static readonly System.Drawing.Imaging.Encoder Transformation;
         public static readonly System.Drawing.Imaging.Encoder Version;
+        public static readonly System.Drawing.Imaging.Encoder ColorSpace;
+        public static readonly System.Drawing.Imaging.Encoder ImageItems;
+        public static readonly System.Drawing.Imaging.Encoder SaveAsCmyk;
         public Encoder(System.Guid guid) { }
         public System.Guid Guid { get { throw null; } }
     }
@@ -2152,6 +2155,7 @@ public enum EncoderParameterValueType
         ValueTypeLongRange = 6,
         ValueTypeUndefined = 7,
         ValueTypeRationalRange = 8,
+        ValueTypePointer = 9,
     }
     public enum EncoderValue
     {

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/Encoder.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/Encoder.cs
@@ -17,6 +17,21 @@ public sealed class Encoder
         public static readonly Encoder ChrominanceTable = new Encoder(new Guid(unchecked((int)0xf2e455dc), unchecked((short)0x09b3), unchecked((short)0x4316), new byte[] { 0x82, 0x60, 0x67, 0x6a, 0xda, 0x32, 0x48, 0x1c }));
         public static readonly Encoder SaveFlag = new Encoder(new Guid(unchecked((int)0x292266fc), unchecked((short)0xac40), unchecked((short)0x47bf), new byte[] { 0x8c, 0xfc, 0xa8, 0x5b, 0x89, 0xa6, 0x55, 0xde }));
 
+        /// <summary>
+        /// An <see cref="Encoder" /> object that is initialized with the globally unique identifier for the color space category.
+        /// </summary>
+        public static readonly Encoder ColorSpace = new Encoder(new Guid(unchecked((int)0xae7a62a0), unchecked((short)0xee2c), unchecked((short)0x49d8), new byte[] { 0x9d, 0x07, 0x1b, 0xa8, 0xa9, 0x27, 0x59, 0x6e }));
+
+        /// <summary>
+        /// An <see cref="Encoder" /> object that is initialized with the globally unique identifier for the image items category.
+        /// </summary>
+        public static readonly Encoder ImageItems = new Encoder(new Guid(unchecked((int)0x63875e13), unchecked((short)0x1f1d), unchecked((short)0x45ab), new byte[] { 0x91, 0x95, 0xa2, 0x9b, 0x60, 0x66, 0xa6, 0x50 }));
+
+        /// <summary>
+        /// An <see cref="Encoder" /> object that is initialized with the globally unique identifier for the save as CMYK category.
+        /// </summary>
+        public static readonly Encoder SaveAsCmyk = new Encoder(new Guid(unchecked((int)0xa219bbc9), unchecked((short)0x0a9d), unchecked((short)0x4005), new byte[] { 0xa3, 0xee, 0x3a, 0x42, 0x1b, 0x8b, 0xb0, 0x6c }));
+
         private Guid _guid;
 
         public Encoder(Guid guid)

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/EncoderParameter.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/EncoderParameter.cs
@@ -381,6 +381,9 @@ public EncoderParameter(Encoder encoder, int numberValues, EncoderParameterValue
                 case EncoderParameterValueType.ValueTypeRationalRange:
                     size = 2 * 2 * 4;
                     break;
+                case EncoderParameterValueType.ValueTypePointer:
+                    size = IntPtr.Size;
+                    break;
                 default:
                     throw Gdip.StatusException(Gdip.WrongState);
             }

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/EncoderParameterValueType.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/EncoderParameterValueType.cs
@@ -44,6 +44,10 @@ public enum EncoderParameterValueType
         /// Two Rationals. The first Rational specifies the lower end and the second specifies the higher end.
         /// All values are inclusive at both ends
         /// </summary>
-        ValueTypeRationalRange = 8
+        ValueTypeRationalRange = 8,
+        /// <summary>
+        /// The parameter is a pointer to a block of custom metadata.
+        /// </summary>
+        ValueTypePointer = 9,
     }
 }
diff --git a/src/libraries/System.Drawing.Common/tests/ImageTests.cs b/src/libraries/System.Drawing.Common/tests/ImageTests.cs
@@ -157,6 +157,23 @@ public static IEnumerable<object[]> GetEncoderParameterList_ReturnsExpected_Test
                     new Guid(unchecked((int)0xa219bbc9), unchecked((short)0x0a9d), unchecked((short)0x4005), new byte[] { 0xa3, 0xee, 0x3a, 0x42, 0x1b, 0x8b, 0xb0, 0x6c }) /* Encoder.SaveAsCmyk.Guid */
                 }
             };
+
+#if !NETFRAMEWORK
+            // NetFX doesn't support pointer-type encoder parameters, and doesn't define Encoder.ImageItems. Skip this test
+            // on NetFX.
+            yield return new object[]
+            {
+                ImageFormat.Jpeg,
+                new Guid[]
+                {
+                    Encoder.Transformation.Guid,
+                    Encoder.Quality.Guid,
+                    Encoder.LuminanceTable.Guid,
+                    Encoder.ChrominanceTable.Guid,
+                    Encoder.ImageItems.Guid
+                }
+            };
+#endif
         }
 
         [ActiveIssue("https://github.com/dotnet/runtime/issues/22221", TestPlatforms.AnyUnix)]