Skip to content
Permalink
Browse files
Fix performance regression
  • Loading branch information
Zeno- committed Feb 5, 2015
1 parent 929e0b0 commit 9a0dd47057cad18522e43d159a06c856dfdeeef4
Showing 1 changed file with 11 additions and 2 deletions.
@@ -647,7 +647,8 @@ const char *getVideoDriverFriendlyName(irr::video::E_DRIVER_TYPE type)

#ifndef __ANDROID__
#ifdef XORG_USED
float getDisplayDensity()

static float calcDisplayDensity()
{
const char* current_display = getenv("DISPLAY");

@@ -665,14 +666,22 @@ float getDisplayDensity()

XCloseDisplay(x11display);

return (std::max(dpi_height,dpi_width) / 96.0);
return std::max(dpi_height,dpi_width) / 96.0;
}
}

/* return manually specified dpi */
return g_settings->getFloat("screen_dpi")/96.0;
}


float getDisplayDensity()
{
static float cached_display_density = calcDisplayDensity();
return cached_display_density;
}


#else
float getDisplayDensity()
{

0 comments on commit 9a0dd47

Please sign in to comment.