Skip to content
This repository was archived by the owner on Mar 30, 2019. It is now read-only.

Commit 85e2463

Browse files
authored
Merge pull request #1068 from jkoritzinsky/ColorGlyphRunEnumerator
Update ColorGlyphRunEnumerator mapping.
2 parents 68b671a + 03024c7 commit 85e2463

File tree

3 files changed

+31
-6
lines changed

3 files changed

+31
-6
lines changed

Source/SharpDX.Direct2D1/DirectWrite/ColorGlyphRunEnumerator.cs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@ namespace SharpDX.DirectWrite
77
{
88
public partial class ColorGlyphRunEnumerator
99
{
10-
public unsafe ColorGlyphRun GetCurrent()
10+
public unsafe ColorGlyphRun CurrentRun
1111
{
12-
GetCurrentRun(out IntPtr ptr);
13-
var run = new ColorGlyphRun();
14-
run.__MarshalFrom(ref *((ColorGlyphRun.__Native*)ptr));
15-
return run;
12+
get
13+
{
14+
GetCurrentRun(out IntPtr ptr);
15+
var run = new ColorGlyphRun();
16+
run.__MarshalFrom(ref *((ColorGlyphRun.__Native*)ptr));
17+
return run;
18+
}
1619
}
1720
}
1821
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
6+
namespace SharpDX.DirectWrite
7+
{
8+
public partial class ColorGlyphRunEnumerator1
9+
{
10+
public new unsafe ColorGlyphRun1 CurrentRun
11+
{
12+
get
13+
{
14+
GetCurrentRun(out IntPtr ptr);
15+
var run = new ColorGlyphRun1();
16+
run.__MarshalFrom(ref *((ColorGlyphRun1.__Native*)ptr));
17+
return run;
18+
}
19+
}
20+
}
21+
}

Source/SharpDX.Direct2D1/DirectWrite/Mapping.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,8 @@
223223
<map param="IDWriteRemoteFontFileStream::BeginDownload::asyncResult" return="true" />
224224
<map method="IDWriteAsyncResult::GetResult" check="false"/>
225225

226-
<map param="IDWriteColorGlyphRunEnumerator::GetCurrentRun::colorGlyphRun" type="void" override-native-type="true" visibility="internal" />
226+
<map param="IDWriteColorGlyphRunEnumerator(\d*)::GetCurrentRun::colorGlyphRun" type="void" override-native-type="true" />
227+
<map method="IDWriteColorGlyphRunEnumerator(\d*)::GetCurrentRun" visibility="internal" property="false" />
227228

228229
<!-- Factory 2 -->
229230
<map method="IDWriteFactory2::TranslateColorGlyphRun" hresult="true" check="false" visibility="public" name="TryTranslateColorGlyphRun" />

0 commit comments

Comments
 (0)