Merge pull request #19 from Pattonville-Robotics/opencv-fixes

added null check to prevent crash
Pattonville-Robotics · Nov 2, 2017 · 0db1dae · 0db1dae
2 parents 0efa29a + f2ad72d
commit 0db1dae
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.../main/java/org/pattonvillerobotics/commoncode/robotclasses/opencv/JewelColorDetector.java b/.../main/java/org/pattonvillerobotics/commoncode/robotclasses/opencv/JewelColorDetector.java
@@ -66,7 +66,7 @@ private void findJewelContours() {
                 }
             }
         }
-        if (redJewel == null) {
+        if (redJewel == null && Contour.findLargestContour(redDetector.getContours()) != null) {
             Point center = Contour.centroid(Contour.findLargestContour(redDetector.getContours()));
             redJewel = new Vector3D(center.x, center.y, 20);
         }
@@ -82,7 +82,7 @@ private void findJewelContours() {
                 }
             }
         }
-        if (blueJewel == null) {
+        if (blueJewel == null && Contour.findLargestContour(redDetector.getContours()) != null) {
             Point center = Contour.centroid(Contour.findLargestContour(redDetector.getContours()));
             blueJewel = new Vector3D(center.x, center.y, 20);
         }