Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up integer type usage in wpilibc (#92)

Browse Source 
Replaced all unsigned types to signed and int32_t with int in wpilibc
This commit is contained in:
Tyler Veness
2016-09-06 00:01:45 -07:00
committed by Peter Johnson
parent ff93050b31
commit 0cd05d1a42
169 changed files with 914 additions and 943 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
wpilibc/athena/include/USBCamera.h
View File

@@ -50,19 +50,19 @@ class USBCamera : public ErrorBase {
priority_recursive_mutex m_mutex;
unsigned int m_width = 320;
unsigned int m_height = 240;
int m_width = 320;
int m_height = 240;
double m_fps = 30;
std::string m_whiteBalance = AUTO;
unsigned int m_whiteBalanceValue = 0;
int m_whiteBalanceValue = 0;
bool m_whiteBalanceValuePresent = false;
std::string m_exposure = MANUAL;
unsigned int m_exposureValue = 50;
int m_exposureValue = 50;
bool m_exposureValuePresent = false;
unsigned int m_brightness = 80;
int m_brightness = 80;
bool m_needSettingsUpdate = true;
unsigned int GetJpegSize(void* buffer, unsigned int buffSize);
int GetJpegSize(void* buffer, int buffSize);
public:
static constexpr char const* kDefaultCameraName = "cam0";
@@ -74,18 +74,18 @@ class USBCamera : public ErrorBase {
void StartCapture();
void StopCapture();
void SetFPS(double fps);
void SetSize(unsigned int width, unsigned int height);
void SetSize(int width, int height);
void UpdateSettings();
/**
* Set the brightness, as a percentage (0-100).
*/
void SetBrightness(unsigned int brightness);
void SetBrightness(int brightness);
/**
* Get the brightness, as a percentage (0-100).
*/
unsigned int GetBrightness();
int GetBrightness();
/**
* Set the white balance to auto
@@ -100,7 +100,7 @@ class USBCamera : public ErrorBase {
/**
* Set the white balance to manual, with specified color temperature
*/
void SetWhiteBalanceManual(unsigned int wbValue);
void SetWhiteBalanceManual(int wbValue);
/**
* Set the exposure to auto exposure
@@ -115,8 +115,8 @@ class USBCamera : public ErrorBase {
/**
* Set the exposure to manual, with a given percentage (0-100)
*/
void SetExposureManual(unsigned int expValue);
void SetExposureManual(int expValue);
void GetImage(Image* image);
unsigned int GetImageData(void* buffer, unsigned int bufferSize);
int GetImageData(void* buffer, int bufferSize);
};