From c44ce37e811d9bd3688632e90a73010165a6a53d Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Wed, 23 Dec 2020 07:58:07 -0800 Subject: [PATCH 1/2] debug will remain in GLFW until it can also be release --- Program.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Program.cs b/Program.cs index 2f8668e29..67082ee7b 100644 --- a/Program.cs +++ b/Program.cs @@ -104,7 +104,10 @@ namespace MatterHackers.MatterControl // Set default Agg providers AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.GlfwProvider.GlfwWindowProvider, MatterHackers.GlfwProvider"; + // for now we will ship release with the old renderer +#if !DEBUG AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.MatterControl.WinformsSingleWindowProvider, MatterControl.Winforms"; +#endif string userProfilePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); From fbf87674521dee0c8ddbab4c0994f42cf6d03bd7 Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Thu, 24 Dec 2020 22:49:33 -0800 Subject: [PATCH 2/2] Fixing memory leak fixing warnings --- MatterControlLib/Utilities/MarkdigAgg/AggCodeBlockRenderer.cs | 1 - MatterControlLib/Utilities/MarkdigAgg/AggHeadingRenderer.cs | 3 --- MatterControlLib/Utilities/MarkdigAgg/AggMarkdownDocument.cs | 1 - .../Utilities/MarkdigAgg/AggThematicBreakRenderer.cs | 1 - .../Utilities/MarkdigAgg/Inlines/AggAutolinkInlineRenderer.cs | 1 - .../Utilities/MarkdigAgg/Inlines/AggDelimiterInlineRenderer.cs | 1 - .../Utilities/MarkdigAgg/Inlines/AggEmphasisInlineRenderer.cs | 1 - .../Utilities/MarkdigAgg/Inlines/AggLiteralInlineRenderer.cs | 1 - Submodules/agg-sharp | 2 +- 9 files changed, 1 insertion(+), 11 deletions(-) diff --git a/MatterControlLib/Utilities/MarkdigAgg/AggCodeBlockRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/AggCodeBlockRenderer.cs index ce25f96d6..7d6b16a16 100644 --- a/MatterControlLib/Utilities/MarkdigAgg/AggCodeBlockRenderer.cs +++ b/MatterControlLib/Utilities/MarkdigAgg/AggCodeBlockRenderer.cs @@ -3,7 +3,6 @@ // See the LICENSE.md file in the project root for more information. using Markdig.Syntax; -using MatterHackers.Agg; using MatterHackers.Agg.UI; using MatterHackers.MatterControl; diff --git a/MatterControlLib/Utilities/MarkdigAgg/AggHeadingRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/AggHeadingRenderer.cs index 779988570..f8317fae1 100644 --- a/MatterControlLib/Utilities/MarkdigAgg/AggHeadingRenderer.cs +++ b/MatterControlLib/Utilities/MarkdigAgg/AggHeadingRenderer.cs @@ -2,10 +2,7 @@ // This file is licensed under the MIT license. // See the LICENSE.md file in the project root for more information. -using Markdig.Renderers.Agg.Inlines; using Markdig.Syntax; -using MatterHackers.Agg; -using MatterHackers.Agg.UI; namespace Markdig.Renderers.Agg { diff --git a/MatterControlLib/Utilities/MarkdigAgg/AggMarkdownDocument.cs b/MatterControlLib/Utilities/MarkdigAgg/AggMarkdownDocument.cs index 04040e96f..7242644ea 100644 --- a/MatterControlLib/Utilities/MarkdigAgg/AggMarkdownDocument.cs +++ b/MatterControlLib/Utilities/MarkdigAgg/AggMarkdownDocument.cs @@ -32,7 +32,6 @@ using System.Collections.Generic; using System.Net; using Markdig.Renderers; using Markdig.Renderers.Agg; -using Markdig.Syntax.Inlines; using MatterHackers.Agg.UI; namespace Markdig.Agg diff --git a/MatterControlLib/Utilities/MarkdigAgg/AggThematicBreakRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/AggThematicBreakRenderer.cs index 2522f33c3..522063561 100644 --- a/MatterControlLib/Utilities/MarkdigAgg/AggThematicBreakRenderer.cs +++ b/MatterControlLib/Utilities/MarkdigAgg/AggThematicBreakRenderer.cs @@ -3,7 +3,6 @@ // See the LICENSE.md file in the project root for more information. using Markdig.Syntax; -using MatterHackers.Agg.UI; namespace Markdig.Renderers.Agg { diff --git a/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggAutolinkInlineRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggAutolinkInlineRenderer.cs index 3e764e589..e3c85c340 100644 --- a/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggAutolinkInlineRenderer.cs +++ b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggAutolinkInlineRenderer.cs @@ -4,7 +4,6 @@ using System; using Markdig.Syntax.Inlines; -using MatterHackers.Agg.UI; namespace Markdig.Renderers.Agg.Inlines { diff --git a/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggDelimiterInlineRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggDelimiterInlineRenderer.cs index a8d26de20..3ea2c185f 100644 --- a/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggDelimiterInlineRenderer.cs +++ b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggDelimiterInlineRenderer.cs @@ -3,7 +3,6 @@ // See the LICENSE.md file in the project root for more information. using Markdig.Syntax.Inlines; -using MatterHackers.Agg.UI; namespace Markdig.Renderers.Agg.Inlines { diff --git a/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggEmphasisInlineRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggEmphasisInlineRenderer.cs index c665e1df9..33eacdf5d 100644 --- a/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggEmphasisInlineRenderer.cs +++ b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggEmphasisInlineRenderer.cs @@ -3,7 +3,6 @@ // See the LICENSE.md file in the project root for more information. using Markdig.Syntax.Inlines; -using MatterHackers.Agg; using MatterHackers.Agg.UI; namespace Markdig.Renderers.Agg.Inlines diff --git a/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggLiteralInlineRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggLiteralInlineRenderer.cs index 2999f3306..57c2b770c 100644 --- a/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggLiteralInlineRenderer.cs +++ b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggLiteralInlineRenderer.cs @@ -3,7 +3,6 @@ // See the LICENSE.md file in the project root for more information. using Markdig.Syntax.Inlines; -using MatterHackers.Agg.UI; namespace Markdig.Renderers.Agg.Inlines { diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 720454009..8bae949da 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 720454009fedaec204b041fa934e0eeb4d2b0f5f +Subproject commit 8bae949da8f042488815104f9bedbb08b919dd64