frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 3c6b6eeb35 into d403cbd25c

This commit is contained in:
Herman Semenoff 2025-07-04 22:24:38 +02:00 committed by GitHub
parent d403cbd25c 3c6b6eeb35
commit 55a98ac400
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dix/dixfonts.c
View File

@ -1866,6 +1866,9 @@ get_client_resolutions(int *num)
ScreenPtr pScreen;
pScreen = screenInfo.screens[0];
if (!pScreen)
return NULL;
res.x_resolution = (pScreen->width * 25.4) / pScreen->mmWidth;
/*
* XXX - we'll want this as long as bitmap instances are prevalent

3
dix/glyphcurs.c
View File

@ -87,6 +87,9 @@ ServerBitsFromGlyph(FontPtr pfont, unsigned ch, CursorMetricPtr cm,
char2b[1] = (unsigned char) (ch & 0xff);
pScreen = screenInfo.screens[0];
if (!pScreen)
return BadDrawable;
pbits = calloc(BitmapBytePad(cm->width), cm->height);
if (!pbits)
return BadAlloc;