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

Adjusted non X11 implementations.

Browse Source
This commit is contained in:
Armin Novak 2016-10-14 12:50:04 +02:00
parent 9c50e1a635
commit 8ef1808191
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/Android/android_freerdp.c
View File

@ -971,7 +971,7 @@ static jboolean JNICALL jni_freerdp_update_graphics(
{
rc = freerdp_image_copy(pixels, DstFormat, info.stride, x, y, width, height,
gdi->primary_buffer, gdi->dstFormat, gdi->stride, x, y,
&gdi->palette);
&gdi->palette, FREERDP_FLIP_NONE);
}
if ((ret = AndroidBitmap_unlockPixels(env, bitmap)) < 0)

4
client/Mac/MRDPView.m
View File

@ -1032,12 +1032,12 @@ BOOL mf_Pointer_New(rdpContext* context, rdpPointer* pointer)
mrdpCursor->cursor_data = cursor_data;
format = PIXEL_FORMAT_RGBA32;
if (freerdp_image_copy_from_pointer_data(
if (!freerdp_image_copy_from_pointer_data(
cursor_data, format,
0, 0, 0, pointer->width, pointer->height,
pointer->xorMaskData, pointer->lengthXorMask,
pointer->andMaskData, pointer->lengthAndMask,
pointer->xorBpp, NULL) < 0)
pointer->xorBpp, NULL))
{
free(cursor_data);
mrdpCursor->cursor_data = NULL;

4
client/Windows/wf_graphics.c
View File

@ -58,7 +58,7 @@ HBITMAP wf_create_dib(wfContext* wfc, UINT32 width, UINT32 height,
if (data)
freerdp_image_copy(cdata, dstFormat, 0, 0, 0, width, height, data, srcFormat, 0,
0, 0, &wfc->context.gdi->palette);
0, 0, &wfc->context.gdi->palette, FREERDP_FLIP_NONE);
if (pdata)
*pdata = cdata;
@ -243,7 +243,7 @@ static BOOL wf_Pointer_New(rdpContext* context, const rdpPointer* pointer)
if (!freerdp_image_copy_from_pointer_data(pdata, gdi->dstFormat, 0, 0, 0,
pointer->width, pointer->height,
pointer->xorMaskData, pointer->lengthXorMask,
pointer->andMaskData, pointer->lengthAndMask, pointer->xorBpp, &gdi->palette))
pointer->andMaskData, pointer->lengthAndMask, pointer->xorBpp, &gdi->palette, FREERDP_FLIP_NONE))
{
_aligned_free(pdata);
goto fail;

2
server/shadow/Mac/mac_shadow.c
View File

@ -394,7 +394,7 @@ static void (^mac_capture_stream_handler)(CGDisplayStreamFrameStatus, uint64_t,
else
{
freerdp_image_copy(surface->data, surface->format, surface->scanline,
x, y, width, height, pSrcData, PIXEL_FORMAT_BGRX32, nSrcStep, x, y, NULL);
x, y, width, height, pSrcData, PIXEL_FORMAT_BGRX32, nSrcStep, x, y, NULL, FREERDP_FLIP_NONE);
}
IOSurfaceUnlock(frameSurface, kIOSurfaceLockReadOnly, NULL);

2
server/shadow/Win/win_shadow.c
View File

@ -269,7 +269,7 @@ int win_shadow_surface_copy(winShadowSubsystem* subsystem)
freerdp_image_copy(surface->data, surface->format,
surface->scanline, x - surface->x, y - surface->y, width, height,
pDstData, DstFormat, nDstStep, 0, 0, NULL);
pDstData, DstFormat, nDstStep, 0, 0, NULL, FREERDP_FLIP_NONE);
ArrayList_Lock(server->clients);
count = ArrayList_Count(server->clients);
shadow_subsystem_frame_update((rdpShadowSubsystem*)subsystem);