Skip to content
Permalink
Browse files

Mac: Fixed crash if SDL_GetDisplayDPI() got NULL pointers for output …

…parameters.
  • Loading branch information
philippwiesemann committed Jun 26, 2016
1 parent f4d33fc commit 2f016cf88d96f10320cff49ca128f9519380c6ba

File 1 of 1 in 2f016cf

@@ -323,9 +323,15 @@
size_t pixelWidth = CGDisplayPixelsWide(data->display);
size_t pixelHeight = CGDisplayPixelsHigh(data->display);

*ddpi = SDL_ComputeDiagonalDPI(pixelWidth, pixelHeight, displaySize.width / MM_IN_INCH, displaySize.height / MM_IN_INCH);
*hdpi = pixelWidth * MM_IN_INCH / displaySize.width;
*vdpi = pixelHeight * MM_IN_INCH / displaySize.height;
if (ddpi) {
*ddpi = SDL_ComputeDiagonalDPI(pixelWidth, pixelHeight, displaySize.width / MM_IN_INCH, displaySize.height / MM_IN_INCH);
}
if (hdpi) {
*hdpi = pixelWidth * MM_IN_INCH / displaySize.width;
}
if (vdpi) {
*vdpi = pixelHeight * MM_IN_INCH / displaySize.height;
}

return 0;
}

0 comments on commit 2f016cf

Please sign in to comment.