Fixed issue with conversion of raw frame to cv mat

PhotonVision · Dec 28, 2023 · 6b53449 · 6b53449
1 parent 05a231b
commit 6b53449
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/photon-lib/src/main/java/org/photonvision/simulation/VideoSimUtil.java b/photon-lib/src/main/java/org/photonvision/simulation/VideoSimUtil.java
@@ -101,7 +101,7 @@ public static Point[] getImageCorners(Size size) {
      */
     public static Mat get36h11TagImage(int id) {
         RawFrame frame = AprilTag.generate36h11AprilTagImage(id);
-        Mat result = new Mat(10, 10, CvType.CV_8UC1, frame.getData());
+        Mat result = new Mat(10, 10, CvType.CV_8UC1, frame.getData(), frame.getStride());
         return result;
     }
 

diff --git a/photon-lib/src/main/native/include/photon/simulation/VideoSimUtil.h b/photon-lib/src/main/native/include/photon/simulation/VideoSimUtil.h
@@ -59,7 +59,8 @@ static constexpr units::meter_t fieldWidth{8.0137_m};
 static cv::Mat Get36h11TagImage(int id) {
   wpi::RawFrame frame;
   frc::AprilTag::Generate36h11AprilTagImage(&frame, id);
-  cv::Mat markerImage{frame.height, frame.width, CV_8UC1, frame.data};
+  cv::Mat markerImage{frame.height, frame.width, CV_8UC1, frame.data,
+                      static_cast<size_t>(frame.stride)};
   cv::Mat markerClone = markerImage.clone();
   return markerClone;
 }