Merge branch 'pr/n606_andrewst' into master_integration

xoofx · xoofx · commit 4f5fb2654196 · 2015-07-22T18:00:25.000+09:00
diff --git a/Source/SharpDX.Direct2D1/BitmapProperties1.cs b/Source/SharpDX.Direct2D1/BitmapProperties1.cs
@@ -17,6 +17,8 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
+using System;
+
 namespace SharpDX.Direct2D1
 {
     public partial class BitmapProperties1
@@ -91,8 +93,7 @@ public ColorContext ColorContext
             set
             {
                 colorContext = value;
-                if (value != null)
-                    ColorContextPointer = colorContext.NativePointer;
+                ColorContextPointer = colorContext == null ? IntPtr.Zero : colorContext.NativePointer;
             }
         }
     }
diff --git a/Source/SharpDX.Direct2D1/LayerParameters.cs b/Source/SharpDX.Direct2D1/LayerParameters.cs
@@ -34,7 +34,7 @@ public Geometry GeometricMask
         {
             set
             {
-                GeometricMaskPointer = value.NativePointer;
+                GeometricMaskPointer = value == null ? IntPtr.Zero : value.NativePointer;
             }
         }
 
@@ -49,7 +49,7 @@ public Brush OpacityBrush
         {
             set
             {
-                OpacityBrushPointer= value.NativePointer;
+                OpacityBrushPointer = value == null ? IntPtr.Zero : value.NativePointer;
             }
         }
     }
diff --git a/Source/SharpDX.Direct2D1/LayerParameters1.cs b/Source/SharpDX.Direct2D1/LayerParameters1.cs
@@ -18,6 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+using System;
 using SharpDX.Mathematics.Interop;
 
 namespace SharpDX.Direct2D1
@@ -38,11 +39,11 @@ public LayerParameters1(RawRectangleF contentBounds, Geometry geometryMask, Anti
             : this()
         {
             ContentBounds = contentBounds;
-            geometricMask_ = geometryMask.NativePointer;
+            GeometricMaskPointer = geometryMask.NativePointer;
             MaskAntialiasMode = maskAntialiasMode;
             MaskTransform = maskTransform;
             Opacity = opacity;
-            opacityBrush_ = opacityBrush.NativePointer;
+            OpacityBrushPointer = opacityBrush.NativePointer;
             LayerOptions = layerOptions;
         }
 
@@ -56,8 +57,9 @@ public LayerParameters1(RawRectangleF contentBounds, Geometry geometryMask, Anti
         public Geometry GeometricMask
         {
             set
+
             {
-                geometricMask_ = value.NativePointer;
+                GeometricMaskPointer = value == null ? IntPtr.Zero : value.NativePointer;
             }
         }
 
@@ -72,7 +74,7 @@ public Brush OpacityBrush
         {
             set
             {
-                opacityBrush_ = value.NativePointer;
+                OpacityBrushPointer = value == null ? IntPtr.Zero : value.NativePointer;
             }
         }
     }
diff --git a/Source/SharpDX.Direct2D1/Mapping-direct2d1.xml b/Source/SharpDX.Direct2D1/Mapping-direct2d1.xml
@@ -200,8 +200,8 @@
     <map struct="D2D1_BITMAP_PROPERTIES1" struct-to-class="true"/>
     <map field="D2D1_BITMAP_PROPERTIES1::colorContext" name="ColorContextPointer" visibility="internal"/>
 
-    <map field="D2D1_LAYER_PARAMETERS1::geometricMask" visibility="internal" name="geometricMask_"/>
-    <map field="D2D1_LAYER_PARAMETERS1::opacityBrush" visibility="internal" name="opacityBrush_"/>
+    <map field="D2D1_LAYER_PARAMETERS1::geometricMask" visibility="internal" name="GeometricMaskPointer"/>
+    <map field="D2D1_LAYER_PARAMETERS1::opacityBrush" visibility="internal" name="OpacityBrushPointer"/>
 
     <map struct="D2D1_PROPERTY_BINDING" struct-to-class="true" visibility="internal"/>
     <map field="D2D1_PROPERTY_BINDING::[gs]etFunction" visibility="internal"/>

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,`
`18`	`18`	`// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN`
`19`	`19`	`// THE SOFTWARE.`
	`20`	`+using System;`
	`21`	`+`
`20`	`22`	`namespace SharpDX.Direct2D1`
`21`	`23`	`{`
`22`	`24`	`public partial class BitmapProperties1`
`@@ -91,8 +93,7 @@ public ColorContext ColorContext`
`91`	`93`	`set`
`92`	`94`	`{`
`93`	`95`	`colorContext = value;`
`94`		`- if (value != null)`
`95`		`- ColorContextPointer = colorContext.NativePointer;`
	`96`	`+ ColorContextPointer = colorContext == null ? IntPtr.Zero : colorContext.NativePointer;`
`96`	`97`	`}`
`97`	`98`	`}`
`98`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public Geometry GeometricMask`
`34`	`34`	`{`
`35`	`35`	`set`
`36`	`36`	`{`
`37`		`- GeometricMaskPointer = value.NativePointer;`
	`37`	`+ GeometricMaskPointer = value == null ? IntPtr.Zero : value.NativePointer;`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`@@ -49,7 +49,7 @@ public Brush OpacityBrush`
`49`	`49`	`{`
`50`	`50`	`set`
`51`	`51`	`{`
`52`		`- OpacityBrushPointer= value.NativePointer;`
	`52`	`+ OpacityBrushPointer = value == null ? IntPtr.Zero : value.NativePointer;`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN`
`19`	`19`	`// THE SOFTWARE.`
`20`	`20`
	`21`	`+using System;`
`21`	`22`	`using SharpDX.Mathematics.Interop;`
`22`	`23`
`23`	`24`	`namespace SharpDX.Direct2D1`
`@@ -38,11 +39,11 @@ public LayerParameters1(RawRectangleF contentBounds, Geometry geometryMask, Anti`
`38`	`39`	`: this()`
`39`	`40`	`{`
`40`	`41`	`ContentBounds = contentBounds;`
`41`		`- geometricMask_ = geometryMask.NativePointer;`
	`42`	`+ GeometricMaskPointer = geometryMask.NativePointer;`
`42`	`43`	`MaskAntialiasMode = maskAntialiasMode;`
`43`	`44`	`MaskTransform = maskTransform;`
`44`	`45`	`Opacity = opacity;`
`45`		`- opacityBrush_ = opacityBrush.NativePointer;`
	`46`	`+ OpacityBrushPointer = opacityBrush.NativePointer;`
`46`	`47`	`LayerOptions = layerOptions;`
`47`	`48`	`}`
`48`	`49`
`@@ -56,8 +57,9 @@ public LayerParameters1(RawRectangleF contentBounds, Geometry geometryMask, Anti`
`56`	`57`	`public Geometry GeometricMask`
`57`	`58`	`{`
`58`	`59`	`set`
	`60`	`+`
`59`	`61`	`{`
`60`		`- geometricMask_ = value.NativePointer;`
	`62`	`+ GeometricMaskPointer = value == null ? IntPtr.Zero : value.NativePointer;`
`61`	`63`	`}`
`62`	`64`	`}`
`63`	`65`
`@@ -72,7 +74,7 @@ public Brush OpacityBrush`
`72`	`74`	`{`
`73`	`75`	`set`
`74`	`76`	`{`
`75`		`- opacityBrush_ = value.NativePointer;`
	`77`	`+ OpacityBrushPointer = value == null ? IntPtr.Zero : value.NativePointer;`
`76`	`78`	`}`
`77`	`79`	`}`
`78`	`80`	`}`