From 8b81d71c5a2cf21c8d4c979225be7e15b1029eae Mon Sep 17 00:00:00 2001
From: Vincent Wei <vincent@minigui.org>
Date: Wed, 12 Feb 2020 11:26:49 +0800
Subject: [PATCH] change ICON structure: we always decode an icon into RGBA8888
 compliant pixels

---
 src/include/icon.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/include/icon.h b/src/include/icon.h
index 194b6b80..16a138fe 100644
--- a/src/include/icon.h
+++ b/src/include/icon.h
@@ -15,7 +15,7 @@
  *   and Graphics User Interface (GUI) support system for embedded systems
  *   and smart IoT devices.
  *
- *   Copyright (C) 2002~2018, Beijing FMSoft Technologies Co., Ltd.
+ *   Copyright (C) 2002~2020, Beijing FMSoft Technologies Co., Ltd.
  *   Copyright (C) 1998~2002, WEI Yongming
  *
  *   This program is free software: you can redistribute it and/or modify
@@ -44,7 +44,7 @@
  *   <http://www.minigui.com/blog/minigui-licensing-policy/>.
  */
 /*
-** icon.h: the head file of Icon Support Lib.
+** icon.h: the head file of icon support.
 **
 ** Create date: 1999/01/06
 */
@@ -62,22 +62,22 @@ typedef struct _ICONDIRENTRY {
     WORD wBitCount;
     DWORD dwBytesInRes;
     DWORD dwImageOffset;
-}ICONDIRENTRY;
+} ICONDIRENTRY;
 
 #define SIZEOF_ICONDIRENTRY 16
 typedef struct _ICONDIR {
     WORD cdReserved;
     WORD cdType;    // must be 1.
     WORD cdCount;
-}ICONDIR;
+} ICONDIR;
 
+/* Since 4.2.0, we always decode an icon into RGBA8888 compliant pixels */
 typedef struct _ICON {
     Uint32  width;
     Uint32  height;
     Uint32  pitch;
-    BYTE*   AndBits;
-    BYTE*   XorBits;
-}ICON;
+    BYTE*   pixels;
+} ICON;
 
 typedef ICON* PICON;