mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freerdp: fix build problems

Browse Source
This commit is contained in:
Marc-André Moreau 2014-09-17 19:19:37 -04:00
parent 2a5192b027
commit 25f1073aa5
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channels/tsmf/client/CMakeLists.txt
View File

@ -57,7 +57,7 @@ if(WITH_GSTREAMER_0_10 OR WITH_GSTREAMER_1_0)
find_feature(XRandR ${XRANDR_FEATURE_TYPE} ${XRANDR_FEATURE_PURPOSE} ${XRANDR_FEATURE_DESCRIPTION}) find_feature(XRandR ${XRANDR_FEATURE_TYPE} ${XRANDR_FEATURE_PURPOSE} ${XRANDR_FEATURE_DESCRIPTION})
if (WITH_XRANDR) if (WITH_XRANDR)
add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "gstreamer" "decoder") add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "gstreamer" "decoder")
else() else()
message(WARNING "Disabling tsmf gstreamer because XRandR wasn't found") message(WARNING "Disabling tsmf gstreamer because XRandR wasn't found")
endif() endif()
endif() endif()

2
channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
View File

@ -508,7 +508,7 @@ static void tsmf_ffmpeg_free(ITSMFDecoder *decoder)
static BOOL initialized = FALSE; static BOOL initialized = FALSE;
#ifdef STATIC_CHANNELS #ifdef STATIC_CHANNELS
#define freerdp_tsmf_client_subsystem_entry ffmpeg_freerdp_tsmf_client_subsystem_entry #define freerdp_tsmf_client_subsystem_entry ffmpeg_freerdp_tsmf_client_decoder_subsystem_entry
#endif #endif
ITSMFDecoder *freerdp_tsmf_client_subsystem_entry(void) ITSMFDecoder *freerdp_tsmf_client_subsystem_entry(void)

2
channels/tsmf/client/gstreamer/tsmf_gstreamer.c
View File

@ -748,7 +748,7 @@ BOOL tsmf_gstreamer_sync(ITSMFDecoder *decoder, void (*cb)(void *), void *stream
} }
#ifdef STATIC_CHANNELS #ifdef STATIC_CHANNELS
#define freerdp_tsmf_client_subsystem_entry gstreamer_freerdp_tsmf_client_subsystem_entry #define freerdp_tsmf_client_subsystem_entry gstreamer_freerdp_tsmf_client_decoder_subsystem_entry
#endif #endif
ITSMFDecoder *freerdp_tsmf_client_subsystem_entry(void) ITSMFDecoder *freerdp_tsmf_client_subsystem_entry(void)

1
libfreerdp/gdi/gdi.c
View File

@ -591,7 +591,6 @@ void gdi_bitmap_update(rdpContext* context, BITMAP_UPDATE* bitmapUpdate)
void gdi_palette_update(rdpContext* context, PALETTE_UPDATE* palette) void gdi_palette_update(rdpContext* context, PALETTE_UPDATE* palette)
{ {
int index; int index;
BYTE r, g, b;
PALETTE_ENTRY* pe; PALETTE_ENTRY* pe;
UINT32* palette32; UINT32* palette32;
rdpGdi* gdi = context->gdi; rdpGdi* gdi = context->gdi;

4
server/shadow/X11/x11_shadow.c
View File

@ -230,7 +230,7 @@ int x11_shadow_screen_grab(x11ShadowSubsystem* subsystem)
freerdp_image_copy(surface->data, PIXEL_FORMAT_XRGB32, freerdp_image_copy(surface->data, PIXEL_FORMAT_XRGB32,
surface->scanline, x - surface->x, y - surface->y, width, height, surface->scanline, x - surface->x, y - surface->y, width, height,
(BYTE*) image->data, PIXEL_FORMAT_XRGB32, (BYTE*) image->data, PIXEL_FORMAT_XRGB32,
image->bytes_per_line, x, y); image->bytes_per_line, x, y, NULL);
region16_union_rect(&(subsystem->invalidRegion), &(subsystem->invalidRegion), &invalidRect); region16_union_rect(&(subsystem->invalidRegion), &(subsystem->invalidRegion), &invalidRect);
@ -271,7 +271,7 @@ int x11_shadow_screen_grab(x11ShadowSubsystem* subsystem)
freerdp_image_copy(surface->data, PIXEL_FORMAT_XRGB32, freerdp_image_copy(surface->data, PIXEL_FORMAT_XRGB32,
surface->scanline, x - surface->x, y - surface->y, width, height, surface->scanline, x - surface->x, y - surface->y, width, height,
(BYTE*) image->data, PIXEL_FORMAT_XRGB32, (BYTE*) image->data, PIXEL_FORMAT_XRGB32,
image->bytes_per_line, x, y); image->bytes_per_line, x, y, NULL);
region16_union_rect(&(subsystem->invalidRegion), &(subsystem->invalidRegion), &invalidRect); region16_union_rect(&(subsystem->invalidRegion), &(subsystem->invalidRegion), &invalidRect);

2
server/shadow/shadow_client.c
View File

@ -489,7 +489,7 @@ int shadow_client_send_bitmap_update(rdpShadowClient* client, rdpShadowSurface*
buffer = encoder->grid[k]; buffer = encoder->grid[k];
freerdp_image_copy(buffer, dstFormat, -1, 0, 0, nWidth, nHeight, freerdp_image_copy(buffer, dstFormat, -1, 0, 0, nWidth, nHeight,
data, srcFormat, nSrcStep, 0, 0); data, srcFormat, nSrcStep, 0, 0, NULL);
lines = freerdp_bitmap_compress((char*) buffer, nWidth, nHeight, s, lines = freerdp_bitmap_compress((char*) buffer, nWidth, nHeight, s,
settings->ColorDepth, 64 * 64 * 4, nHeight - 1, ts, e); settings->ColorDepth, 64 * 64 * 4, nHeight - 1, ts, e);