Merge pull request #954 from mrvux/d2d_svg

Direct2D and SVG

Author: xoofx

Source/SharpDX.Direct2D1/DeviceContext5.cs

@@ -18,6 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+using SharpDX.Win32;
 using System;
 
 namespace SharpDX.Direct2D1
@@ -38,5 +39,18 @@ public DeviceContext5(Device5 device, DeviceContextOptions options)
         {
             device.CreateDeviceContext(options, this);
         }
+
+        /// <summary>
+        /// Creates an Svg document from an xml string
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="viewportSize"></param>
+        /// <returns>Svg document model</returns>
+        public SvgDocument CreateSvgDocument(IStream stream, SharpDX.Size2F viewportSize)
+        {
+            SvgDocument result;
+            CreateSvgDocument_(ComStream.ToIntPtr(stream), viewportSize, out result);
+            return result;
+        }
     }
 }

Source/SharpDX.Direct2D1/Mapping-direct2d1.xml

@@ -494,8 +494,12 @@
     <map param="ID2D\dDeviceContext5::CreateColorContextFromSimpleColorProfile::colorContext" attribute="out fast"/>
     <map param="ID2D\dEffectContext2::CreateColorContextFromDxgiColorSpace::colorContext" attribute="out fast"/>
     <map param="ID2D\dEffectContext2::CreateColorContextFromSimpleColorProfile::colorContext" attribute="out fast"/>
+    
+    <!-- Svg documents and elements -->
+    <map method="ID2D1SvgDocument::FindElementById" hresult="true" check="false" visibility="private" name="TryFindElementById_"/>
+    <map method="ID2D1SvgAttribute::Clone" visibility="internal" />
 
-     <!--
+    <!--
     // *****************************************************************
     // D2D1 Functions
     // *****************************************************************

Source/SharpDX.Direct2D1/SvgAttribute.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace SharpDX.Direct2D1
+{
+    public partial class SvgAttribute
+    {
+        /// <summary>
+        /// Clones an svg attribute
+        /// </summary>
+        /// <returns></returns>
+        public SvgAttribute Clone()
+        {
+            SvgAttribute svgAttribute;
+            Clone(out svgAttribute);
+            return svgAttribute;
+        }
+    }
+}

Source/SharpDX.Direct2D1/SvgDocument.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace SharpDX.Direct2D1
+{
+    public partial class SvgDocument
+    {
+        /// <summary>
+        /// Finds an svg element by id
+        /// </summary>
+        /// <param name="id">Id to lookup for</param>
+        /// <returns>SvgElement if found, null otherwise</returns>
+        public SvgElement FindElementById(string id)
+        {
+            SharpDX.Result __result__;
+            SvgElement svgElement;
+            __result__ = TryFindElementById_(id, out svgElement);
+
+            __result__.CheckError();
+            return svgElement;
+        }
+    }
+}