1- // Licensed to the .NET Foundation under one or more agreements.
1+ // Licensed to the .NET Foundation under one or more agreements.
22// The .NET Foundation licenses this file to you under the MIT license.
33
4+ #nullable enable
5+
46// Description: Helper methods for code that uses types from System.Drawing.
57
68using System ;
1517namespace MS . Internal
1618{
1719 //FxCop can't tell that this class is instantiated via reflection, so suppress the FxCop warning.
18- [ SuppressMessage ( "Microsoft.Performance" , "CA1812:AvoidUninstantiatedInternalClasses" ) ]
20+ [ SuppressMessage ( "Microsoft.Performance" , "CA1812:AvoidUninstantiatedInternalClasses" ) ]
1921 internal class SystemDrawingExtension : SystemDrawingExtensionMethods
2022 {
21- // return true if the data is a bitmap
22- internal override bool IsBitmap ( object data )
23- {
24- return data is Bitmap ;
25- }
23+ internal override bool IsBitmap ( object ? data ) => data is Bitmap ;
2624
27- // return true if the data is an Image
28- internal override bool IsImage ( object data )
29- {
30- return data is Image ;
31- }
25+ internal override bool IsImage ( object ? data ) => data is Image ;
3226
33- // return true if the data is a graphics metafile
34- internal override bool IsMetafile ( object data )
35- {
36- return data is Metafile ;
37- }
27+ internal override bool IsMetafile ( object ? data ) => data is Metafile ;
3828
39- // return the handle from a metafile
40- internal override IntPtr GetHandleFromMetafile ( Object data )
29+ internal override nint GetHandleFromMetafile ( object ? data ) => data switch
4130 {
42- IntPtr hMetafile = IntPtr . Zero ;
43- Metafile metafile = data as Metafile ;
31+ Metafile metafile => metafile . GetHenhmetafile ( ) ,
32+ _ => 0
33+ } ;
4434
45- if ( metafile != null )
46- {
47- // Get the Windows handle from the metafile object.
48- hMetafile = metafile . GetHenhmetafile ( ) ;
49- }
35+ internal override object GetMetafileFromHemf ( nint hMetafile ) => new Metafile ( hMetafile , deleteEmf : false ) ;
5036
51- return hMetafile ;
52- }
37+ internal override object ? GetBitmap ( object ? data ) => GetBitmapImpl ( data ) ;
5338
54- // Get the metafile from the handle of the enhanced metafile.
55- internal override Object GetMetafileFromHemf ( IntPtr hMetafile )
39+ internal override nint GetHBitmap ( object ? data , out int width , out int height )
5640 {
57- return new Metafile ( hMetafile , false ) ;
58- }
41+ Bitmap ? bitmapData = GetBitmapImpl ( data ) ;
5942
60- // Get a bitmap from the given data (either BitmapSource or Bitmap)
61- internal override object GetBitmap ( object data )
62- {
63- return GetBitmapImpl ( data ) ;
64- }
65-
66- // Get a bitmap handle from the given data (either BitmapSource or Bitmap)
67- // Also return its width and height.
68- internal override IntPtr GetHBitmap ( object data , out int width , out int height )
69- {
70- Bitmap bitmapData = GetBitmapImpl ( data ) ;
71-
72- if ( bitmapData == null )
43+ if ( bitmapData is null )
7344 {
7445 width = height = 0 ;
7546 return IntPtr . Zero ;
@@ -83,54 +54,48 @@ internal override IntPtr GetHBitmap(object data, out int width, out int height)
8354 return bitmapData . GetHbitmap ( ) ;
8455 }
8556
86- // Get a bitmap handle from a Bitmap
87- internal override IntPtr GetHBitmapFromBitmap ( object data )
88- {
89- Bitmap bitmap = data as Bitmap ;
90- return ( bitmap != null ) ? bitmap . GetHbitmap ( ) : IntPtr . Zero ;
91- }
57+ internal override nint GetHBitmapFromBitmap ( object ? data ) => data is Bitmap bitmap ? bitmap . GetHbitmap ( ) : 0 ;
9258
93- // Convert a metafile to HBitmap
94- internal override IntPtr ConvertMetafileToHBitmap ( IntPtr handle )
59+ internal override nint ConvertMetafileToHBitmap ( nint handle )
9560 {
96- Metafile metafile = new Metafile ( handle , false ) ;
61+ Metafile metafile = new ( handle , deleteEmf : false ) ;
9762
9863 // Initialize the bitmap size to render the metafile.
9964 int bitmapheight = metafile . Size . Height ;
100- int bitmapwidth = metafile . Size . Width ;
65+ int bitmapwidth = metafile . Size . Width ;
10166
10267 // We use System.Drawing to render metafile into the bitmap.
10368 Bitmap bmp = new Bitmap ( bitmapwidth , bitmapheight ) ;
10469 Graphics graphics = Graphics . FromImage ( bmp ) ;
105- // graphics.FillRectangle(new System.Drawing.SolidBrush(System.Drawing.Color.White), 0, 0, bitmapwidth, bitmapheight);
10670 graphics . DrawImage ( metafile , 0 , 0 , bitmapwidth , bitmapheight ) ;
10771
10872 return bmp . GetHbitmap ( ) ;
10973 }
11074
111- // return a stream for the ExifUserComment in the given Gif
11275 internal override Stream GetCommentFromGifStream ( Stream stream )
11376 {
114- // Read the GIF header ...
115- Bitmap img = new Bitmap ( stream ) ;
116- // Read the comment as that is where the ISF is stored...
117- // for reference the tag is PropertyTagExifUserComment [0x9286] or 37510 (int)
118- PropertyItem piComment = img . GetPropertyItem ( 37510 ) ;
119- return new MemoryStream ( piComment . Value ) ;
77+ // Read the GIF header
78+ Bitmap bitmap = new ( stream ) ;
79+
80+ // Read the comment as that is where the ISF is stored.
81+ // For reference the tag is PropertyTagExifUserComment [0x9286] or 37510 (int)
82+ PropertyItem ? piComment = bitmap . GetPropertyItem ( 37510 ) ;
83+
84+ // Want to make this throw in the same way it used to for now. It would be good
85+ // to redo this to return null and handle the null case in the various callers.
86+ return new MemoryStream ( piComment ! . Value ! ) ;
12087 }
12188
122- // write a metafile stream to the output stream in PNG format
12389 internal override void SaveMetafileToImageStream ( MemoryStream metafileStream , Stream imageStream )
12490 {
125- Metafile metafile = new Metafile ( metafileStream ) ;
91+ Metafile metafile = new ( metafileStream ) ;
12692 metafile . Save ( imageStream , ImageFormat . Png ) ;
12793 }
12894
12995 // Get a bitmap from the given data (either BitmapSource or Bitmap)
130- private static Bitmap GetBitmapImpl ( object data )
96+ private static Bitmap ? GetBitmapImpl ( object ? data )
13197 {
132- BitmapSource bitmapSource = data as BitmapSource ;
133- if ( bitmapSource != null )
98+ if ( data is BitmapSource bitmapSource )
13499 {
135100 // Convert BitmapSource to System.Drawing.Bitmap to get Win32 HBITMAP.
136101 BitmapEncoder bitmapEncoder ;
@@ -151,23 +116,18 @@ private static Bitmap GetBitmapImpl(object data)
151116 }
152117 }
153118
154- //returns bitmap snapshot of selected area
155- //this code takes a BitmapImage and converts it to a Bitmap so it can be put on the clipboard
156119 internal override object GetBitmapFromBitmapSource ( object source )
157120 {
158121 BitmapSource contentImage = ( BitmapSource ) source ;
159122 int imageWidth = ( int ) contentImage . Width ;
160123 int imageHeight = ( int ) contentImage . Height ;
161124
162- Bitmap bitmapFinal = new Bitmap (
163- imageWidth ,
164- imageHeight ,
165- System . Drawing . Imaging . PixelFormat . Format32bppRgb ) ;
125+ Bitmap bitmapFinal = new ( imageWidth , imageHeight , PixelFormat . Format32bppRgb ) ;
166126
167127 BitmapData bmData = bitmapFinal . LockBits (
168- new Rectangle ( 0 , 0 , imageWidth , imageHeight ) ,
169- ImageLockMode . WriteOnly ,
170- System . Drawing . Imaging . PixelFormat . Format32bppRgb ) ;
128+ new Rectangle ( 0 , 0 , imageWidth , imageHeight ) ,
129+ ImageLockMode . WriteOnly ,
130+ PixelFormat . Format32bppRgb ) ;
171131
172132 FormatConvertedBitmap formatConverter = new FormatConvertedBitmap ( ) ;
173133 formatConverter . BeginInit ( ) ;
@@ -176,10 +136,10 @@ internal override object GetBitmapFromBitmapSource(object source)
176136 formatConverter . EndInit ( ) ;
177137
178138 formatConverter . CopyPixels (
179- new Int32Rect ( 0 , 0 , imageWidth , imageHeight ) ,
180- bmData . Scan0 ,
181- bmData . Stride * ( bmData . Height - 1 ) + ( bmData . Width * 4 ) ,
182- bmData . Stride ) ;
139+ new Int32Rect ( 0 , 0 , imageWidth , imageHeight ) ,
140+ bmData . Scan0 ,
141+ bmData . Stride * ( bmData . Height - 1 ) + ( bmData . Width * 4 ) ,
142+ bmData . Stride ) ;
183143
184144 bitmapFinal . UnlockBits ( bmData ) ;
185145
0 commit comments