XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 03:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

panoramiX: XineramaGetImageData(): scope split pDraw variable usage

Browse Source 
Use a separate variable pWalkDraw for inside the loop, as it's got a
different purpose in here.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-08-12 13:56:56 +02:00
committed by Enrico Weigelt
parent 2f62e660ff
commit 27f1fcef7f
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Xext/panoramiX.c
View File

@@ -1161,10 +1161,9 @@ XineramaGetImageData(DrawablePtr *pDrawables,
FOR_NSCREENS_BACKWARD(i) {
BoxRec TheBox;
ScreenPtr pScreen;
pDraw = pDrawables[i];
pScreen = pDraw->pScreen;
DrawablePtr pWalkDraw = pDrawables[i];
ScreenPtr pScreen = pWalkDraw->pScreen;
TheBox.x1 = pScreen->x;
TheBox.x2 = TheBox.x1 + pScreen->width;
@@ -1179,10 +1178,10 @@ XineramaGetImageData(DrawablePtr *pDrawables,
RegionUninit(&ScreenRegion);
if (inOut == rgnIN) {
(*pScreen->GetImage) (pDraw,
SrcBox.x1 - pDraw->x -
pScreen->GetImage(pWalkDraw,
SrcBox.x1 - pWalkDraw->x -
screenInfo.screens[i]->x,
SrcBox.y1 - pDraw->y -
SrcBox.y1 - pWalkDraw->y -
screenInfo.screens[i]->y, width, height,
format, planemask, data);
break;
@@ -1212,10 +1211,10 @@ XineramaGetImageData(DrawablePtr *pDrawables,
}
}
x = pbox->x1 - pDraw->x - screenInfo.screens[i]->x;
y = pbox->y1 - pDraw->y - screenInfo.screens[i]->y;
x = pbox->x1 - pWalkDraw->x - screenInfo.screens[i]->x;
y = pbox->y1 - pWalkDraw->y - screenInfo.screens[i]->y;
(*pScreen->GetImage) (pDraw, x, y, w, h,
(*pScreen->GetImage) (pWalkDraw, x, y, w, h,
format, planemask, ScratchMem);
/* copy the memory over */