#4683 clang-format on all files in ApplicationCode

This commit is contained in:
Magne Sjaastad
2019-09-06 10:40:57 +02:00
parent 3a317504bb
commit fe9e567825
2092 changed files with 117952 additions and 111846 deletions

View File

@@ -21,8 +21,6 @@
#include <algorithm>
#include <cassert>
//==================================================================================================
//
//
@@ -40,32 +38,30 @@
// imageHeight: 2 bytes :
// arrayData: ...
// Header offsets in bytes
static const size_t VDE_BYTEOFFSET_PACKET_VERSION = 0;
static const size_t VDE_BYTEOFFSET_ARRAY_ID = 2;
static const size_t VDE_BYTEOFFSET_ELEMENT_COUNT = 6;
static const size_t VDE_BYTEOFFSET_ELEMENT_TYPE = 10;
static const size_t VDE_BYTEOFFSET_IMAGE_COMPONENT_COUNT= 11;
static const size_t VDE_BYTEOFFSET_IMAGE_WIDTH = 12;
static const size_t VDE_BYTEOFFSET_IMAGE_HEIGHT = 14;
static const size_t VDE_BYTEOFFSET_PACKET_VERSION = 0;
static const size_t VDE_BYTEOFFSET_ARRAY_ID = 2;
static const size_t VDE_BYTEOFFSET_ELEMENT_COUNT = 6;
static const size_t VDE_BYTEOFFSET_ELEMENT_TYPE = 10;
static const size_t VDE_BYTEOFFSET_IMAGE_COMPONENT_COUNT = 11;
static const size_t VDE_BYTEOFFSET_IMAGE_WIDTH = 12;
static const size_t VDE_BYTEOFFSET_IMAGE_HEIGHT = 14;
// Header size in bytes
static const size_t VDE_HEADER_SIZE = 2 + 4 + 4 + 1 + 1 + 2 + 2;
static const size_t VDE_PACKET_VERSION = 1;
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
VdeArrayDataPacket::VdeArrayDataPacket()
: m_arrayId(-1),
m_elementType(Unknown),
m_elementCount(0),
m_imageWidth(0),
m_imageHeight(0),
m_imageComponentCount(0)
: m_arrayId( -1 )
, m_elementType( Unknown )
, m_elementCount( 0 )
, m_imageWidth( 0 )
, m_imageHeight( 0 )
, m_imageComponentCount( 0 )
{
}
@@ -74,9 +70,7 @@ VdeArrayDataPacket::VdeArrayDataPacket()
//--------------------------------------------------------------------------------------------------
bool VdeArrayDataPacket::isValid() const
{
if (m_elementType != Unknown &&
m_packetBytes.size() >= VDE_HEADER_SIZE &&
m_arrayId >= 0)
if ( m_elementType != Unknown && m_packetBytes.size() >= VDE_HEADER_SIZE && m_arrayId >= 0 )
{
return true;
}
@@ -84,7 +78,6 @@ bool VdeArrayDataPacket::isValid() const
{
return false;
}
}
//--------------------------------------------------------------------------------------------------
@@ -108,20 +101,24 @@ VdeArrayDataPacket::ElementType VdeArrayDataPacket::elementType() const
//--------------------------------------------------------------------------------------------------
size_t VdeArrayDataPacket::elementSize() const
{
return sizeOfElement(m_elementType);
return sizeOfElement( m_elementType );
}
//--------------------------------------------------------------------------------------------------
/// Size of specified element type in bytes
//--------------------------------------------------------------------------------------------------
size_t VdeArrayDataPacket::sizeOfElement(ElementType elementType)
size_t VdeArrayDataPacket::sizeOfElement( ElementType elementType )
{
switch (elementType)
switch ( elementType )
{
case Unknown: return 0;
case Float32: return sizeof(float);
case Uint32: return sizeof(unsigned int);
case Uint8: return sizeof(unsigned char);
case Unknown:
return 0;
case Float32:
return sizeof( float );
case Uint32:
return sizeof( unsigned int );
case Uint8:
return sizeof( unsigned char );
}
return 0;
@@ -140,7 +137,7 @@ size_t VdeArrayDataPacket::elementCount() const
//--------------------------------------------------------------------------------------------------
const char* VdeArrayDataPacket::arrayData() const
{
if (m_packetBytes.size() > VDE_HEADER_SIZE)
if ( m_packetBytes.size() > VDE_HEADER_SIZE )
{
const char* ptr = m_packetBytes.data();
return ptr + VDE_HEADER_SIZE;
@@ -178,78 +175,85 @@ unsigned char VdeArrayDataPacket::imageComponentCount() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<VdeArrayDataPacket> VdeArrayDataPacket::fromFloat32Arr(int arrayId, const float* srcArr, size_t srcArrElementCount)
std::unique_ptr<VdeArrayDataPacket>
VdeArrayDataPacket::fromFloat32Arr( int arrayId, const float* srcArr, size_t srcArrElementCount )
{
size_t payloadByteCount = srcArrElementCount*sizeof(float);
const char* rawSrcPtr = reinterpret_cast<const char*>(srcArr);
size_t payloadByteCount = srcArrElementCount * sizeof( float );
const char* rawSrcPtr = reinterpret_cast<const char*>( srcArr );
std::unique_ptr<VdeArrayDataPacket> packet(new VdeArrayDataPacket);
packet->assign(arrayId, Float32, srcArrElementCount, 0, 0, 0, rawSrcPtr, payloadByteCount);
std::unique_ptr<VdeArrayDataPacket> packet( new VdeArrayDataPacket );
packet->assign( arrayId, Float32, srcArrElementCount, 0, 0, 0, rawSrcPtr, payloadByteCount );
return packet;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<VdeArrayDataPacket> VdeArrayDataPacket::fromUint32Arr(int arrayId, const unsigned int* srcArr, size_t srcArrElementCount)
std::unique_ptr<VdeArrayDataPacket>
VdeArrayDataPacket::fromUint32Arr( int arrayId, const unsigned int* srcArr, size_t srcArrElementCount )
{
size_t payloadByteCount = srcArrElementCount*sizeof(unsigned int);
const char* rawSrcPtr = reinterpret_cast<const char*>(srcArr);
size_t payloadByteCount = srcArrElementCount * sizeof( unsigned int );
const char* rawSrcPtr = reinterpret_cast<const char*>( srcArr );
std::unique_ptr<VdeArrayDataPacket> packet(new VdeArrayDataPacket);
packet->assign(arrayId, Uint32, srcArrElementCount, 0, 0, 0, rawSrcPtr, payloadByteCount);
std::unique_ptr<VdeArrayDataPacket> packet( new VdeArrayDataPacket );
packet->assign( arrayId, Uint32, srcArrElementCount, 0, 0, 0, rawSrcPtr, payloadByteCount );
return packet;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<VdeArrayDataPacket> VdeArrayDataPacket::fromUint8ImageRGBArr(int arrayId, unsigned short imageWidth, unsigned short imageHeight, const unsigned char* srcArr, size_t srcArrElementCount)
std::unique_ptr<VdeArrayDataPacket> VdeArrayDataPacket::fromUint8ImageRGBArr( int arrayId,
unsigned short imageWidth,
unsigned short imageHeight,
const unsigned char* srcArr,
size_t srcArrElementCount )
{
const char* rawSrcPtr = reinterpret_cast<const char*>(srcArr);
const char* rawSrcPtr = reinterpret_cast<const char*>( srcArr );
assert(3*imageWidth*imageHeight == srcArrElementCount);
assert( 3 * imageWidth * imageHeight == srcArrElementCount );
std::unique_ptr<VdeArrayDataPacket> packet(new VdeArrayDataPacket);
packet->assign(arrayId, Uint8, srcArrElementCount, imageWidth, imageHeight, 3, rawSrcPtr, srcArrElementCount);
std::unique_ptr<VdeArrayDataPacket> packet( new VdeArrayDataPacket );
packet->assign( arrayId, Uint8, srcArrElementCount, imageWidth, imageHeight, 3, rawSrcPtr, srcArrElementCount );
return packet;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
VdeArrayDataPacket VdeArrayDataPacket::fromRawPacketBuffer(const char* rawPacketBuffer, size_t bufferSize, std::string* errString)
VdeArrayDataPacket
VdeArrayDataPacket::fromRawPacketBuffer( const char* rawPacketBuffer, size_t bufferSize, std::string* errString )
{
if (bufferSize < VDE_HEADER_SIZE)
if ( bufferSize < VDE_HEADER_SIZE )
{
if (errString) *errString = "Buffer size is less than fixed header size";
if ( errString ) *errString = "Buffer size is less than fixed header size";
return VdeArrayDataPacket();
}
VdeBufferReader bufferReader(rawPacketBuffer, bufferSize);
const unsigned short packetVersion = bufferReader.getUint16(VDE_BYTEOFFSET_PACKET_VERSION);
if (packetVersion != VDE_PACKET_VERSION)
VdeBufferReader bufferReader( rawPacketBuffer, bufferSize );
const unsigned short packetVersion = bufferReader.getUint16( VDE_BYTEOFFSET_PACKET_VERSION );
if ( packetVersion != VDE_PACKET_VERSION )
{
if (errString) *errString = "Wrong packet version";
if ( errString ) *errString = "Wrong packet version";
return VdeArrayDataPacket();
}
const int packetId = bufferReader.getUint32(VDE_BYTEOFFSET_ARRAY_ID);
const ElementType elementType = static_cast<ElementType>(bufferReader.getUint8(VDE_BYTEOFFSET_ELEMENT_TYPE));
const size_t elementCount = bufferReader.getUint32(VDE_BYTEOFFSET_ELEMENT_COUNT);
const int packetId = bufferReader.getUint32( VDE_BYTEOFFSET_ARRAY_ID );
const ElementType elementType = static_cast<ElementType>( bufferReader.getUint8( VDE_BYTEOFFSET_ELEMENT_TYPE ) );
const size_t elementCount = bufferReader.getUint32( VDE_BYTEOFFSET_ELEMENT_COUNT );
const unsigned char imageCompCount = bufferReader.getUint8(VDE_BYTEOFFSET_IMAGE_COMPONENT_COUNT);
const unsigned short imageWidth = bufferReader.getUint16(VDE_BYTEOFFSET_IMAGE_WIDTH);
const unsigned short imageHeight = bufferReader.getUint16(VDE_BYTEOFFSET_IMAGE_HEIGHT);
const unsigned char imageCompCount = bufferReader.getUint8( VDE_BYTEOFFSET_IMAGE_COMPONENT_COUNT );
const unsigned short imageWidth = bufferReader.getUint16( VDE_BYTEOFFSET_IMAGE_WIDTH );
const unsigned short imageHeight = bufferReader.getUint16( VDE_BYTEOFFSET_IMAGE_HEIGHT );
const char* payloadPtr = rawPacketBuffer + VDE_HEADER_SIZE;
const char* payloadPtr = rawPacketBuffer + VDE_HEADER_SIZE;
const size_t payloadSizeInBytes = bufferSize - VDE_HEADER_SIZE;
const size_t payloadSizeInBytesFromPacketFields = elementCount*sizeOfElement(elementType);
assert(payloadSizeInBytes == payloadSizeInBytesFromPacketFields);
const size_t payloadSizeInBytesFromPacketFields = elementCount * sizeOfElement( elementType );
assert( payloadSizeInBytes == payloadSizeInBytesFromPacketFields );
VdeArrayDataPacket packet;
packet.assign(packetId, elementType, elementCount, imageWidth, imageHeight, imageCompCount, payloadPtr, payloadSizeInBytes);
packet.assign( packetId, elementType, elementCount, imageWidth, imageHeight, imageCompCount, payloadPtr, payloadSizeInBytes );
return packet;
}
@@ -257,35 +261,42 @@ VdeArrayDataPacket VdeArrayDataPacket::fromRawPacketBuffer(const char* rawPacket
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool VdeArrayDataPacket::assign(int arrayId, ElementType elementType, size_t elementCount, unsigned short imageWidth, unsigned short imageHeight, unsigned char imageCompCount, const char* arrayDataPtr, size_t arrayDataSizeInBytes)
bool VdeArrayDataPacket::assign( int arrayId,
ElementType elementType,
size_t elementCount,
unsigned short imageWidth,
unsigned short imageHeight,
unsigned char imageCompCount,
const char* arrayDataPtr,
size_t arrayDataSizeInBytes )
{
assert(arrayDataSizeInBytes > 0);
assert( arrayDataSizeInBytes > 0 );
const size_t totalSizeBytes = VDE_HEADER_SIZE + arrayDataSizeInBytes;
m_packetBytes.resize(totalSizeBytes);
m_packetBytes.resize( totalSizeBytes );
VdeBufferWriter bufferWriter(m_packetBytes.data(), m_packetBytes.size());
bufferWriter.setUint16(VDE_BYTEOFFSET_PACKET_VERSION, VDE_PACKET_VERSION);
bufferWriter.setUint32(VDE_BYTEOFFSET_ARRAY_ID, arrayId);
bufferWriter.setUint32(VDE_BYTEOFFSET_ELEMENT_COUNT, static_cast<unsigned int>(elementCount));
bufferWriter.setUint8( VDE_BYTEOFFSET_ELEMENT_TYPE, static_cast<unsigned char>(elementType));
bufferWriter.setUint16(VDE_BYTEOFFSET_IMAGE_COMPONENT_COUNT, imageCompCount);
bufferWriter.setUint16(VDE_BYTEOFFSET_IMAGE_WIDTH, imageWidth);
bufferWriter.setUint16(VDE_BYTEOFFSET_IMAGE_HEIGHT, imageHeight);
VdeBufferWriter bufferWriter( m_packetBytes.data(), m_packetBytes.size() );
bufferWriter.setUint16( VDE_BYTEOFFSET_PACKET_VERSION, VDE_PACKET_VERSION );
bufferWriter.setUint32( VDE_BYTEOFFSET_ARRAY_ID, arrayId );
bufferWriter.setUint32( VDE_BYTEOFFSET_ELEMENT_COUNT, static_cast<unsigned int>( elementCount ) );
bufferWriter.setUint8( VDE_BYTEOFFSET_ELEMENT_TYPE, static_cast<unsigned char>( elementType ) );
bufferWriter.setUint16( VDE_BYTEOFFSET_IMAGE_COMPONENT_COUNT, imageCompCount );
bufferWriter.setUint16( VDE_BYTEOFFSET_IMAGE_WIDTH, imageWidth );
bufferWriter.setUint16( VDE_BYTEOFFSET_IMAGE_HEIGHT, imageHeight );
const size_t calcArraySizeInBytes = elementCount*sizeOfElement(elementType);
assert(arrayDataSizeInBytes == calcArraySizeInBytes);
const size_t calcArraySizeInBytes = elementCount * sizeOfElement( elementType );
assert( arrayDataSizeInBytes == calcArraySizeInBytes );
std::copy(arrayDataPtr, arrayDataPtr + arrayDataSizeInBytes, m_packetBytes.begin() + VDE_HEADER_SIZE);
assert(m_packetBytes.size() == totalSizeBytes);
std::copy( arrayDataPtr, arrayDataPtr + arrayDataSizeInBytes, m_packetBytes.begin() + VDE_HEADER_SIZE );
assert( m_packetBytes.size() == totalSizeBytes );
m_arrayId = arrayId;
m_elementType = elementType;
m_arrayId = arrayId;
m_elementType = elementType;
m_elementCount = elementCount;
m_imageComponentCount = imageCompCount;
m_imageWidth = imageWidth;
m_imageHeight = imageHeight;
m_imageWidth = imageWidth;
m_imageHeight = imageHeight;
return true;
}
@@ -306,8 +317,6 @@ const char* VdeArrayDataPacket::fullPacketRawPtr() const
return m_packetBytes.data();
}
//==================================================================================================
//
//
@@ -317,20 +326,20 @@ const char* VdeArrayDataPacket::fullPacketRawPtr() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
VdeBufferReader::VdeBufferReader(const char* buffer, size_t bufferSize)
: m_buffer(buffer),
m_bufferSize(bufferSize)
VdeBufferReader::VdeBufferReader( const char* buffer, size_t bufferSize )
: m_buffer( buffer )
, m_bufferSize( bufferSize )
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
unsigned int VdeBufferReader::getUint32(size_t byteOffset) const
unsigned int VdeBufferReader::getUint32( size_t byteOffset ) const
{
if (byteOffset + sizeof(unsigned int) <= m_bufferSize)
if ( byteOffset + sizeof( unsigned int ) <= m_bufferSize )
{
return *reinterpret_cast<const unsigned int*>(&m_buffer[byteOffset]);
return *reinterpret_cast<const unsigned int*>( &m_buffer[byteOffset] );
}
return 0;
@@ -339,11 +348,11 @@ unsigned int VdeBufferReader::getUint32(size_t byteOffset) const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
unsigned short VdeBufferReader::getUint16(size_t byteOffset) const
unsigned short VdeBufferReader::getUint16( size_t byteOffset ) const
{
if (byteOffset + sizeof(unsigned short) <= m_bufferSize)
if ( byteOffset + sizeof( unsigned short ) <= m_bufferSize )
{
return *reinterpret_cast<const unsigned short*>(&m_buffer[byteOffset]);
return *reinterpret_cast<const unsigned short*>( &m_buffer[byteOffset] );
}
return 0;
@@ -352,18 +361,16 @@ unsigned short VdeBufferReader::getUint16(size_t byteOffset) const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
unsigned char VdeBufferReader::getUint8(size_t byteOffset) const
unsigned char VdeBufferReader::getUint8( size_t byteOffset ) const
{
if (byteOffset + 1 <= m_bufferSize)
if ( byteOffset + 1 <= m_bufferSize )
{
return *reinterpret_cast<const unsigned char*>(&m_buffer[byteOffset]);
return *reinterpret_cast<const unsigned char*>( &m_buffer[byteOffset] );
}
return 0;
}
//==================================================================================================
//
//
@@ -373,42 +380,41 @@ unsigned char VdeBufferReader::getUint8(size_t byteOffset) const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
VdeBufferWriter::VdeBufferWriter(char* buffer, size_t bufferSize)
: m_buffer(buffer),
m_bufferSize(bufferSize)
VdeBufferWriter::VdeBufferWriter( char* buffer, size_t bufferSize )
: m_buffer( buffer )
, m_bufferSize( bufferSize )
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void VdeBufferWriter::setUint32(size_t byteOffset, unsigned int val)
void VdeBufferWriter::setUint32( size_t byteOffset, unsigned int val )
{
if (byteOffset + sizeof(unsigned int) <= m_bufferSize)
if ( byteOffset + sizeof( unsigned int ) <= m_bufferSize )
{
*reinterpret_cast<unsigned int*>(&m_buffer[byteOffset]) = val;
*reinterpret_cast<unsigned int*>( &m_buffer[byteOffset] ) = val;
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void VdeBufferWriter::setUint16(size_t byteOffset, unsigned short val)
void VdeBufferWriter::setUint16( size_t byteOffset, unsigned short val )
{
if (byteOffset + sizeof(unsigned short) <= m_bufferSize)
if ( byteOffset + sizeof( unsigned short ) <= m_bufferSize )
{
*reinterpret_cast<unsigned short*>(&m_buffer[byteOffset]) = val;
*reinterpret_cast<unsigned short*>( &m_buffer[byteOffset] ) = val;
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void VdeBufferWriter::setUint8(size_t byteOffset, unsigned char val)
void VdeBufferWriter::setUint8( size_t byteOffset, unsigned char val )
{
if (byteOffset + 1 <= m_bufferSize)
if ( byteOffset + 1 <= m_bufferSize )
{
*reinterpret_cast<unsigned char*>(&m_buffer[byteOffset]) = val;
*reinterpret_cast<unsigned char*>( &m_buffer[byteOffset] ) = val;
}
}