2006-08-04 Sebastien Pouliot <sebastien@ximian.com>

	* PathGradientBrush.cs: Fix unit tests wrt libgdiplus return value
	changes.

svn path=/trunk/mcs/; revision=63355

diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/ChangeLog b/mcs/class/System.Drawing/System.Drawing.Drawing2D/ChangeLog
index f5c640cab01292d939bc1b51afb371c54dffbe24..336f2ee701133c097cb93b28c1fd08f77c089a60 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/ChangeLog
+++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/ChangeLog
@@ -1,6 +1,8 @@
-2006-08-04  Sebastien Pouliot  <sebastien@ximian.com>
+2006-08-04  Sebastien Pouliot  <sebastien@ximian.com> 
 
        * GraphicsPath.cs: Fix unit tests wrt libgdiplus return value change.
+       * PathGradientBrush.cs: Fix unit tests wrt libgdiplus return value 
+       changes.
 
 2006-06-08  Sebastien Pouliot  <sebastien@ximian.com> 
 

diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/PathGradientBrush.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/PathGradientBrush.cs
index c27690e9df8d1cfe6100bdf3e62a3b067c9cb461..1db4e6d8835d65b04ccd7614f234960a08a3355a 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/PathGradientBrush.cs
+++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/PathGradientBrush.cs
@@ -168,10 +168,14 @@ namespace System.Drawing.Drawing2D {
                                int count;
                                Status status = GDIPlus.GdipGetPathGradientPresetBlendCount (nativeObject, out count);
                                GDIPlus.CheckStatus (status);
+
                                int [] intcolors = new int [count];
                                float [] positions = new float [count];
-                               status = GDIPlus.GdipGetPathGradientPresetBlend (nativeObject, intcolors, positions, count);
-                               GDIPlus.CheckStatus (status);
+                               // status would fail if we ask points or types with a < 2 count
+                               if (count > 1) {
+                                       status = GDIPlus.GdipGetPathGradientPresetBlend (nativeObject, intcolors, positions, count);
+                                       GDIPlus.CheckStatus (status);
+                               }
 
                                ColorBlend interpolationColors = new ColorBlend ();
                                Color [] colors = new Color [count];