Merge pull request #1068 from jkoritzinsky/ColorGlyphRunEnumerator

Update ColorGlyphRunEnumerator mapping.
sharpdx · Aug 23, 2018 · 85e2463 · 85e2463
2 parents 68b671a + 03024c7
commit 85e2463
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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" />