[PATCH 3/3] d3dx9: Clean up color key handling in convert_argb_pixels() and point_filter_argb_pixels().

[Matteo Bruni]

From: Matteo Bruni

---
 dlls/d3dx9_36/surface.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
index 674a400d37a..7ffc11af663 100644
--- a/dlls/d3dx9_36/surface.c
+++ b/dlls/d3dx9_36/surface.c
@@ -1678,7 +1678,7 @@ void convert_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pit
         const PALETTEENTRY *palette)
 {
     struct argb_conversion_info conv_info, ck_conv_info;
-    const struct pixel_format_desc *ck_format = NULL;
+    const struct pixel_format_desc *ck_format;
     DWORD channels[4];
     UINT min_width, min_height, min_depth;
     UINT x, y, z;
@@ -1740,7 +1740,7 @@ void convert_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pit
                     if (src_format->to_rgba)
                         src_format->to_rgba(&color.value, &tmp.value, palette);

-                    if (ck_format)
+                    if (color_key)
                     {
                         DWORD ck_pixel;

@@ -1784,7 +1784,7 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic
         const PALETTEENTRY *palette)
 {
     struct argb_conversion_info conv_info, ck_conv_info;
-    const struct pixel_format_desc *ck_format = NULL;
+    const struct pixel_format_desc *ck_format;
     DWORD channels[4];
     UINT x, y, z;

@@ -1846,7 +1846,7 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic
                     if (src_format->to_rgba)
                         src_format->to_rgba(&color.value, &tmp.value, palette);

-                    if (ck_format)
+                    if (color_key)
                     {
                         DWORD ck_pixel;