diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-05-28 16:00:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-28 16:00:21 +0200 |
| commit | fac0120521f1bf37dc7a8b86e67eb0754baee931 (patch) | |
| tree | 972cb7473c3ac29c3702dca73b3a1180e34d5e13 | |
| parent | 4c5dd51eb9253478bfb5b106ea22a24f5b55133c (diff) | |
| parent | c8e0ec0580b16460372ae59a17b1b824eb5df4f1 (diff) | |
Merge pull request #19218 from guilhermefelipecgs/fix_invalid_image2
Change position of validation in set_custom_mouse_cursor
| -rw-r--r-- | platform/osx/os_osx.mm | 3 | ||||
| -rw-r--r-- | platform/windows/os_windows.cpp | 3 | ||||
| -rw-r--r-- | platform/x11/os_x11.cpp | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index a04783d2ca..a49ae1a2f3 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -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_size.width > 256 || texture_size.height > 256); - ERR_FAIL_COND(!image.is_valid()); image = texture->get_data(); + ERR_FAIL_COND(!image.is_valid()); + NSBitmapImageRep *imgrep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL pixelsWide:int(texture_size.width) diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index f013d1a6ad..aef1b8a595 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -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_size.width > 256 || texture_size.height > 256); - ERR_FAIL_COND(!image.is_valid()); image = texture->get_data(); + ERR_FAIL_COND(!image.is_valid()); + UINT image_size = texture_size.width * texture_size.height; UINT size = sizeof(UINT) * image_size; diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 774fceff6d..1fa6993306 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -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_size.width > 256 || texture_size.height > 256); - ERR_FAIL_COND(!image.is_valid()); image = texture->get_data(); + ERR_FAIL_COND(!image.is_valid()); + // Create the cursor structure XcursorImage *cursor_image = XcursorImageCreate(texture_size.width, texture_size.height); XcursorUInt image_size = texture_size.width * texture_size.height; |