github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[server,shadow] shadow_subsystem_pointer_convert_alpha_pointer_data

Browse Source 
the function uses implicit color formats. Replace this with the function
shadow_subsystem_pointer_convert_alpha_pointer_data_to_format with
explicit source color format.
Deprecate the old function.
This commit is contained in:
akallabeth 2024-03-05 09:33:36 +01:00 committed by akallabeth
parent fe149f3f57
commit 9268cee35e
3 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/freerdp/server/shadow.h
View File

@ -302,9 +302,15 @@ extern "C"
FREERDP_API void shadow_subsystem_set_entry_builtin(const char* name); FREERDP_API void shadow_subsystem_set_entry_builtin(const char* name);
FREERDP_API void shadow_subsystem_set_entry(pfnShadowSubsystemEntry pEntry); FREERDP_API void shadow_subsystem_set_entry(pfnShadowSubsystemEntry pEntry);
FREERDP_API int shadow_subsystem_pointer_convert_alpha_pointer_data( FREERDP_API WINPR_DEPRECATED_VAR(
BYTE* pixels, BOOL premultiplied, UINT32 width, UINT32 height, "Use shadow_subsystem_pointer_convert_alpha_pointer_data_to_format instead",
SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE* pointerColor); 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, FREERDP_API int shadow_server_parse_command_line(rdpShadowServer* server, int argc, char** argv,
COMMAND_LINE_ARGUMENT_A* cargs); COMMAND_LINE_ARGUMENT_A* cargs);

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

@ -463,8 +463,8 @@ static int x11_shadow_pointer_alpha_update(x11ShadowSubsystem* subsystem)
msg->width = subsystem->cursorWidth; msg->width = subsystem->cursorWidth;
msg->height = subsystem->cursorHeight; msg->height = subsystem->cursorHeight;
if (shadow_subsystem_pointer_convert_alpha_pointer_data(subsystem->cursorPixels, TRUE, if (shadow_subsystem_pointer_convert_alpha_pointer_data_to_format(
msg->width, msg->height, msg) < 0) subsystem->cursorPixels, subsystem->format, TRUE, msg->width, msg->height, msg) < 0)
{ {
free(msg); free(msg);
return -1; return -1;

36
server/shadow/shadow_subsystem.c
View File

@ -190,20 +190,23 @@ UINT32 shadow_enum_monitors(MONITOR_DEF* monitors, UINT32 maxMonitors)
* Caller should free the andMaskData and xorMaskData later. * Caller should free the andMaskData and xorMaskData later.
*/ */
int shadow_subsystem_pointer_convert_alpha_pointer_data( int shadow_subsystem_pointer_convert_alpha_pointer_data(
BYTE* pixels, BOOL premultiplied, UINT32 width, UINT32 height, const BYTE* WINPR_RESTRICT pixels, BOOL premultiplied, UINT32 width, UINT32 height,
SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE* WINPR_RESTRICT pointerColor)
{
return shadow_subsystem_pointer_convert_alpha_pointer_data_to_format(
pixels, PIXEL_FORMAT_BGRX32, premultiplied, width, height, pointerColor);
}
int shadow_subsystem_pointer_convert_alpha_pointer_data_to_format(
const BYTE* pixels, UINT32 format, BOOL premultiplied, UINT32 width, UINT32 height,
SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE* pointerColor) SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE* pointerColor)
{ {
BYTE* pSrc8 = NULL;
BYTE* pDst8 = NULL;
UINT32 xorStep = 0; UINT32 xorStep = 0;
UINT32 andStep = 0; UINT32 andStep = 0;
UINT32 andBit = 0; UINT32 andBit = 0;
BYTE* andBits = NULL; BYTE* andBits = NULL;
UINT32 andPixel = 0; UINT32 andPixel = 0;
BYTE A = 0; const size_t bpp = FreeRDPGetBytesPerPixel(format);
BYTE R = 0;
BYTE G = 0;
BYTE B = 0;
xorStep = (width * 3); xorStep = (width * 3);
xorStep += (xorStep % 2); xorStep += (xorStep % 2);
@ -227,20 +230,23 @@ int shadow_subsystem_pointer_convert_alpha_pointer_data(
return -1; return -1;
} }
for (UINT32 y = 0; y < height; y++) for (size_t y = 0; y < height; y++)
{ {
pSrc8 = &pixels[(width * 4) * (height - 1 - y)]; const BYTE* pSrc8 = &pixels[(width * bpp) * (height - 1 - y)];
pDst8 = &(pointerColor->xorMaskData[y * xorStep]); BYTE* pDst8 = &(pointerColor->xorMaskData[y * xorStep]);
andBit = 0x80; andBit = 0x80;
andBits = &(pointerColor->andMaskData[andStep * y]); andBits = &(pointerColor->andMaskData[andStep * y]);
for (UINT32 x = 0; x < width; x++) for (size_t x = 0; x < width; x++)
{ {
B = *pSrc8++; BYTE B = 0;
G = *pSrc8++; BYTE G = 0;
R = *pSrc8++; BYTE R = 0;
A = *pSrc8++; BYTE A = 0;
const UINT32 color = FreeRDPReadColor(&pSrc8[x * bpp], format);
FreeRDPSplitColor(color, format, &R, &G, &B, &A, NULL);
andPixel = 0; andPixel = 0;