Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-02-08 03:41:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

For LoadCursorFromPNGMem, the array of offsets must have NR_CURSORS + 1 units

Browse Source
This commit is contained in:
Vincent Wei
2020-01-14 08:50:18 +08:00
parent aec634797b
commit 8d2adaa61d
2 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/sysres/cursor/cursors.c
View File

@@ -11,35 +11,35 @@
//
//////////////////////////////////////////////////////////////////////////////
/*
* This file is part of MiniGUI, a mature cross-platform windowing
* This file is part of MiniGUI, a mature cross-platform windowing
* 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
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*
* Or,
*
*
* As this program is a library, any link to this program must follow
* GNU General Public License version 3 (GPLv3). If you cannot accept
* GPLv3, you need to be licensed from FMSoft.
*
*
* If you have got a commercial license of this program, please use it
* under the terms and conditions of the commercial license.
*
*
* For more information about the commercial license, please refer to
* <http://www.minigui.com/blog/minigui-licensing-policy/>.
*/
@@ -48,9 +48,13 @@
#if defined(_MGHAVE_CURSOR) && defined(_MGINCORE_RES)
#define NR_CURSORS 23
/*
* Since 4.2.0:
* For LoadCursorFromPNGMem, the array of offsets must have NR_CURSORS + 1 units.
*/
const int __mg_cursors_offset [] = {
0,
766,
766,
766 + 326,
766*2 + 326,
766*2 + 326*2,
@@ -72,6 +76,7 @@ const int __mg_cursors_offset [] = {
766*11 + 326*7 + 518*2,
766*11 + 326*8 + 518*2,
766*11 + 326*9 + 518*2,
766*11 + 326*10 + 518*2,
};
const unsigned char __mg_cursors_data[] = {

16
src/sysres/incoreres.c
View File

@@ -135,9 +135,21 @@ HCURSOR __mg_load_cursor_from_res (int i)
#ifdef _MGINCORE_RES
# ifdef _MGSCHEMA_COMPOSITING
if (is_png)
if (is_png) {
size_t size;
if (i == 0) {
size = __mg_cursors_offset [1] - __mg_cursors_offset [0];
}
else {
/* For LoadCursorFromPNGMem, the array of offsets
* must have NR_CURSORS + 1 units. */
size = __mg_cursors_offset [i + 1] - __mg_cursors_offset [i];
}
hCursor = LoadCursorFromPNGMem (__mg_cursors_data + __mg_cursors_offset [i],
hotspot[0], hotspot[1]);
size, hotspot[0], hotspot[1]);
}
else
# endif
hCursor = LoadCursorFromMem (__mg_cursors_data + __mg_cursors_offset [i]);