morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[warnings,channels] fix integer casts

Browse Source
This commit is contained in:
akallabeth
2024-12-19 12:05:33 +01:00
parent 5dc31e1691
commit be3ba1c425
38 changed files with 302 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
channels/video/client/video_main.c
View File

@@ -25,6 +25,7 @@
#include <winpr/crt.h>
#include <winpr/assert.h>
#include <winpr/cast.h>
#include <winpr/synch.h>
#include <winpr/print.h>
#include <winpr/stream.h>
@@ -410,8 +411,10 @@ static BOOL video_onMappedGeometryUpdate(MAPPED_GEOMETRY* geometry)
r->x, r->y, r->width, r->height);
presentation->surface->x = geometry->topLevelLeft + geometry->left;
presentation->surface->y = geometry->topLevelTop + geometry->top;
presentation->surface->x =
WINPR_ASSERTING_INT_CAST(uint32_t, geometry->topLevelLeft + geometry->left);
presentation->surface->y =
WINPR_ASSERTING_INT_CAST(uint32_t, geometry->topLevelTop + geometry->top);
return TRUE;
}
@@ -480,8 +483,10 @@ static UINT video_PresentationRequest(VideoClientContext* video,
WLog_DBG(TAG, "creating presentation 0x%x", req->PresentationId);
priv->currentPresentation = PresentationContext_new(
video, req->PresentationId, geom->topLevelLeft + geom->left,
geom->topLevelTop + geom->top, req->SourceWidth, req->SourceHeight);
video, req->PresentationId,
WINPR_ASSERTING_INT_CAST(uint32_t, geom->topLevelLeft + geom->left),
WINPR_ASSERTING_INT_CAST(uint32_t, geom->topLevelTop + geom->top), req->SourceWidth,
req->SourceHeight);
if (!priv->currentPresentation)
{
WLog_ERR(TAG, "unable to create presentation video");
@@ -845,7 +850,8 @@ static UINT video_VideoData(VideoClientContext* context, const TSMM_VIDEO_DATA*
UINT64 timeAfterH264 = 0;
MAPPED_GEOMETRY* geom = presentation->geometry;
const RECTANGLE_16 rect = { 0, 0, surface->alignedWidth, surface->alignedHeight };
const RECTANGLE_16 rect = { 0, 0, WINPR_ASSERTING_INT_CAST(UINT16, surface->alignedWidth),
WINPR_ASSERTING_INT_CAST(UINT16, surface->alignedHeight) };
Stream_SealLength(presentation->currentSample);
Stream_SetPosition(presentation->currentSample, 0);