Adjusted non X11 implementations.

diff --git a/client/Android/android_freerdp.c b/client/Android/android_freerdp.c
index 54a96fe..fccdc00 100644 (file)
--- a/client/Android/android_freerdp.c
+++ b/client/Android/android_freerdp.c
@@ -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)

diff --git a/client/Mac/MRDPView.m b/client/Mac/MRDPView.m
index 97f4185..0cb91ba 100644 (file)
--- a/client/Mac/MRDPView.m
+++ b/client/Mac/MRDPView.m
@@ -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;

diff --git a/client/Windows/wf_graphics.c b/client/Windows/wf_graphics.c
index 0d4c584..066008b 100644 (file)
--- a/client/Windows/wf_graphics.c
+++ b/client/Windows/wf_graphics.c
@@ -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;

diff --git a/server/shadow/Mac/mac_shadow.c b/server/shadow/Mac/mac_shadow.c
index d29f929..9f79c7c 100644 (file)
--- a/server/shadow/Mac/mac_shadow.c
+++ b/server/shadow/Mac/mac_shadow.c
@@ -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);

diff --git a/server/shadow/Win/win_shadow.c b/server/shadow/Win/win_shadow.c
index c9358a5..dc603dc 100644 (file)
--- a/server/shadow/Win/win_shadow.c
+++ b/server/shadow/Win/win_shadow.c
@@ -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);