Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-06 03:31:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up odd formatting from static_cast by using "u" integer literal (#200)

Browse Source
This commit is contained in:
Tyler Veness
2016-08-12 06:08:57 -07:00
committed by Peter Johnson
parent 3819cd0768
commit d347cebf67
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wpilibc/athena/src/USBCamera.cpp
View File

@@ -54,9 +54,7 @@ unsigned int USBCamera::GetJpegSize(void* buffer, unsigned int buffSize) {
} else if (t == 0xda) {
// SOS marker. The next two bytes are a 16-bit big-endian int that is
// the length of the SOS header, skip that
unsigned int len = (static_cast<unsigned int>(data[pos + 2]) & 0xff)
<< 8 |
(static_cast<unsigned int>(data[pos + 3]) & 0xff);
unsigned int len = (data[pos + 2] & 0xffu) << 8 | (data[pos + 3] & 0xffu);
pos += len + 2;
// The next marker is the first marker that is 0xff followed by a non-RST
// element. 0xff followed by 0x00 is an escaped 0xff. 0xd0-0xd7 are RST
@@ -71,9 +69,7 @@ unsigned int USBCamera::GetJpegSize(void* buffer, unsigned int buffSize) {
// 16-bit
// big-endian int with the length of the marker header, skip that then
// continue searching
unsigned int len = (static_cast<unsigned int>(data[pos + 2]) & 0xff)
<< 8 |
(static_cast<unsigned int>(data[pos + 3]) & 0xff);
unsigned int len = (data[pos + 2] & 0xffu) << 8 | (data[pos + 3] & 0xffu);
pos += len + 2;
}
}