From 0537027c62bf60da936bd3d8f45dd42804445897 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <m@maandree.se>
Date: Fri, 7 Mar 2025 21:45:56 +0100
Subject: Update LIST_RAMPS_STOP_VALUE_TYPES macro to reflect eariler changes
 in colorramp.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <m@maandree.se>
---
 src/colorramp.c       |  2 +-
 src/common.h          | 16 ++++++++--------
 src/gamma-coopgamma.c | 12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/colorramp.c b/src/colorramp.c
index 5cdf05f..ac197a1 100644
--- a/src/colorramp.c
+++ b/src/colorramp.c
@@ -25,7 +25,7 @@
 #endif
 
 
-#define X(SUFFIX, TYPE, MAX, TRUE_MAX, DEPTH)\
+#define X(SUFFIX, TYPE, MAX, DEPTH)\
 	/**
 	 * Fill a gamma ramp
 	 * 
diff --git a/src/common.h b/src/common.h
index 98384cc..7baedae 100644
--- a/src/common.h
+++ b/src/common.h
@@ -235,14 +235,14 @@ struct location_provider {
 
 
 #define LIST_RAMPS_STOP_VALUE_TYPES(X, D)\
-	X(u8, uint8_t, UINT8_MAX + 1ULL, UINT8_MAX, 8) D\
-	X(u16, uint16_t, UINT16_MAX + 1ULL, UINT16_MAX, 16) D\
-	X(u32, uint32_t, UINT32_MAX + 1ULL, UINT32_MAX, 32) D\
-	X(u64, uint64_t, UINT64_MAX, UINT64_MAX, 64) D\
-	X(float, float, 1, 1, -1) D\
-	X(double, double, 1, 1, -2)
-
-#define X(SUFFIX, TYPE, MAX, TRUE_MAX, DEPTH)\
+	X(u8, uint8_t, UINT8_MAX, 8) D\
+	X(u16, uint16_t, UINT16_MAX, 16) D\
+	X(u32, uint32_t, UINT32_MAX, 32) D\
+	X(u64, uint64_t, UINT64_MAX, 64) D\
+	X(float, float, 1, -1) D\
+	X(double, double, 1, -2)
+
+#define X(SUFFIX, TYPE, MAX, DEPTH)\
 	/**
 	 * Fill the gamma ramps
 	 * 
diff --git a/src/gamma-coopgamma.c b/src/gamma-coopgamma.c
index 0dd47c5..e108e86 100644
--- a/src/gamma-coopgamma.c
+++ b/src/gamma-coopgamma.c
@@ -268,7 +268,7 @@ coopgamma_start(struct gamma_state *state, enum program_mode mode)
 
 		/* Get total size of the ramps */
 		switch (info.depth) {
-#define X(SUFFIX, TYPE, MAX, TRUE_MAX, DEPTH)\
+#define X(SUFFIX, TYPE, MAX, DEPTH)\
 		case DEPTH:\
 			crtc->rampsize = sizeof(TYPE);\
 			break
@@ -299,7 +299,7 @@ coopgamma_start(struct gamma_state *state, enum program_mode mode)
 #define float f
 #define double d
 		switch (info.depth) {
-#define X(SUFFIX, TYPE, MAX, TRUE_MAX, DEPTH)\
+#define X(SUFFIX, TYPE, MAX, DEPTH)\
 		case DEPTH:\
 			r = libcoopgamma_ramps_initialise(&crtc->filter.ramps.SUFFIX);\
 			if (r < 0) {\
@@ -314,17 +314,17 @@ coopgamma_start(struct gamma_state *state, enum program_mode mode)
 			for (j = 0; j < crtc->plain_ramps.SUFFIX.red_size; j++) {\
 				d = j;\
 				d /= crtc->plain_ramps.SUFFIX.red_size;\
-				crtc->plain_ramps.SUFFIX.red[j] = d * TRUE_MAX;\
+				crtc->plain_ramps.SUFFIX.red[j] = d * (MAX);\
 			}\
 			for (j = 0; j < crtc->plain_ramps.SUFFIX.green_size; j++) {\
 				d = j;\
 				d /= crtc->plain_ramps.SUFFIX.green_size;\
-				crtc->plain_ramps.SUFFIX.green[j] = d * TRUE_MAX;\
+				crtc->plain_ramps.SUFFIX.green[j] = d * (MAX);\
 			}\
 			for (j = 0; j < crtc->plain_ramps.SUFFIX.blue_size; j++) {\
 				d = j;\
 				d /= crtc->plain_ramps.SUFFIX.blue_size;\
-				crtc->plain_ramps.SUFFIX.blue[j] = d * TRUE_MAX;\
+				crtc->plain_ramps.SUFFIX.blue[j] = d * (MAX);\
 			}\
 			break
 		LIST_RAMPS_STOP_VALUE_TYPES(X, ;);
@@ -495,7 +495,7 @@ coopgamma_set_temperature(struct gamma_state *state, const struct color_setting
 		/* Otherwise, create calculate the ramps */
 		memcpy(filter->ramps.u8.red, state->crtcs[i].plain_ramps.u8.red, state->crtcs[i].rampsize);
 		switch (filter->depth) {
-#define X(SUFFIX, TYPE, MAX, TRUE_MAX, DEPTH)\
+#define X(SUFFIX, TYPE, MAX, DEPTH)\
 		case DEPTH:\
 			colorramp_fill_##SUFFIX((void *)(filter->ramps.u8.red),\
 						(void *)(filter->ramps.u8.green),\
-- 
cgit v1.2.3-70-g09d2