From 9f68be992202d5c07a903ff28b7ef2f0369c7087 Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 2 Nov 2019 12:46:36 -0700 Subject: [PATCH] Fix cameraProcess/cvProcess missmatch --- .../com/chameleonvision/vision/process/CameraProcess.java | 4 ---- .../com/chameleonvision/vision/process/VisionProcess.java | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Main/src/main/java/com/chameleonvision/vision/process/CameraProcess.java b/Main/src/main/java/com/chameleonvision/vision/process/CameraProcess.java index 00582ea50..9683c00a6 100644 --- a/Main/src/main/java/com/chameleonvision/vision/process/CameraProcess.java +++ b/Main/src/main/java/com/chameleonvision/vision/process/CameraProcess.java @@ -27,8 +27,4 @@ public interface CameraProcess extends Runnable { CamVideoMode getVideoMode(); String getNickname(); void setCurrentPipelineIndex(int ntPipelineIndex); - - PipelineResult runPipeline(Pipeline currentPipeline, Mat inputImage, Mat outputImage, - CameraValues cameraValues, boolean shouldFlip, boolean driverMode); - } diff --git a/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java b/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java index eca77787b..4c5b234de 100644 --- a/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java +++ b/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java @@ -97,7 +97,7 @@ public class VisionProcess implements Runnable { } private PipelineResult runVisionProcess(Mat inputImage, Mat outputImage) { - return cameraProcess.runPipeline( + return cvProcess.runPipeline( currentPipeline, inputImage, outputImage,