From 926f20e3708ee43d2362447e5814fbde60f5cc49 Mon Sep 17 00:00:00 2001 From: Frode Solheim Date: Wed, 16 Jul 2025 13:52:06 +0200 Subject: [PATCH] gfxutil: rename to gamma_table to avoid conflict with function pointer --- gfxutil.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gfxutil.cpp b/gfxutil.cpp index e80d3ac3..fcaf04eb 100644 --- a/gfxutil.cpp +++ b/gfxutil.cpp @@ -134,7 +134,7 @@ static float video_gamma (float value, float gamma, float bri, float con) return ret; } -static uae_u32 gamma[256 * 3][3]; +static uae_u32 gamma_table[256 * 3][3]; static int lf, hf; static void video_calc_gammatable(int monid) @@ -186,7 +186,7 @@ static void video_calc_gammatable(int monid) if (v > max) v = max; - gamma[i][j] = (uae_u32)(v + 0.5); + gamma_table[i][j] = (uae_u32)(v + 0.5); } } } @@ -310,9 +310,9 @@ void alloc_colors_rgb (int rw, int gw, int bw, int rs, int gs, int bs, int aw, i } j += 256; - rc[i] = doColor(gamma[j][0], rw, rs) | doAlpha(alpha, aw, as); - gc[i] = doColor(gamma[j][1], gw, gs) | doAlpha(alpha, aw, as); - bc[i] = doColor(gamma[j][2], bw, bs) | doAlpha(alpha, aw, as); + rc[i] = doColor(gamma_table[j][0], rw, rs) | doAlpha(alpha, aw, as); + gc[i] = doColor(gamma_table[j][1], gw, gs) | doAlpha(alpha, aw, as); + bc[i] = doColor(gamma_table[j][2], bw, bs) | doAlpha(alpha, aw, as); if (byte_swap) { if (bpp <= 16) { @@ -352,9 +352,9 @@ void alloc_colors64k(int monid, int rw, int gw, int bw, int rs, int gs, int bs, g = (g * (255 - BLACKERTHANBLACKADJ) / 255) + BLACKERTHANBLACKADJ; b = (b * (255 - BLACKERTHANBLACKADJ) / 255) + BLACKERTHANBLACKADJ; } - r = gamma[r + j][0]; - g = gamma[g + j][1]; - b = gamma[b + j][2]; + r = gamma_table[r + j][0]; + g = gamma_table[g + j][1]; + b = gamma_table[b + j][2]; xcolors[i] = doMask(r, rw, rs) | doMask(g, gw, gs) | doMask(b, bw, bs) | doAlpha(alpha, aw, as); if (byte_swap) { if (bpp <= 16) { -- 2.47.3