Small fixes, mostly dupicated code

(cherry picked from commit 856a8226a5)
This commit is contained in:
qarmin
2019-04-08 11:03:37 +02:00
committed by Rémi Verschelde
parent a2cf479f07
commit 3b703d6707
29 changed files with 32 additions and 60 deletions

View File

@@ -1923,10 +1923,6 @@ public:
zipClose(final_apk, NULL);
unzClose(tmp_unaligned);
if (err) {
return err;
}
return OK;
}

View File

@@ -1165,7 +1165,7 @@ int OS_X11::get_screen_dpi(int p_screen) const {
int height_mm = DisplayHeightMM(x11_display, p_screen);
double xdpi = (width_mm ? sc.width / (double)width_mm * 25.4 : 0);
double ydpi = (height_mm ? sc.height / (double)height_mm * 25.4 : 0);
if (xdpi || xdpi)
if (xdpi || ydpi)
return (xdpi + ydpi) / (xdpi && ydpi ? 2 : 1);
//could not get dpi