From: Tomas Wenström <tomas.wenstrom@gmail.com>
Date: Sun, 11 Aug 2019 10:42:39 +0000 (+0200)
Subject: Limit range of saturation config
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=34d8fc098785b8aaecbc7edafeb919b1abbd07cd;p=kaka%2Fcakelight.git

Limit range of saturation config
---

diff --git a/src/kaka/cakelight/Configuration.java b/src/kaka/cakelight/Configuration.java
index 51b2a00..a24f411 100644
--- a/src/kaka/cakelight/Configuration.java
+++ b/src/kaka/cakelight/Configuration.java
@@ -71,7 +71,7 @@ public class Configuration {
                 default:
                     format = Imgproc.COLOR_YUV2BGR_UYVY;
             }
-            saturation = Double.parseDouble(get(prop, "video.saturation", "0.5"));
+            saturation = inRange(Double.parseDouble(get(prop, "video.saturation", "0.5")), 0, 1);
             crop = new CropConfiguration(prop);
             list = new ListConfiguration(prop);
         }
@@ -108,7 +108,7 @@ public class Configuration {
         private LedConfiguration(Properties prop) {
             cols = Integer.parseInt(get(prop, "leds.cols"));
             rows = Integer.parseInt(get(prop, "leds.rows"));
-            brightness = Math.max(1, Math.min(31, Integer.parseInt(get(prop, "leds.brightness", "31"))));
+            brightness = (int) inRange(Integer.parseInt(get(prop, "leds.brightness", "31")), 1, 31);
             switch (get(prop, "leds.type", "").toUpperCase()) {
                 case "WS2801":
                     type = LedType.WS2801;
@@ -127,4 +127,10 @@ public class Configuration {
     public enum LedType {
         WS2801, APA102
     }
+
+    private double inRange(double value, double lower, double upper) {
+        return value < lower ? lower
+                : value > upper ? upper
+                : value;
+    }
 }