diff options
| author | jsorg71 <jsorg71> | 2007-04-28 18:23:08 +0000 |
|---|---|---|
| committer | jsorg71 <jsorg71> | 2007-04-28 18:23:08 +0000 |
| commit | 99e7f9d8ca8b6f09e88efc4fc394d0fb3fa1754f (patch) | |
| tree | 35b0fc70b47a5921197e062fd885c5220970a9f6 /xrdp | |
| parent | 1cd6c0c2fc74b045cf5f3f4189ce54cb9fbc8834 (diff) | |
| download | xrdp-proprietary-99e7f9d8ca8b6f09e88efc4fc394d0fb3fa1754f.tar.gz xrdp-proprietary-99e7f9d8ca8b6f09e88efc4fc394d0fb3fa1754f.zip | |
need 24 bit RGB and BGR macros
Diffstat (limited to 'xrdp')
| -rw-r--r-- | xrdp/xrdp_bitmap.c | 6 | ||||
| -rw-r--r-- | xrdp/xrdp_wm.c | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/xrdp/xrdp_bitmap.c b/xrdp/xrdp_bitmap.c index d2557c81..122fb268 100644 --- a/xrdp/xrdp_bitmap.c +++ b/xrdp/xrdp_bitmap.c @@ -429,9 +429,9 @@ xrdp_bitmap_load(struct xrdp_bitmap* self, const char* filename, int* palette) } else if (self->bpp == 24) { - color = COLOR24((color & 0xff0000) >> 16, - (color & 0x00ff00) >> 8, - (color & 0x0000ff) >> 0); + //color = COLOR24((color & 0xff0000) >> 16, + // (color & 0x00ff00) >> 8, + // (color & 0x0000ff) >> 0); } xrdp_bitmap_set_pixel(self, j, i, color); } diff --git a/xrdp/xrdp_wm.c b/xrdp/xrdp_wm.c index bff8b004..2c879e0e 100644 --- a/xrdp/xrdp_wm.c +++ b/xrdp/xrdp_wm.c @@ -309,14 +309,14 @@ xrdp_wm_load_static_colors(struct xrdp_wm* self) } else if (self->screen->bpp == 24) { - self->black = COLOR24(0, 0, 0); - self->grey = COLOR24(0xc0, 0xc0, 0xc0); - self->dark_grey = COLOR24(0x80, 0x80, 0x80); - self->blue = COLOR24(0x00, 0x00, 0xff); - self->dark_blue = COLOR24(0x00, 0x00, 0x7f); - self->white = COLOR24(0xff, 0xff, 0xff); - self->red = COLOR24(0xff, 0x00, 0x00); - self->green = COLOR24(0x00, 0xff, 0x00); + self->black = COLOR24BGR(0, 0, 0); + self->grey = COLOR24BGR(0xc0, 0xc0, 0xc0); + self->dark_grey = COLOR24BGR(0x80, 0x80, 0x80); + self->blue = COLOR24BGR(0x00, 0x00, 0xff); + self->dark_blue = COLOR24BGR(0x00, 0x00, 0x7f); + self->white = COLOR24BGR(0xff, 0xff, 0xff); + self->red = COLOR24BGR(0xff, 0x00, 0x00); + self->green = COLOR24BGR(0x00, 0xff, 0x00); } return 0; } |