Alexandre Julliard : gdi32: Work around a gcc array out of bounds warning.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 592e6aa94234299c7696abce28df762f16054d10
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=592e6aa94234299c7696abce28...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Jul 23 14:51:50 2012 +0200

gdi32: Work around a gcc array out of bounds warning.

---

 dlls/gdi32/palette.c |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c
index 338d860..afb723b 100644
--- a/dlls/gdi32/palette.c
+++ b/dlls/gdi32/palette.c
@@ -89,18 +89,11 @@ HPALETTE PALETTE_Init(void)
 
     palPtr->palVersion = 0x300;
     palPtr->palNumEntries = 20;
-    for (i = 0; i < 10; i++)
+    for (i = 0; i < 20; i++)
     {
-        palPtr->palPalEntry[i].peRed   = entries[i].rgbRed;
-        palPtr->palPalEntry[i].peGreen = entries[i].rgbGreen;
-        palPtr->palPalEntry[i].peBlue  = entries[i].rgbBlue;
-        palPtr->palPalEntry[i].peFlags = 0;
-    }
-    for (i = 10; i < 20; i++)
-    {
-        palPtr->palPalEntry[i].peRed   = entries[236 + i].rgbRed;
-        palPtr->palPalEntry[i].peGreen = entries[236 + i].rgbGreen;
-        palPtr->palPalEntry[i].peBlue  = entries[236 + i].rgbBlue;
+        palPtr->palPalEntry[i].peRed   = entries[i < 10 ? i : 236 + i].rgbRed;
+        palPtr->palPalEntry[i].peGreen = entries[i < 10 ? i : 236 + i].rgbGreen;
+        palPtr->palPalEntry[i].peBlue  = entries[i < 10 ? i : 236 + i].rgbBlue;
         palPtr->palPalEntry[i].peFlags = 0;
     }
     return CreatePalette( palPtr );