From 03024c7d3d2aa5a959cffd4c8afcaa06b200b023 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Thu, 23 Aug 2018 15:59:34 -0500
Subject: [PATCH] Update ColorGlyphRunEnumerator mapping.

---
 .../DirectWrite/ColorGlyphRunEnumerator.cs    | 13 +++++++-----
 .../DirectWrite/ColorGlyphRunEnumerator1.cs   | 21 +++++++++++++++++++
 .../SharpDX.Direct2D1/DirectWrite/Mapping.xml |  3 ++-
 3 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 Source/SharpDX.Direct2D1/DirectWrite/ColorGlyphRunEnumerator1.cs

diff --git a/Source/SharpDX.Direct2D1/DirectWrite/ColorGlyphRunEnumerator.cs b/Source/SharpDX.Direct2D1/DirectWrite/ColorGlyphRunEnumerator.cs
index 09a9fa132..b571f2d39 100644
--- a/Source/SharpDX.Direct2D1/DirectWrite/ColorGlyphRunEnumerator.cs
+++ b/Source/SharpDX.Direct2D1/DirectWrite/ColorGlyphRunEnumerator.cs
@@ -7,12 +7,15 @@ namespace SharpDX.DirectWrite
 {
     public partial class ColorGlyphRunEnumerator
     {
-        public unsafe ColorGlyphRun GetCurrent()
+        public unsafe ColorGlyphRun CurrentRun
         {
-            GetCurrentRun(out IntPtr ptr);
-            var run = new ColorGlyphRun();
-            run.__MarshalFrom(ref *((ColorGlyphRun.__Native*)ptr));
-            return run;
+            get
+            {
+                GetCurrentRun(out IntPtr ptr);
+                var run = new ColorGlyphRun();
+                run.__MarshalFrom(ref *((ColorGlyphRun.__Native*)ptr));
+                return run;
+            }
         }
     }
 }
diff --git a/Source/SharpDX.Direct2D1/DirectWrite/ColorGlyphRunEnumerator1.cs b/Source/SharpDX.Direct2D1/DirectWrite/ColorGlyphRunEnumerator1.cs
new file mode 100644
index 000000000..5ad09ec64
--- /dev/null
+++ b/Source/SharpDX.Direct2D1/DirectWrite/ColorGlyphRunEnumerator1.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace SharpDX.DirectWrite
+{
+    public partial class ColorGlyphRunEnumerator1
+    {
+        public new unsafe ColorGlyphRun1 CurrentRun
+        {
+            get
+            {
+                GetCurrentRun(out IntPtr ptr);
+                var run = new ColorGlyphRun1();
+                run.__MarshalFrom(ref *((ColorGlyphRun1.__Native*)ptr));
+                return run;
+            }
+        }
+    }
+}
diff --git a/Source/SharpDX.Direct2D1/DirectWrite/Mapping.xml b/Source/SharpDX.Direct2D1/DirectWrite/Mapping.xml
index 2b8c29ff6..096b4884a 100644
--- a/Source/SharpDX.Direct2D1/DirectWrite/Mapping.xml
+++ b/Source/SharpDX.Direct2D1/DirectWrite/Mapping.xml
@@ -223,7 +223,8 @@
     <map param="IDWriteRemoteFontFileStream::BeginDownload::asyncResult" return="true" />
     <map method="IDWriteAsyncResult::GetResult" check="false"/>
     
-    <map param="IDWriteColorGlyphRunEnumerator::GetCurrentRun::colorGlyphRun" type="void" override-native-type="true" visibility="internal" />
+    <map param="IDWriteColorGlyphRunEnumerator(\d*)::GetCurrentRun::colorGlyphRun" type="void" override-native-type="true" />
+    <map method="IDWriteColorGlyphRunEnumerator(\d*)::GetCurrentRun" visibility="internal" property="false" />
     
     <!-- Factory 2 -->
     <map method="IDWriteFactory2::TranslateColorGlyphRun" hresult="true" check="false" visibility="public" name="TryTranslateColorGlyphRun" />