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

Imported Upstream version 5.2.0.175

Browse Source 
Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
mcs/class/System.Drawing/System.Drawing.Imaging/ColorMatrix.cs
View File

@@ -77,33 +77,33 @@ namespace System.Drawing.Imaging
}
[CLSCompliant(false)]
public ColorMatrix (float[][] matrix)
public ColorMatrix (float[][] newColorMatrix)
{
color00 = matrix [0][0];
color01 = matrix [0][1];
color02 = matrix [0][2];
color03 = matrix [0][3];
color04 = matrix [0][4];
color10 = matrix [1][0];
color11 = matrix [1][1];
color12 = matrix [1][2];
color13 = matrix [1][3];
color14 = matrix [1][4];
color20 = matrix [2][0];
color21 = matrix [2][1];
color22 = matrix [2][2];
color23 = matrix [2][3];
color24 = matrix [2][4];
color30 = matrix [3][0];
color31 = matrix [3][1];
color32 = matrix [3][2];
color33 = matrix [3][3];
color34 = matrix [3][4];
color40 = matrix [4][0];
color41 = matrix [4][1];
color42 = matrix [4][2];
color43 = matrix [4][3];
color44 = matrix [4][4];
color00 = newColorMatrix [0][0];
color01 = newColorMatrix [0][1];
color02 = newColorMatrix [0][2];
color03 = newColorMatrix [0][3];
color04 = newColorMatrix [0][4];
color10 = newColorMatrix [1][0];
color11 = newColorMatrix [1][1];
color12 = newColorMatrix [1][2];
color13 = newColorMatrix [1][3];
color14 = newColorMatrix [1][4];
color20 = newColorMatrix [2][0];
color21 = newColorMatrix [2][1];
color22 = newColorMatrix [2][2];
color23 = newColorMatrix [2][3];
color24 = newColorMatrix [2][4];
color30 = newColorMatrix [3][0];
color31 = newColorMatrix [3][1];
color32 = newColorMatrix [3][2];
color33 = newColorMatrix [3][3];
color34 = newColorMatrix [3][4];
color40 = newColorMatrix [4][0];
color41 = newColorMatrix [4][1];
color42 = newColorMatrix [4][2];
color43 = newColorMatrix [4][3];
color44 = newColorMatrix [4][4];
}
// properties

12
mcs/class/System.Drawing/System.Drawing.Imaging/EncoderParameter.cs
View File

@@ -198,21 +198,21 @@ namespace System.Drawing.Imaging {
}
}
public EncoderParameter (Encoder encoder, int numberOfValues, int type, int value)
public EncoderParameter (Encoder encoder, int NumberOfValues, int Type, int Value)
{
this.encoder = encoder;
this.valuePtr = (IntPtr) value;
this.valuesCount = numberOfValues;
this.type = (EncoderParameterValueType) type;
this.valuePtr = (IntPtr) Value;
this.valuesCount = NumberOfValues;
this.type = (EncoderParameterValueType) Type;
}
public EncoderParameter (Encoder encoder, int numerator1, int denominator1, int numerator2, int denominator2)
public EncoderParameter (Encoder encoder, int numerator1, int demoninator1, int numerator2, int demoninator2)
{
this.encoder = encoder;
this.valuesCount = 1;
this.type = EncoderParameterValueType.ValueTypeRationalRange;
this.valuePtr = Marshal.AllocHGlobal (4 * 4);
int [] valuearray = { numerator1, denominator1, numerator2, denominator2 };
int [] valuearray = { numerator1, demoninator1, numerator2, demoninator2 };
Marshal.Copy (valuearray, 0, this.valuePtr, 4);
}

18
mcs/class/System.Drawing/System.Drawing.Imaging/ImageAttributes.cs
View File

@@ -160,22 +160,22 @@ namespace System.Drawing.Imaging {
SetColorKey (colorLow, colorHigh, ColorAdjustType.Default);
}
public void SetColorMatrix (ColorMatrix colorMatrix)
public void SetColorMatrix (ColorMatrix newColorMatrix)
{
SetColorMatrix (colorMatrix, ColorMatrixFlag.Default, ColorAdjustType.Default);
SetColorMatrix (newColorMatrix, ColorMatrixFlag.Default, ColorAdjustType.Default);
}
public void SetColorMatrix (ColorMatrix colorMatrix, ColorMatrixFlag colorMatrixFlag)
public void SetColorMatrix (ColorMatrix newColorMatrix, ColorMatrixFlag flags)
{
SetColorMatrix (colorMatrix, colorMatrixFlag, ColorAdjustType.Default);
SetColorMatrix (newColorMatrix, flags, ColorAdjustType.Default);
}
public void SetColorMatrix (ColorMatrix colorMatrix, ColorMatrixFlag colorMatrixFlag, ColorAdjustType colorAdjustType)
public void SetColorMatrix (ColorMatrix newColorMatrix, ColorMatrixFlag mode, ColorAdjustType type)
{
IntPtr cm = ColorMatrix.Alloc (colorMatrix);
IntPtr cm = ColorMatrix.Alloc (newColorMatrix);
try {
Status status = GDIPlus.GdipSetImageAttributesColorMatrix (nativeImageAttr,
colorAdjustType, true, cm, IntPtr.Zero, colorMatrixFlag);
type, true, cm, IntPtr.Zero, mode);
GDIPlus.CheckStatus (status);
}
finally {
@@ -294,9 +294,9 @@ namespace System.Drawing.Imaging {
SetGamma (gamma, ColorAdjustType.Default);
}
public void SetGamma (float gamma, ColorAdjustType coloradjust)
public void SetGamma (float gamma, ColorAdjustType type)
{
Status status = GDIPlus.GdipSetImageAttributesGamma (nativeImageAttr, coloradjust, true, gamma);
Status status = GDIPlus.GdipSetImageAttributesGamma (nativeImageAttr, type, true, gamma);
GDIPlus.CheckStatus (status);
}

12
mcs/class/System.Drawing/System.Drawing.Imaging/Metafile.cs
View File

@@ -220,10 +220,10 @@ namespace System.Drawing.Imaging {
}
public Metafile (IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit, EmfType type,
string description)
string desc)
{
Status status = GDIPlus.GdipRecordMetafileI (referenceHdc, type, ref frameRect, frameUnit,
description, out nativeObject);
desc, out nativeObject);
GDIPlus.CheckStatus (status);
}
@@ -261,8 +261,8 @@ namespace System.Drawing.Imaging {
}
public Metafile (string fileName, IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit,
string description) : this (fileName, referenceHdc, frameRect, frameUnit, EmfType.EmfPlusDual,
description)
string desc) : this (fileName, referenceHdc, frameRect, frameUnit, EmfType.EmfPlusDual,
desc)
{
}
@@ -405,11 +405,11 @@ namespace System.Drawing.Imaging {
}
[MonoLimitation ("Metafiles aren't only partially supported by libgdiplus.")]
public static MetafileHeader GetMetafileHeader (IntPtr henhmetafile, WmfPlaceableFileHeader wmfHeader)
public static MetafileHeader GetMetafileHeader (IntPtr hmetafile, WmfPlaceableFileHeader wmfHeader)
{
IntPtr header = Marshal.AllocHGlobal (Marshal.SizeOf (typeof (MetafileHeader)));
try {
Status status = GDIPlus.GdipGetMetafileHeaderFromEmf (henhmetafile, header);
Status status = GDIPlus.GdipGetMetafileHeaderFromEmf (hmetafile, header);
GDIPlus.CheckStatus (status);
return new MetafileHeader (header);
}