jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

o fixed some issues that may have cropped up due to mistakes I did during the merge

Browse Source 
or these issues could have been a result of astyle not working correctly (unlikely though)
This commit is contained in:
Laxmikant Rashinkar 2012-09-20 15:29:40 -07:00
parent 03f47098e4
commit 70d535211b
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xorg/X11R7.6/rdp/rdpCopyArea.c
View File

@ -615,3 +615,4 @@ rdpCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
return rv; return rv;
} }
}

2
xorg/X11R7.6/rdp/rdpFillSpans.c
View File

@ -98,3 +98,5 @@ rdpFillSpans(DrawablePtr pDrawable, GCPtr pGC, int nInit,
RegionUninit(&clip_reg); RegionUninit(&clip_reg);
rdpup_switch_os_surface(-1); rdpup_switch_os_surface(-1);
} }
}

2
xorg/X11R7.6/rdp/rdpSetSpans.c
View File

@ -163,3 +163,5 @@ rdpSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *psrc,
rdpup_switch_os_surface(-1); rdpup_switch_os_surface(-1);
} }
} }
}

6
xorg/X11R7.6/rdp/rdpup.c
View File

@ -1762,7 +1762,6 @@ rdpup_create_window(WindowPtr pWindow, rdpWindowRec *priv)
out_uint32_le(g_out_s, flags); /* flags */ out_uint32_le(g_out_s, flags); /* flags */
} }
}
/******************************************************************************/ /******************************************************************************/
void void
@ -1895,11 +1894,7 @@ rdpup_check_dirty(PixmapPtr pDirtyPixmap, rdpPixmapRec *pDirtyPriv)
rdpup_reset_clip(); rdpup_reset_clip();
rdpup_set_opcode(GXcopy); rdpup_set_opcode(GXcopy);
break; break;
}
rdpup_reset_clip();
rdpup_set_opcode(GXcopy);
break;
case RDI_SCRBLT: case RDI_SCRBLT:
LLOGLN(10, (" RDI_SCRBLT")); LLOGLN(10, (" RDI_SCRBLT"));
break; break;
@ -1907,6 +1902,7 @@ rdpup_check_dirty(PixmapPtr pDirtyPixmap, rdpPixmapRec *pDirtyPriv)
di = di->next; di = di->next;
} }
draw_item_remove_all(pDirtyPriv); draw_item_remove_all(pDirtyPriv);
rdpup_end_update(); rdpup_end_update();
pDirtyPriv->is_dirty = 0; pDirtyPriv->is_dirty = 0;