diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2013-07-02 17:34:04 -0700 |
|---|---|---|
| committer | Jim Grandy <jgrandy@authentic8.com> | 2013-08-22 12:49:40 -0700 |
| commit | 81488cd6154a527f3cf7ebb1dcc568b0fbf57217 (patch) | |
| tree | 50a0339702400b2adf13f5e54dbd0a7e781b7729 | |
| parent | 112f6803189adb7b39364f60a21e6abf8050c46e (diff) | |
| download | xrdp-proprietary-81488cd6154a527f3cf7ebb1dcc568b0fbf57217.tar.gz xrdp-proprietary-81488cd6154a527f3cf7ebb1dcc568b0fbf57217.zip | |
Hand-apply patches (framebuffer alloc) from Authentic8 branch: 15ba9cc409e8f57e1800abcd52e77ed409b6cc17
| -rw-r--r-- | xorg/X11R7.6/rdp/rdpmain.c | 2 | ||||
| -rw-r--r-- | xorg/X11R7.6/rdp/rdprandr.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/xorg/X11R7.6/rdp/rdpmain.c b/xorg/X11R7.6/rdp/rdpmain.c index f1645cfe..a574f325 100644 --- a/xorg/X11R7.6/rdp/rdpmain.c +++ b/xorg/X11R7.6/rdp/rdpmain.c @@ -273,7 +273,7 @@ rdpScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) g_rdpScreen.sizeInBytes = (g_rdpScreen.paddedWidthInBytes * g_rdpScreen.height); ErrorF("buffer size %d\n", g_rdpScreen.sizeInBytes); - g_rdpScreen.pfbMemory = (char *)g_malloc(2048 * 2048 * 4, 1); + g_rdpScreen.pfbMemory = (char *)g_malloc(g_rdpScreen.sizeInBytes, 1); } if (g_rdpScreen.pfbMemory == 0) diff --git a/xorg/X11R7.6/rdp/rdprandr.c b/xorg/X11R7.6/rdp/rdprandr.c index a767b1d8..26b56bfe 100644 --- a/xorg/X11R7.6/rdp/rdprandr.c +++ b/xorg/X11R7.6/rdp/rdprandr.c @@ -156,6 +156,8 @@ rdpRRScreenSetSize(ScreenPtr pScreen, CARD16 width, CARD16 height, ErrorF(" resizing screenPixmap [%p] to %dx%d, currently at %dx%d\n", (void *)screenPixmap, width, height, screenPixmap->drawable.width, screenPixmap->drawable.height); + g_free(g_rdpScreen.pfbMemory); + g_rdpScreen.pfbMemory = g_malloc(g_rdpScreen.sizeInBytes, 1); pScreen->ModifyPixmapHeader(screenPixmap, width, height, g_rdpScreen.depth, g_rdpScreen.bitsPerPixel, g_rdpScreen.paddedWidthInBytes, |