mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.8.0.22

Browse Source 
Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mcs/class/System.Drawing/System.Drawing.Text/PrivateFontCollection.cs
View File

@ -40,7 +40,7 @@ namespace System.Drawing.Text {
public PrivateFontCollection ()
{
Status status = GDIPlus.GdipNewPrivateFontCollection (out nativeFontCollection);
Status status = GDIPlus.GdipNewPrivateFontCollection (out _nativeFontCollection);
GDIPlus.CheckStatus (status);
}
@ -57,27 +57,27 @@ namespace System.Drawing.Text {
throw new FileNotFoundException ();
// note: MS throw the same exception FileNotFoundException if the file exists but isn't a valid font file
Status status = GDIPlus.GdipPrivateAddFontFile (nativeFontCollection, fname);
Status status = GDIPlus.GdipPrivateAddFontFile (_nativeFontCollection, fname);
GDIPlus.CheckStatus (status);
}
public void AddMemoryFont (IntPtr memory, int length)
{
// note: MS throw FileNotFoundException if something is bad with the data (except for a null pointer)
Status status = GDIPlus.GdipPrivateAddMemoryFont (nativeFontCollection, memory, length);
Status status = GDIPlus.GdipPrivateAddMemoryFont (_nativeFontCollection, memory, length);
GDIPlus.CheckStatus (status);
}
// methods
protected override void Dispose (bool disposing)
{
if (nativeFontCollection!=IntPtr.Zero) {
GDIPlus.GdipDeletePrivateFontCollection (ref nativeFontCollection);
if (_nativeFontCollection!=IntPtr.Zero) {
GDIPlus.GdipDeletePrivateFontCollection (ref _nativeFontCollection);
// This must be zeroed out, otherwise our base will also call
// the GDI+ delete method on unix platforms. We're keeping the
// base.Dispose() call in case other cleanup ever gets added there
nativeFontCollection = IntPtr.Zero;
_nativeFontCollection = IntPtr.Zero;
}
base.Dispose (disposing);