Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions

View File

@ -299,6 +299,9 @@ namespace System.Drawing.Printing
CUPS_OPTIONS cups_options;
string option_name, option_value;
int cups_size = Marshal.SizeOf(typeof(CUPS_OPTIONS));
LoadOptionList (ppd, "PageSize", paper_names, out defsize);
LoadOptionList (ppd, "InputSlot", paper_sources, out defsource);
for (int j = 0; j < numOptions; j++)
{
@ -306,6 +309,8 @@ namespace System.Drawing.Printing
option_name = Marshal.PtrToStringAnsi(cups_options.name);
option_value = Marshal.PtrToStringAnsi(cups_options.val);
if (option_name == "PageSize") defsize = option_value;
else if (option_name == "InputSlot") defsource = option_value;
#if PrintDebug
Console.WriteLine("{0} = {1}", option_name, option_value);
#endif
@ -314,9 +319,6 @@ namespace System.Drawing.Printing
options = (IntPtr) ((long)options + cups_size);
}
LoadOptionList (ppd, "PageSize", paper_names, out defsize);
LoadOptionList (ppd, "InputSlot", paper_sources, out defsource);
}
/// <summary>