From 12e6507cac4a182b87c3c7d476b53b424dc68657 Mon Sep 17 00:00:00 2001 From: matthieu Date: Mon, 16 Dec 2024 06:41:58 +0000 Subject: [PATCH] Fix merge error during last update. --- app/x11perf/do_blt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/x11perf/do_blt.c b/app/x11perf/do_blt.c index da0bd82e2..95ad6029e 100644 --- a/app/x11perf/do_blt.c +++ b/app/x11perf/do_blt.c @@ -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) { /*