diff options
| author | Laxmikant Rashinkar <LK.Rashinkar@gmail.com> | 2012-09-20 15:29:40 -0700 |
|---|---|---|
| committer | Laxmikant Rashinkar <LK.Rashinkar@gmail.com> | 2012-09-20 15:29:40 -0700 |
| commit | 70d535211bd5708b4547a5e2f8bfaa21b1d66746 (patch) | |
| tree | 0e12ec1d9bdc1cd0ccc88eba351e96cbb2957a09 | |
| parent | 03f47098e4989a37a4099497db8d98bdf692f371 (diff) | |
| download | xrdp-proprietary-70d535211bd5708b4547a5e2f8bfaa21b1d66746.tar.gz xrdp-proprietary-70d535211bd5708b4547a5e2f8bfaa21b1d66746.zip | |
o fixed some issues that may have cropped up due to mistakes I did during the merge
or these issues could have been a result of astyle not working correctly (unlikely though)
| -rw-r--r-- | xorg/X11R7.6/rdp/rdpCopyArea.c | 1 | ||||
| -rw-r--r-- | xorg/X11R7.6/rdp/rdpFillSpans.c | 2 | ||||
| -rw-r--r-- | xorg/X11R7.6/rdp/rdpSetSpans.c | 2 | ||||
| -rw-r--r-- | xorg/X11R7.6/rdp/rdpup.c | 24 |
4 files changed, 15 insertions, 14 deletions
diff --git a/xorg/X11R7.6/rdp/rdpCopyArea.c b/xorg/X11R7.6/rdp/rdpCopyArea.c index e7657396..28b05a93 100644 --- a/xorg/X11R7.6/rdp/rdpCopyArea.c +++ b/xorg/X11R7.6/rdp/rdpCopyArea.c @@ -615,3 +615,4 @@ rdpCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, return rv; } +} diff --git a/xorg/X11R7.6/rdp/rdpFillSpans.c b/xorg/X11R7.6/rdp/rdpFillSpans.c index 7e006c88..daadeaf1 100644 --- a/xorg/X11R7.6/rdp/rdpFillSpans.c +++ b/xorg/X11R7.6/rdp/rdpFillSpans.c @@ -98,3 +98,5 @@ rdpFillSpans(DrawablePtr pDrawable, GCPtr pGC, int nInit, RegionUninit(&clip_reg); rdpup_switch_os_surface(-1); } +} + diff --git a/xorg/X11R7.6/rdp/rdpSetSpans.c b/xorg/X11R7.6/rdp/rdpSetSpans.c index 34d3ec84..f10208ac 100644 --- a/xorg/X11R7.6/rdp/rdpSetSpans.c +++ b/xorg/X11R7.6/rdp/rdpSetSpans.c @@ -163,3 +163,5 @@ rdpSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *psrc, rdpup_switch_os_surface(-1); } } +} + diff --git a/xorg/X11R7.6/rdp/rdpup.c b/xorg/X11R7.6/rdp/rdpup.c index 508b7618..d6d9b4f9 100644 --- a/xorg/X11R7.6/rdp/rdpup.c +++ b/xorg/X11R7.6/rdp/rdpup.c @@ -1762,7 +1762,6 @@ rdpup_create_window(WindowPtr pWindow, rdpWindowRec *priv) out_uint32_le(g_out_s, flags); /* flags */ } -} /******************************************************************************/ void @@ -1895,23 +1894,20 @@ rdpup_check_dirty(PixmapPtr pDirtyPixmap, rdpPixmapRec *pDirtyPriv) rdpup_reset_clip(); rdpup_set_opcode(GXcopy); break; + + case RDI_SCRBLT: + LLOGLN(10, (" RDI_SCRBLT")); + break; } - rdpup_reset_clip(); - rdpup_set_opcode(GXcopy); - break; - case RDI_SCRBLT: - LLOGLN(10, (" RDI_SCRBLT")); - break; + di = di->next; } - di = di->next; -} -draw_item_remove_all(pDirtyPriv); -rdpup_end_update(); -pDirtyPriv->is_dirty = 0; - rdpup_switch_os_surface(-1); - return 0; + draw_item_remove_all(pDirtyPriv); + rdpup_end_update(); + pDirtyPriv->is_dirty = 0; + rdpup_switch_os_surface(-1); + return 0; } /******************************************************************************/ |