openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-08 10:19:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix merge error during last update.

Browse Source
This commit is contained in:
matthieu
2024-12-16 06:41:58 +00:00
parent 0d1a675fff
commit 12e6507cac
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/x11perf/do_blt.c
View File

@@ -418,12 +418,12 @@ InitShmImage(XParms xp, Parms p, int64_t reps, Bool read_only)
free(segsa);
free(segsb);
return False;
}
}
shm_image = *image;
image_size = image->bytes_per_line * image->height;
/* allow XYPixmap choice: */
if(p->font)image_size *= xp->vinfo.depth;
shm_info.shmid = shmget(IPC_PRIVATE, image_size, IPC_CREAT|0700);
if(p->font && strcmp(p->font, "XYBitmap") != 0) image_size *= xp->vinfo.depth;
shm_info.shmid = shmget(IPC_PRIVATE, image_size, IPC_CREAT|0777);
if (shm_info.shmid < 0)
{
/*