From e9633ef220b9b72520b66407ac8fcb74a3c7cfad Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov@codeweavers.com>
Date: Fri, 25 Apr 2014 13:50:04 +0400
Subject: [PATCH] gdiplus: Simplify GdipResetImageAttributes(), fix remap table
 leak (Valgrind).

---
 dlls/gdiplus/imageattributes.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c
index 0b09547d203..17c525ceb48 100644
--- a/dlls/gdiplus/imageattributes.c
+++ b/dlls/gdiplus/imageattributes.c
@@ -279,11 +279,10 @@ GpStatus WINGDIPAPI GdipResetImageAttributes(GpImageAttributes *imageAttr,
     if(!imageAttr || type >= ColorAdjustTypeCount)
         return InvalidParameter;
 
-    memset(&imageAttr->colorkeys[type], 0, sizeof(imageAttr->colorkeys[type]));
     memset(&imageAttr->colormatrices[type], 0, sizeof(imageAttr->colormatrices[type]));
-    memset(&imageAttr->colorremaptables[type], 0, sizeof(imageAttr->colorremaptables[type]));
-    memset(&imageAttr->gamma_enabled[type], 0, sizeof(imageAttr->gamma_enabled[type]));
-    memset(&imageAttr->gamma[type], 0, sizeof(imageAttr->gamma[type]));
+    GdipSetImageAttributesColorKeys(imageAttr, type, FALSE, 0, 0);
+    GdipSetImageAttributesRemapTable(imageAttr, type, FALSE, 0, NULL);
+    GdipSetImageAttributesGamma(imageAttr, type, FALSE, 0.0);
 
     return Ok;
 }