Commit 2ada71fb authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

Screen.c: simplify nxagentResizeScreen

parent 1af470a2
......@@ -2310,7 +2310,7 @@ Bool nxagentResizeScreen(ScreenPtr pScreen, int width, int height,
pScreen -> height = height;
/*
* Compute screen dimensions if they aren't given.
* Compute screen dimensions if they aren't provided.
*/
if (mmWidth == 0)
......@@ -2329,7 +2329,6 @@ Bool nxagentResizeScreen(ScreenPtr pScreen, int width, int height,
{
mmWidth = 1;
}
}
if (mmHeight == 0)
......@@ -2348,7 +2347,6 @@ Bool nxagentResizeScreen(ScreenPtr pScreen, int width, int height,
{
mmHeight = 1;
}
}
pScreen -> mmWidth = mmWidth;
......@@ -2365,11 +2363,6 @@ Bool nxagentResizeScreen(ScreenPtr pScreen, int width, int height,
height * BitsPerPixel(pScreen->rootDepth) / 8);
if (fbBits == NULL)
{
pScreen -> width = oldWidth;
pScreen -> height = oldHeight;
pScreen -> mmWidth = oldMmWidth;
pScreen -> mmHeight = oldMmHeight;
goto nxagentResizeScreenError;
}
......@@ -2481,6 +2474,14 @@ FIXME: We should try to restore the previously
return 1;
nxagentResizeScreenError:
#ifdef DEBUG
fprintf(stderr, "%s: nxagentResizeScreenError\n", __func__);
#endif
pScreen -> width = oldWidth;
pScreen -> height = oldHeight;
pScreen -> mmWidth = oldMmWidth;
pScreen -> mmHeight = oldMmHeight;
return 0;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment