maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-249: The freerdp/gdi/gdi.h header is required to access contents of rdpGdi struct.

Browse Source
This commit is contained in:
Michael Jumper 2019-09-22 14:36:34 -07:00
parent 9fa9adbd58
commit ad7ab67571
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/protocols/rdp/rdp_bitmap.c
View File

@ -30,6 +30,7 @@
#include <freerdp/codec/bitmap.h>
#include <freerdp/codec/color.h>
#include <freerdp/freerdp.h>
#include <freerdp/gdi/gdi.h>
#include <guacamole/client.h>
#include <guacamole/socket.h>
#include <winpr/wtypes.h>
@ -72,13 +73,13 @@ BOOL guac_rdp_cache_bitmap(rdpContext* context, rdpBitmap* bitmap) {
BOOL guac_rdp_bitmap_new(rdpContext* context, rdpBitmap* bitmap) {
/* Convert image data if present */
if (bitmap->data != NULL && bitmap->bpp != 32) {
if (bitmap->data != NULL && bitmap->format != PIXEL_FORMAT_XRGB32) {
/* Allocate sufficient space for converted image */
unsigned char* image_buffer = _aligned_malloc(bitmap->width * bitmap->height * 4, 16);
/* Attempt image conversion */
if (!freerdp_image_copy(image_buffer, PIXEL_FORMAT_ARGB32, 0, 0, 0,
if (!freerdp_image_copy(image_buffer, PIXEL_FORMAT_XRGB32, 0, 0, 0,
bitmap->width, bitmap->height, bitmap->data, bitmap->format,
0, 0, 0, &context->gdi->palette, FREERDP_FLIP_NONE)) {
_aligned_free(image_buffer);

1
src/protocols/rdp/rdp_color.c
View File

@ -25,6 +25,7 @@
#include <freerdp/codec/color.h>
#include <freerdp/freerdp.h>
#include <freerdp/gdi/gdi.h>
#include <winpr/wtypes.h>
/**

1
src/protocols/rdp/rdp_pointer.c
View File

@ -27,6 +27,7 @@
#include <cairo/cairo.h>
#include <freerdp/freerdp.h>
#include <freerdp/gdi/gdi.h>
#include <guacamole/client.h>
#include <stdlib.h>