merge -r 54345:54346

svn path=/branches/mainsoft/gh1.7/mcs/; revision=54347

diff --git a/mcs/class/System.Drawing/System.Drawing/ChangeLog b/mcs/class/System.Drawing/System.Drawing/ChangeLog
index 17ce67110302ffcea5b6b3bc96e2df958ca40a97..40061d51c5ed9418223658917465844df935b594 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/ChangeLog
+++ b/mcs/class/System.Drawing/System.Drawing/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-14  Konstantin Triger <kostat@mainsoft.com>
+
+        * StrokeFactory.jvm.cs: create AdvancedStroke when have penTransform.
+
 2005-12-13  Konstantin Triger <kostat@mainsoft.com>
 
        * Bitmap.jvm.cs: Fix MakeTransparent.

diff --git a/mcs/class/System.Drawing/System.Drawing/StrokeFactory.jvm.cs b/mcs/class/System.Drawing/System.Drawing/StrokeFactory.jvm.cs
index 87ae446ec48d1150c34d1c03012d7ef3beb8a033..8878ac73f1b2c5b64b7c543aff1dd8a307352ca4 100755 (executable)
--- a/mcs/class/System.Drawing/System.Drawing/StrokeFactory.jvm.cs
+++ b/mcs/class/System.Drawing/System.Drawing/StrokeFactory.jvm.cs
@@ -18,7 +18,9 @@ namespace System.Drawing {
 \r
                        public awt.Stroke Create(float width, int cap, int join, float miterlimit, float[] dash, float dash_phase, geom.AffineTransform penTransform,\r
                                geom.AffineTransform outputTransform, PenFit penFit) {\r
-                               if ((outputTransform == null || outputTransform.isIdentity()) && (penFit == PenFit.NotThin))\r
+                               if ((penFit == PenFit.NotThin) &&\r
+                                       (outputTransform == null || outputTransform.isIdentity()) &&\r
+                                       (penTransform == null || penTransform.isIdentity()))\r
                                        return new awt.BasicStroke(width, cap, join, miterlimit, dash, dash_phase);\r
                                return new System.Drawing.AdvancedStroke(width, cap, join, miterlimit, dash, dash_phase, penTransform, outputTransform, penFit);\r
                        }\r