Simplified set_colour_index_range

danieljprice · Aug 1, 2022 · 47e1727 · 47e1727
1 parent 0cff1d5
commit 47e1727
Showing 1 changed file with 6 additions and 25 deletions.
diff --git a/src/giza-colour-index.c b/src/giza-colour-index.c
@@ -427,31 +427,12 @@ _giza_init_colour_index (void)
 void
 giza_set_colour_index_range (int cimin, int cimax)
 {
-  if (cimin < GIZA_COLOUR_INDEX_MIN)
-    {
-      _giza_colour_index_min = GIZA_COLOUR_INDEX_MIN;
-    }
-   else if (cimin > GIZA_COLOUR_INDEX_MAX)
-    {
-      _giza_colour_index_min = GIZA_COLOUR_INDEX_MAX;
-    }
-   else
-    {
-      _giza_colour_index_min = cimin;
-    }
-
-  if (cimax < GIZA_COLOUR_INDEX_MIN)
-    {
-      _giza_colour_index_max = GIZA_COLOUR_INDEX_MIN;
-    }
-   else if (cimax > GIZA_COLOUR_INDEX_MAX)
-    {
-      _giza_colour_index_max = GIZA_COLOUR_INDEX_MAX;
-    }
-   else
-    {
-      _giza_colour_index_max = cimax;
-    }
+  /* constrain both colour indices to be within GIZA_COLOUR_INDEX_MIN, GIZA_COLOUR_INDEX_MAX */
+  _giza_colour_index_min = MAX(GIZA_COLOUR_INDEX_MIN, MIN(cimin, GIZA_COLOUR_INDEX_MAX));
+  _giza_colour_index_max = MIN(GIZA_COLOUR_INDEX_MAX, MAX(cimax, GIZA_COLOUR_INDEX_MIN));
+  /* Now make sure that colour_index_min <= colour_index_max */
+  _giza_colour_index_min = MIN(_giza_colour_index_min, _giza_colour_index_max);
+  _giza_colour_index_max = MAX(_giza_colour_index_min, _giza_colour_index_max);
 }
 
 /**