Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-24 08:16:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
ManoloFLTK
2018-12-16 19:02:34 +01:00
parent 75293c1725 59cd39a505
commit a46695b7fc
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/X11/Fl_X11_Screen_Driver.cxx
+2 -4
View File
@@ -968,10 +968,8 @@ Fl_RGB_Image *Fl_X11_Screen_Driver::read_win_rectangle(int X, int Y, int w, int
line_ptr[2] = cvals[i][2];
if (index_shift > 0) {
index_mask >>= 2;
index_shift -= 2;
} else {
index_mask = 192;
index_shift = 6;
pixel ++;
}
@@ -1239,9 +1237,9 @@ static bool use_monitors_xml(float &factor) {
FILE *in = fopen(path, "r");
if (!in) return false;
p = fgets(line, sizeof(line), in);
if (strstr(line, "<monitors version=\"2\">")) {
if (p && strstr(line, "<monitors version=\"2\">")) {
while (fgets(line, sizeof(line), in)) {
if( (p = strstr(line, "<scale>")) && strstr(p, "</scale>") ) {
if ( (p = strstr(line, "<scale>")) && strstr(p, "</scale>") ) {
p += 7;
sscanf(p, "%f", &factor);
if (factor == 2) { found = true; break; }