Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-06-15 20:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

cast to uint32_t, change target from long -> uint32_t

Browse Source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2021-11-04 22:15:24 -07:00
parent d70fe3699d
commit bb2b007af6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/x11_window.c
View File

@ -2100,13 +2100,13 @@ void _glfwSetWindowIconX11(_GLFWwindow* window, int count, const GLFWimage* imag
{ {
if (count) if (count)
{ {
int longCount = 0; int elements = 0;
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
longCount += 2 + images[i].width * images[i].height; elements += 2 + images[i].width * images[i].height;
long* icon = _glfw_calloc(longCount, sizeof(long)); uint32_t* icon = _glfw_calloc(elements, sizeof(uint32_t));
long* target = icon; uint32_t* target = icon;
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
@ -2115,10 +2115,10 @@ void _glfwSetWindowIconX11(_GLFWwindow* window, int count, const GLFWimage* imag
for (int j = 0; j < images[i].width * images[i].height; j++) for (int j = 0; j < images[i].width * images[i].height; j++)
{ {
*target++ = (((unsigned int)images[i].pixels[j * 4 + 0]) << 16) | *target++ = (((uint32_t)images[i].pixels[j * 4 + 0]) << 16) |
(((unsigned int)images[i].pixels[j * 4 + 1]) << 8) | (((uint32_t)images[i].pixels[j * 4 + 1]) << 8) |
(((unsigned int)images[i].pixels[j * 4 + 2]) << 0) | (((uint32_t)images[i].pixels[j * 4 + 2]) << 0) |
(((unsigned int)images[i].pixels[j * 4 + 3]) << 24); (((uint32_t)images[i].pixels[j * 4 + 3]) << 24);
} }
} }
@ -2127,7 +2127,7 @@ void _glfwSetWindowIconX11(_GLFWwindow* window, int count, const GLFWimage* imag
XA_CARDINAL, 32, XA_CARDINAL, 32,
PropModeReplace, PropModeReplace,
(unsigned char*) icon, (unsigned char*) icon,
longCount); elements);
_glfw_free(icon); _glfw_free(icon);
} }