Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpiutil] Fix RawFrame.setInfo() NPE (#6167)

Browse Source
This commit is contained in:
Peter Johnson
2024-01-06 12:50:11 -08:00
committed by GitHub
parent 8659372d08
commit dd90965362
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wpiutil/src/main/java/edu/wpi/first/util/RawFrame.java
View File

@@ -17,7 +17,7 @@ public class RawFrame implements AutoCloseable {
private int m_width;
private int m_height;
private int m_stride;
private PixelFormat m_pixelFormat;
private PixelFormat m_pixelFormat = PixelFormat.kUnknown;
/** Construct a new empty RawFrame. */
public RawFrame() {
@@ -102,7 +102,12 @@ public class RawFrame implements AutoCloseable {
m_stride = stride;
m_pixelFormat = pixelFormat;
WPIUtilJNI.setRawFrameInfo(
m_nativeObj, m_data.limit(), width, height, stride, pixelFormat.getValue());
m_nativeObj,
m_data != null ? m_data.limit() : 0,
width,
height,
stride,
pixelFormat.getValue());
}
/**
@@ -142,7 +147,7 @@ public class RawFrame implements AutoCloseable {
* @return The total size of the data stored in the frame.
*/
public int getSize() {
return m_data.limit();
return m_data != null ? m_data.limit() : 0;
}
/**