Fix "Setting window custom cursor from SVG image crashes" - cont'd (#1363)
This commit is contained in:
parent
bd4ad3e4a0
commit
188aa0be0e
@ -3142,12 +3142,11 @@ int Fl_X11_Window_Driver::set_cursor(const Fl_RGB_Image *image, int hotx, int ho
|
||||
if ((hoty < 0) || (hoty >= image->h()))
|
||||
return 0;
|
||||
|
||||
float s = image->as_svg_image() ? Fl::screen_scale(pWindow->screen_num()) : 1;
|
||||
cursor = XcursorImageCreate(image->w() * s, image->h() * s);
|
||||
cursor = XcursorImageCreate(image->w(), image->h());
|
||||
if (!cursor)
|
||||
return 0;
|
||||
|
||||
image = (Fl_RGB_Image*)image->copy(image->w() * s, image->h() * s);
|
||||
image = (Fl_RGB_Image*)image->copy(image->w(), image->h());
|
||||
((Fl_RGB_Image*)image)->normalize();
|
||||
const int extra_data = image->ld() ? (image->ld()-image->w()*image->d()) : 0;
|
||||
const uchar *i = (const uchar*)*image->data();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user