Merging upstream version 3.5.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 23 insertions, 7 deletions

diff --git a/include/freerdp/server/shadow.h b/include/freerdp/server/shadow.h
index 9ddb8ae..9544e16 100644
--- a/include/freerdp/server/shadow.h
+++ b/include/freerdp/server/shadow.h
@@ -302,9 +302,15 @@ extern "C"
 	FREERDP_API void shadow_subsystem_set_entry_builtin(const char* name);
 	FREERDP_API void shadow_subsystem_set_entry(pfnShadowSubsystemEntry pEntry);
 
-	FREERDP_API int shadow_subsystem_pointer_convert_alpha_pointer_data(
-	    BYTE* pixels, BOOL premultiplied, UINT32 width, UINT32 height,
-	    SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE* pointerColor);
+	FREERDP_API WINPR_DEPRECATED_VAR(
+	    "Use shadow_subsystem_pointer_convert_alpha_pointer_data_to_format instead",
+	    int shadow_subsystem_pointer_convert_alpha_pointer_data(
+	        const BYTE* WINPR_RESTRICT pixels, BOOL premultiplied, UINT32 width, UINT32 height,
+	        SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE* WINPR_RESTRICT pointerColor));
+
+	FREERDP_API int shadow_subsystem_pointer_convert_alpha_pointer_data_to_format(
+	    const BYTE* WINPR_RESTRICT pixels, UINT32 format, BOOL premultiplied, UINT32 width,
+	    UINT32 height, SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE* WINPR_RESTRICT pointerColor);
 
 	FREERDP_API int shadow_server_parse_command_line(rdpShadowServer* server, int argc, char** argv,
 	                                                 COMMAND_LINE_ARGUMENT_A* cargs);
@@ -325,10 +331,20 @@ extern "C"
 	WINPR_ATTR_MALLOC(shadow_server_free, 1)
 	FREERDP_API rdpShadowServer* shadow_server_new(void);
 
-	FREERDP_API int shadow_capture_align_clip_rect(RECTANGLE_16* rect, RECTANGLE_16* clip);
-	FREERDP_API int shadow_capture_compare(BYTE* pData1, UINT32 nStep1, UINT32 nWidth,
-	                                       UINT32 nHeight, BYTE* pData2, UINT32 nStep2,
-	                                       RECTANGLE_16* rect);
+	FREERDP_API int shadow_capture_align_clip_rect(RECTANGLE_16* rect, const RECTANGLE_16* clip);
+
+	FREERDP_API WINPR_DEPRECATED_VAR(
+	    "Use shadow_capture_compare_with_format",
+	    int shadow_capture_compare(const BYTE* WINPR_RESTRICT pData1, UINT32 nStep1, UINT32 nWidth,
+	                               UINT32 nHeight, const BYTE* WINPR_RESTRICT pData2, UINT32 nStep2,
+	                               RECTANGLE_16* WINPR_RESTRICT rect));
+
+	FREERDP_API int shadow_capture_compare_with_format(const BYTE* WINPR_RESTRICT pData1,
+	                                                   UINT32 format1, UINT32 nStep1, UINT32 nWidth,
+	                                                   UINT32 nHeight,
+	                                                   const BYTE* WINPR_RESTRICT pData2,
+	                                                   UINT32 format2, UINT32 nStep2,
+	                                                   RECTANGLE_16* WINPR_RESTRICT rect);
 
 	FREERDP_API void shadow_subsystem_frame_update(rdpShadowSubsystem* subsystem);