Changes after running indent-all.sh.
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@413 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
parent
87a76f5924
commit
e83406e100
18
orders.c
18
orders.c
@ -661,7 +661,7 @@ process_raw_bmpcache(STREAM s)
|
||||
in_uint8p(s, data, bufsize);
|
||||
|
||||
DEBUG(("RAW_BMPCACHE(cx=%d,cy=%d,id=%d,idx=%d)\n", width, height, cache_id, cache_idx));
|
||||
inverted = (uint8*)xmalloc(width * height * Bpp);
|
||||
inverted = (uint8 *) xmalloc(width * height * Bpp);
|
||||
for (y = 0; y < height; y++)
|
||||
{
|
||||
memcpy(&inverted[(height - y - 1) * (width * Bpp)], &data[y * (width * Bpp)],
|
||||
@ -695,7 +695,8 @@ process_bmpcache(STREAM s)
|
||||
in_uint16_le(s, bufsize); /* bufsize */
|
||||
in_uint16_le(s, cache_idx);
|
||||
|
||||
if (!use_rdp5) {
|
||||
if (!use_rdp5)
|
||||
{
|
||||
|
||||
/* Begin compressedBitmapData */
|
||||
in_uint16_le(s, pad2); /* pad */
|
||||
@ -704,17 +705,16 @@ process_bmpcache(STREAM s)
|
||||
in_uint16_le(s, row_size);
|
||||
in_uint16_le(s, final_size);
|
||||
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
size = bufsize;
|
||||
}
|
||||
in_uint8p(s, data, size);
|
||||
|
||||
DEBUG(("BMPCACHE(cx=%d,cy=%d,id=%d,idx=%d,bpp=%d,size=%d,pad1=%d,bufsize=%d,pad2=%d,rs=%d,fs=%d)\n",
|
||||
width, height,
|
||||
cache_id, cache_idx,
|
||||
bpp, size, pad1, bufsize, pad2, row_size, final_size));
|
||||
DEBUG(("BMPCACHE(cx=%d,cy=%d,id=%d,idx=%d,bpp=%d,size=%d,pad1=%d,bufsize=%d,pad2=%d,rs=%d,fs=%d)\n", width, height, cache_id, cache_idx, bpp, size, pad1, bufsize, pad2, row_size, final_size));
|
||||
|
||||
bmpdata = (uint8*)xmalloc(width * height * Bpp);
|
||||
bmpdata = (uint8 *) xmalloc(width * height * Bpp);
|
||||
|
||||
if (bitmap_decompress(bmpdata, width, height, data, size, Bpp))
|
||||
{
|
||||
@ -742,7 +742,7 @@ process_colcache(STREAM s)
|
||||
in_uint8(s, cache_id);
|
||||
in_uint16_le(s, map.ncolours);
|
||||
|
||||
map.colours = (COLOURENTRY*)xmalloc(3 * map.ncolours);
|
||||
map.colours = (COLOURENTRY *) xmalloc(3 * map.ncolours);
|
||||
|
||||
for (i = 0; i < map.ncolours; i++)
|
||||
{
|
||||
|
@ -359,7 +359,7 @@ xkeymap_translate_key(uint32 keysym, unsigned int keycode, unsigned int state)
|
||||
warning("No translation for (keysym 0x%lx, %s)\n", keysym, get_ksname(keysym));
|
||||
|
||||
/* not in keymap, try to interpret the raw scancode */
|
||||
if (((int)keycode >= min_keycode) && (keycode <= 0x60))
|
||||
if (((int) keycode >= min_keycode) && (keycode <= 0x60))
|
||||
{
|
||||
tr.scancode = keycode - min_keycode;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user