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

Imported Upstream version 6.12.0.86

Browse Source 
Former-commit-id: 7a84ce7d08c42c458ac8e74b27186ca863315d79
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2020-07-10 08:44:59 +00:00
parent 92747312ea
commit 0b380204a4
812 changed files with 26901 additions and 9053 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mcs/class/System.Windows.Forms/System.Windows.Forms.RTF/Picture.cs
View File

@@ -66,7 +66,7 @@ namespace System.Windows.Forms.RTF {
public float Width {
get {
float w = width;
if (w == -1) {
if (w < 0) {
if (image == null)
image = ToImage ();
w = image.Width;
@@ -79,7 +79,7 @@ namespace System.Windows.Forms.RTF {
public float Height {
get {
float h = height;
if (h == -1) {
if (h < 0) {
if (image == null)
image = ToImage ();
h = image.Height;
@@ -113,7 +113,9 @@ namespace System.Windows.Forms.RTF {
return false;
switch (image_type) {
case Minor.PngBlip:
case Minor.JpegBlip:
case Minor.WinMetafile:
case Minor.EnhancedMetafile:
break;
default:
return false;
@@ -126,15 +128,7 @@ namespace System.Windows.Forms.RTF {
{
if (image == null)
image = ToImage ();
float height = this.height;
float width = this.width;
if (height == -1)
height = image.Height;
if (width == -1)
width = image.Width;
dc.DrawImage (image, x, y, width, height);
dc.DrawImage (image, x, y, Width, Height);
}
public Image ToImage ()