Merge branch 'master' into pu/fb-setmode

This commit is contained in:
M. Liebmann
2017-03-15 21:19:08 +01:00
12 changed files with 107 additions and 15 deletions

View File

@@ -349,7 +349,7 @@ bool CScreenShot::SaveJpg()
int xres2 = xres1+2;
for (int x = 0; x < xres; x++) {
int x2 = x*3;
memcpy(pixel_data + x2 + xres1, pixel_data + x*4 + y*xres*4, 3);
memmove(pixel_data + x2 + xres1, pixel_data + x*4 + y*xres*4, 3);
SWAP(pixel_data[x2 + xres1], pixel_data[x2 + xres2]);
}
}