Fixed static-in-line warnings

This commit is contained in:
Armin Novak 2021-10-04 14:43:32 +02:00 committed by akallabeth
parent 983443749d
commit 33bc2ba2ab
4 changed files with 6 additions and 6 deletions

View File

@ -52,14 +52,14 @@
* @return pixel color
*/
INLINE UINT32 gdi_GetPixel(HGDI_DC hdc, UINT32 nXPos, UINT32 nYPos)
UINT32 gdi_GetPixel(HGDI_DC hdc, UINT32 nXPos, UINT32 nYPos)
{
HGDI_BITMAP hBmp = (HGDI_BITMAP)hdc->selectedObject;
BYTE* data = &(hBmp->data[(nYPos * hBmp->scanline) + nXPos * GetBytesPerPixel(hBmp->format)]);
return ReadColor(data, hBmp->format);
}
INLINE BYTE* gdi_GetPointer(HGDI_BITMAP hBmp, UINT32 X, UINT32 Y)
BYTE* gdi_GetPointer(HGDI_BITMAP hBmp, UINT32 X, UINT32 Y)
{
UINT32 bpp = GetBytesPerPixel(hBmp->format);
return &hBmp->data[(Y * hBmp->width * bpp) + X * bpp];
@ -82,7 +82,7 @@ static INLINE UINT32 gdi_SetPixelBmp(HGDI_BITMAP hBmp, UINT32 X, UINT32 Y, UINT3
return crColor;
}
INLINE UINT32 gdi_SetPixel(HGDI_DC hdc, UINT32 X, UINT32 Y, UINT32 crColor)
UINT32 gdi_SetPixel(HGDI_DC hdc, UINT32 X, UINT32 Y, UINT32 crColor)
{
HGDI_BITMAP hBmp = (HGDI_BITMAP)hdc->selectedObject;
return gdi_SetPixelBmp(hBmp, X, Y, crColor);

View File

@ -322,7 +322,7 @@ static const BYTE GDI_BS_HATCHED_PATTERNS[] = {
0x7E, 0xBD, 0xDB, 0xE7, 0xE7, 0xDB, 0xBD, 0x7E /* HS_DIACROSS */
};
INLINE BOOL gdi_decode_color(rdpGdi* gdi, const UINT32 srcColor, UINT32* color, UINT32* format)
BOOL gdi_decode_color(rdpGdi* gdi, const UINT32 srcColor, UINT32* color, UINT32* format)
{
UINT32 SrcFormat;
UINT32 ColorDepth;

View File

@ -56,7 +56,7 @@ HGDI_PEN gdi_CreatePen(UINT32 fnPenStyle, UINT32 nWidth, UINT32 crColor, UINT32
return hPen;
}
INLINE UINT32 gdi_GetPenColor(HGDI_PEN pen, UINT32 format)
UINT32 gdi_GetPenColor(HGDI_PEN pen, UINT32 format)
{
return FreeRDPConvertColor(pen->color, pen->format, format, pen->palette);
}

View File

@ -360,7 +360,7 @@ INLINE BOOL gdi_CRgnToRect(INT64 x, INT64 y, INT32 w, INT32 h, HGDI_RECT rect)
* @param bottom y2
*/
INLINE BOOL gdi_RgnToCRect(const HGDI_RGN rgn, INT32* left, INT32* top, INT32* right, INT32* bottom)
BOOL gdi_RgnToCRect(const HGDI_RGN rgn, INT32* left, INT32* top, INT32* right, INT32* bottom)
{
BOOL rc = TRUE;
if ((rgn->w < 0) || (rgn->h < 0))