diff options
| author | jsorg71 <jsorg71> | 2006-02-06 00:33:18 +0000 |
|---|---|---|
| committer | jsorg71 <jsorg71> | 2006-02-06 00:33:18 +0000 |
| commit | 64bdbed95fcacb3c491109b8d5317cd2585f072a (patch) | |
| tree | ad66eb4da7648d79beb1fcd8033946fd3ff2d777 | |
| parent | 285a1139c1d606bdad13eed30b87393b716b0be9 (diff) | |
| download | xrdp-proprietary-64bdbed95fcacb3c491109b8d5317cd2585f072a.tar.gz xrdp-proprietary-64bdbed95fcacb3c491109b8d5317cd2585f072a.zip | |
64 bit big endian fixes
| -rw-r--r-- | rdp/rdp_bitmap.c | 24 | ||||
| -rw-r--r-- | rdp/rdp_orders.c | 2 |
2 files changed, 17 insertions, 9 deletions
diff --git a/rdp/rdp_bitmap.c b/rdp/rdp_bitmap.c index 8c6f1597..be59b4b3 100644 --- a/rdp/rdp_bitmap.c +++ b/rdp/rdp_bitmap.c @@ -25,6 +25,14 @@ /******************************************************************************/ #define CVAL(p) ((unsigned char)(*(p++))) +#if defined(B_ENDIAN) +#define EIK0 1 +#define EIK1 0 +#else +#define EIK0 0 +#define EIK1 1 +#endif + /******************************************************************************/ #define REPEAT(statement) \ { \ @@ -395,16 +403,16 @@ bitmap_decompress2(char* output, int width, int height, char* input, int size) } break; case 8: /* Bicolor */ - color1[0] = CVAL(input); - color1[1] = CVAL(input); + color1[EIK0] = CVAL(input); + color1[EIK1] = CVAL(input); case 3: /* Color */ - color2[0] = CVAL(input); - color2[1] = CVAL(input); + color2[EIK0] = CVAL(input); + color2[EIK1] = CVAL(input); break; case 6: /* SetMix/Mix */ case 7: /* SetMix/FillOrMix */ - mix[0] = CVAL(input); - mix[1] = CVAL(input); + mix[EIK0] = CVAL(input); + mix[EIK1] = CVAL(input); opcode -= 5; break; case 9: /* FillOrMix_1 */ @@ -534,8 +542,8 @@ bitmap_decompress2(char* output, int width, int height, char* input, int size) case 4: /* Copy */ REPEAT ( - line[x * 2 + 0] = CVAL(input); - line[x * 2 + 1] = CVAL(input); + line[x * 2 + EIK0] = CVAL(input); + line[x * 2 + EIK1] = CVAL(input); ) break; case 8: /* Bicolor */ diff --git a/rdp/rdp_orders.c b/rdp/rdp_orders.c index 6cba4bb8..88f34fa6 100644 --- a/rdp/rdp_orders.c +++ b/rdp/rdp_orders.c @@ -108,7 +108,7 @@ rdp_orders_in_present(struct stream* s, int* present, static void APP_CC rdp_orders_in_coord(struct stream* s, int* coord, int delta) { - char change; + signed char change; if (delta) { |