Clean up unused locals in System.Drawing.Common (dotnet#32212)

nxtn · web-flow · commit 1cf033de96a3 · 2020-03-13T10:49:09.000-04:00
* Clean up unused locals in System.Drawing.Common

* Remove BufferedStream, use MemoryStream.ToArray()
diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Pen.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Pen.cs
@@ -585,7 +585,9 @@ public Color Color
 
                 if (value != _color)
                 {
+#if FEATURE_SYSTEM_EVENTS
                     Color oldColor = _color;
+#endif
                     _color = value;
                     InternalSetColor(value);
 
diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Windows.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Windows.cs
@@ -480,33 +480,27 @@ public bool IsDirectPrintingSupported(Image image)
                 try
                 {
                     image.Save(stream, image.RawFormat);
-                    stream.Position = 0;
-                    using (BufferedStream inStream = new BufferedStream(stream))
-                    {
-                        int pvImageLen = (int)inStream.Length;
-                        byte[] pvImage = new byte[pvImageLen];
 
-                        int nRead = inStream.Read(pvImage, 0, (int)pvImageLen);
+                    byte[] pvImage = stream.ToArray();
 
-                        int nEscape = image.RawFormat.Equals(ImageFormat.Jpeg) ? SafeNativeMethods.CHECKJPEGFORMAT : SafeNativeMethods.CHECKPNGFORMAT;
-                        int outData = 0;
+                    int nEscape = image.RawFormat.Equals(ImageFormat.Jpeg) ? SafeNativeMethods.CHECKJPEGFORMAT : SafeNativeMethods.CHECKPNGFORMAT;
+                    int outData = 0;
 
-                        DeviceContext dc = CreateInformationContext(DefaultPageSettings);
-                        HandleRef hdc = new HandleRef(dc, dc.Hdc);
-                        try
-                        {
-                            bool querySupported = SafeNativeMethods.ExtEscape(hdc, SafeNativeMethods.QUERYESCSUPPORT, sizeof(int), ref nEscape, 0, out outData) > 0;
-                            if (querySupported)
-                            {
-                                isDirectPrintingSupported = (SafeNativeMethods.ExtEscape(hdc, nEscape, pvImageLen, pvImage, sizeof(int), out outData) > 0)
-                                                            && (outData == 1);
-                            }
-                        }
-                        finally
+                    DeviceContext dc = CreateInformationContext(DefaultPageSettings);
+                    HandleRef hdc = new HandleRef(dc, dc.Hdc);
+                    try
+                    {
+                        bool querySupported = SafeNativeMethods.ExtEscape(hdc, SafeNativeMethods.QUERYESCSUPPORT, sizeof(int), ref nEscape, 0, out outData) > 0;
+                        if (querySupported)
                         {
-                            dc.Dispose();
+                            isDirectPrintingSupported = (SafeNativeMethods.ExtEscape(hdc, nEscape, pvImage.Length, pvImage, sizeof(int), out outData) > 0)
+                                                        && (outData == 1);
                         }
                     }
+                    finally
+                    {
+                        dc.Dispose();
+                    }
                 }
                 finally
                 {
diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/SolidBrush.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/SolidBrush.cs
@@ -102,7 +102,9 @@ public Color Color
 
                 if (_color != value)
                 {
+#if FEATURE_SYSTEM_EVENTS
                     Color oldColor = _color;
+#endif
                     InternalSetColor(value);
 
 #if FEATURE_SYSTEM_EVENTS

Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,9 @@ public Color Color`
`585`	`585`
`586`	`586`	`if (value != _color)`
`587`	`587`	`{`
	`588`	`+#if FEATURE_SYSTEM_EVENTS`
`588`	`589`	`Color oldColor = _color;`
	`590`	`+#endif`
`589`	`591`	`_color = value;`
`590`	`592`	`InternalSetColor(value);`
`591`	`593`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,9 @@ public Color Color`
`102`	`102`
`103`	`103`	`if (_color != value)`
`104`	`104`	`{`
	`105`	`+#if FEATURE_SYSTEM_EVENTS`
`105`	`106`	`Color oldColor = _color;`
	`107`	`+#endif`
`106`	`108`	`InternalSetColor(value);`
`107`	`109`
`108`	`110`	`#if FEATURE_SYSTEM_EVENTS`