Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Fix multiplying TextureBrush with a disposed matrix on Unix #24109

Merged
merged 3 commits into from
Sep 19, 2017
Merged

Fix multiplying TextureBrush with a disposed matrix on Unix #24109

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2dcef75
Fix multiplying TextureBrush with a disposed matrix on Unix
hughbe Sep 17, 2017
3cadee4
Enable another passing test
hughbe Sep 18, 2017
e7015c7
Fix accidentally committed file
hughbe Sep 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/System.Drawing.Common/src/System/Drawing/TextureBrush.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ public Matrix Transform
{
if (value == null)
{
throw new ArgumentNullException("value");
throw new ArgumentNullException(nameof(value));
}

int status = SafeNativeMethods.Gdip.GdipSetTextureTransform(new HandleRef(this, NativeBrush), new HandleRef(value, value.nativeMatrix));
Expand Down Expand Up @@ -225,6 +225,13 @@ public void MultiplyTransform(Matrix matrix, MatrixOrder order)
throw new ArgumentNullException(nameof(matrix));
}

// Multiplying the transform by a disposed matrix is a nop in GDI+, but throws
// with the libgdiplus backend. Simulate a nop for compatability with GDI+.
if (matrix.nativeMatrix == IntPtr.Zero)
{
return;
}

int status = SafeNativeMethods.Gdip.GdipMultiplyTextureTransform(new HandleRef(this, NativeBrush),
new HandleRef(matrix, matrix.nativeMatrix),
order);
Expand Down
3 changes: 2 additions & 1 deletion src/System.Drawing.Common/tests/Helpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,14 @@ public static bool GetGdiplusIsAvailable()
}
else
{
return true;/*
Copy link
Contributor

@mellinoe mellinoe Sep 19, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we undo this before merging?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oof, sorry

IntPtr nativeLib = dlopen("libgdiplus.so", RTLD_NOW);
if (nativeLib == IntPtr.Zero)
{
nativeLib = dlopen("libgdiplus.so.0", RTLD_NOW);
}

return nativeLib != IntPtr.Zero;
return nativeLib != IntPtr.Zero; */
}
}

Expand Down
4 changes: 0 additions & 4 deletions src/System.Drawing.Common/tests/TextureBrushTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,6 @@ public void Ctor_DisposedImage_ThrowsArgumentException()
AssertExtensions.Throws<ArgumentException>(null, () => new TextureBrush(image, WrapMode.Tile, Rectangle.Empty));
}

[ActiveIssue(20884, TestPlatforms.AnyUnix)]
[ConditionalTheory(Helpers.GdiplusIsAvailable)]
[InlineData(WrapMode.Tile - 1)]
[InlineData(WrapMode.Clamp + 1)]
Expand Down Expand Up @@ -431,7 +430,6 @@ public void MultiplyTransform_NotInvertibleMatrix_ThrowsArgumentException()
}
}

[ActiveIssue(20884, TestPlatforms.AnyUnix)]
[ConditionalFact(Helpers.GdiplusIsAvailable)]
public void MultiplyTransform_DisposedMatrix_Nop()
{
Expand Down Expand Up @@ -662,7 +660,6 @@ public void Transform_SetValid_GetReturnsExpected()
}
}

[ActiveIssue(20884, TestPlatforms.AnyUnix)]
[ConditionalFact(Helpers.GdiplusIsAvailable)]
public void Transform_SetNull_ThrowsArgumentNullException()
{
Expand Down Expand Up @@ -786,7 +783,6 @@ public void WrapMode_SetValid_GetReturnsExpected(WrapMode wrapMode)
}
}

[ActiveIssue(20884, TestPlatforms.AnyUnix)]
[ConditionalTheory(Helpers.GdiplusIsAvailable)]
[InlineData(WrapMode.Tile - 1)]
[InlineData(WrapMode.Clamp + 1)]
Expand Down