Rebase against 849163b1ed5e2586ee9f391e7a8b03f054bb620f.

patches/gdiplus-Grayscale_PNG/0002-gdiplus-tests-Add-a-test-for-loading-PNG-grayscale-i.patch

@@ -1,4 +1,4 @@
-From 1184612f4eca0f6a09150a42f8b56dce76ffd6b1 Mon Sep 17 00:00:00 2001
+From e567377f438a70ee3c69aed93ac7197ad867d7ad Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Fri, 3 Jun 2016 13:20:14 +0800
 Subject: gdiplus/tests: Add a test for loading PNG grayscale images.
@@ -8,7 +8,7 @@ Subject: gdiplus/tests: Add a test for loading PNG grayscale images.
  1 file changed, 59 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
-index 6a51714..0c28c9e 100644
+index 551d276..ab39dfe 100644
 --- a/dlls/gdiplus/tests/image.c
 +++ b/dlls/gdiplus/tests/image.c
 @@ -2,7 +2,7 @@
@@ -20,8 +20,8 @@ index 6a51714..0c28c9e 100644
   *
   * This library is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
-@@ -4725,6 +4725,63 @@ static void test_createeffect(void)
-     }
+@@ -4790,6 +4790,63 @@ static void test_getadjustedpalette(void)
+     GdipDisposeImageAttributes(imageattributes);
  }
  
 +/* RGB 24 bpp 1x1 pixel PNG image */
@@ -84,7 +84,7 @@ index 6a51714..0c28c9e 100644
  START_TEST(image)
  {
      struct GdiplusStartupInput gdiplusStartupInput;
-@@ -4737,6 +4794,7 @@ START_TEST(image)
+@@ -4802,6 +4859,7 @@ START_TEST(image)
  
      GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);