fixed errors on mac

PhotonVision · Nov 26, 2023 · 337bc73 · 337bc73
1 parent 434baac
commit 337bc73
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/photon-lib/src/main/native/include/photon/simulation/VisionSystemSim.h b/photon-lib/src/main/native/include/photon/simulation/VisionSystemSim.h
@@ -24,7 +24,6 @@
 
 #pragma once
 
-#include <ranges>
 #include <string>
 #include <unordered_map>
 #include <utility>
@@ -54,8 +53,11 @@ class VisionSystemSim {
     }
   }
   std::vector<PhotonCameraSim*> GetCameraSims() {
-    auto vals = std::views::values(camSimMap);
-    return std::vector<PhotonCameraSim*>{vals.begin(), vals.end()};
+    std::vector<PhotonCameraSim*> retVal;
+    for (auto const& cam : camSimMap) {
+      retVal.emplace_back(cam.second);
+    }
+    return retVal;
   }
   void AddCamera(PhotonCameraSim* cameraSim,
                  const frc::Transform3d& robotToCamera) {

diff --git a/photon-targeting/src/main/native/include/photon/estimation/OpenCVHelp.h b/photon-targeting/src/main/native/include/photon/estimation/OpenCVHelp.h
@@ -269,7 +269,6 @@ static frc::Rotation3d RVecToRotation(const cv::Mat& rvecInput) {
 
   float error = 0;
   frc::Transform3d best{};
-  std::optional<frc::Transform3d> alt{std::nullopt};
 
   cv::solvePnPGeneric(objectMat, imagePoints, cameraMat, distCoeffsMat, rvecs,
                       tvecs, false, cv::SOLVEPNP_SQPNP, rvec, tvec,