Merge pull request #13 from hanmertens/color8_constructors

matthew-a-thomas · web-flow · commit 59ceedfbd657 · 2020-08-18T22:05:44.000-04:00
Fix bounds check for Color8::new_rgb
diff --git a/src/colors.rs b/src/colors.rs
@@ -184,7 +184,7 @@ impl Color8 {
 
     /// New RGB color, each channel in range `0..6`
     pub fn new_rgb(r: u8, g: u8, b: u8) -> Result<Self, OutOfBoundsError> {
-        if r < 6 || g < 6 || b < 6 {
+        if r < 6 && g < 6 && b < 6 {
             Ok(Self {
                 byte: 16 + r * 36 + g * 6 + b,
             })
diff --git a/tests/tests.rs b/tests/tests.rs
@@ -125,3 +125,11 @@ fn convert_rgb_to_color8() {
 fn convert_gray_to_color8() {
     assert_eq!(Color8::new_gray(23).unwrap(), Color8::new(255));
 }
+
+#[test]
+fn color8_new_rgb() {
+    assert!(Color8::new_rgb(6, 5, 5).is_err());
+    assert!(Color8::new_rgb(5, 6, 5).is_err());
+    assert!(Color8::new_rgb(5, 5, 6).is_err());
+    assert!(Color8::new_rgb(5, 5, 5).is_ok());
+}
