asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #19218 from guilhermefelipecgs/fix_invalid_image2

Browse source 
Change position of validation in set_custom_mouse_cursor
This commit is contained in:
Max Hilbrunner 2018-05-28 16:00:21 +02:00 committed by GitHub
commit fac0120521
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
platform/osx/os_osx.mm
View file

@ -1543,10 +1543,11 @@ void OS_OSX::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, c
ERR_FAIL_COND(!texture.is_valid()); ERR_FAIL_COND(!texture.is_valid());
ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256); ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256);
ERR_FAIL_COND(!image.is_valid());
image = texture->get_data(); image = texture->get_data();
ERR_FAIL_COND(!image.is_valid());
NSBitmapImageRep *imgrep = [[NSBitmapImageRep alloc] NSBitmapImageRep *imgrep = [[NSBitmapImageRep alloc]
initWithBitmapDataPlanes:NULL initWithBitmapDataPlanes:NULL
pixelsWide:int(texture_size.width) pixelsWide:int(texture_size.width)

3
platform/windows/os_windows.cpp
View file

@ -2074,10 +2074,11 @@ void OS_Windows::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shap
ERR_FAIL_COND(!texture.is_valid()); ERR_FAIL_COND(!texture.is_valid());
ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256); ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256);
ERR_FAIL_COND(!image.is_valid());
image = texture->get_data(); image = texture->get_data();
ERR_FAIL_COND(!image.is_valid());
UINT image_size = texture_size.width * texture_size.height; UINT image_size = texture_size.width * texture_size.height;
UINT size = sizeof(UINT) * image_size; UINT size = sizeof(UINT) * image_size;

3
platform/x11/os_x11.cpp
View file

@ -2449,10 +2449,11 @@ void OS_X11::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, c
ERR_FAIL_COND(!texture.is_valid()); ERR_FAIL_COND(!texture.is_valid());
ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256); ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256);
ERR_FAIL_COND(!image.is_valid());
image = texture->get_data(); image = texture->get_data();
ERR_FAIL_COND(!image.is_valid());
// Create the cursor structure // Create the cursor structure
XcursorImage *cursor_image = XcursorImageCreate(texture_size.width, texture_size.height); XcursorImage *cursor_image = XcursorImageCreate(texture_size.width, texture_size.height);
XcursorUInt image_size = texture_size.width * texture_size.height; XcursorUInt image_size = texture_size.width * texture_size.height;