Louis Lenders : gdiplus: GdipTransformPath should return Ok if matrix = NULL.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 2025f0475fae469c2edde222b0c824a9f759f59f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2025f0475fae469c2edde222b0...

Author: Louis Lenders <xerox.xerox2000x(a)gmail.com>
Date:   Tue Mar 22 21:07:05 2016 +0100

gdiplus: GdipTransformPath should return Ok if matrix = NULL.

Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com>
Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit 36fdc6abf19bc53dfb33532464f3613f95444239)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/gdiplus/graphicspath.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c
index 49dbf6c..00ece95 100644
--- a/dlls/gdiplus/graphicspath.c
+++ b/dlls/gdiplus/graphicspath.c
@@ -1216,11 +1216,9 @@ GpStatus WINGDIPAPI GdipFlattenPath(GpPath *path, GpMatrix* matrix, REAL flatnes
     if(path->pathdata.Count == 0)
         return Ok;
 
-    if(matrix){
-        stat = GdipTransformPath(path, matrix);
-        if (stat != Ok)
-            return stat;
-    }
+    stat = GdipTransformPath(path, matrix);
+    if(stat != Ok)
+        return stat;
 
     pt = path->pathdata.Points[0];
     if(!init_path_list(&list, pt.X, pt.Y))
@@ -1677,7 +1675,7 @@ GpStatus WINGDIPAPI GdipTransformPath(GpPath *path, GpMatrix *matrix)
     if(!path)
         return InvalidParameter;
 
-    if(path->pathdata.Count == 0)
+    if(path->pathdata.Count == 0 || !matrix)
         return Ok;
 
     return GdipTransformMatrixPoints(matrix, path->pathdata.Points,