Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Clang Compiler Warnings (Errors) #114

Merged
merged 4 commits into from
Feb 19, 2025
Merged

Fix Clang Compiler Warnings (Errors) #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83e094a
Remove private unused variable from RTPacket.h, remove unused 'this' …
OliverGlandberger Feb 18, 2025
08f3ed8
Add additional parenthesis to subobject.
OliverGlandberger Feb 18, 2025
76bcb0c
Remove unnecessary ampersand in lambda.
OliverGlandberger Feb 18, 2025
58bb53f
Rename lambda to not have a capital letter at the start.
OliverGlandberger Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion RTPacket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ class DLL_EXPORT CRTPacket
std::vector<char*> mpTimecodeData;
std::vector<char*> mpSkeletonData;
unsigned int mnComponentCount;
EComponentType meComponentType;
unsigned int mn2DCameraCount;
unsigned int mn2DLinCameraCount;
unsigned int mnImageCameraCount;
Expand Down
24 changes: 12 additions & 12 deletions SettingsDeserializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ bool SettingsDeserializer::DeserializeGeneralSettings(SSettingsGeneral& generalS
&generalSettings.eReprocessingActions
};

auto AddFlagFromBoolElement = [this](Deserializer& parent, const char* elementName, EProcessingActions flag,
auto addFlagFromBoolElement = [](Deserializer& parent, const char* elementName, EProcessingActions flag,
EProcessingActions& target) -> bool
{
bool value;
Expand Down Expand Up @@ -293,7 +293,7 @@ bool SettingsDeserializer::DeserializeGeneralSettings(SSettingsGeneral& generalS

if (mMajorVersion > 1 || mMinorVersion > 13)
{
if (!AddFlagFromBoolElement(processingElem, "PreProcessing2D", ProcessingPreProcess2D,
if (!addFlagFromBoolElement(processingElem, "PreProcessing2D", ProcessingPreProcess2D,
*processingActions[i]))
{
return false;
Expand All @@ -318,62 +318,62 @@ bool SettingsDeserializer::DeserializeGeneralSettings(SSettingsGeneral& generalS

if (i != 1) //Not RtProcessingSettings
{
if (!AddFlagFromBoolElement(processingElem, "TwinSystemMerge", ProcessingTwinSystemMerge,
if (!addFlagFromBoolElement(processingElem, "TwinSystemMerge", ProcessingTwinSystemMerge,
*processingActions[i]))
{
return false;
}

if (!AddFlagFromBoolElement(processingElem, "SplineFill", ProcessingSplineFill, *processingActions[i]))
if (!addFlagFromBoolElement(processingElem, "SplineFill", ProcessingSplineFill, *processingActions[i]))
{
return false;
}
}

if (!AddFlagFromBoolElement(processingElem, "AIM", ProcessingAIM, *processingActions[i]))
if (!addFlagFromBoolElement(processingElem, "AIM", ProcessingAIM, *processingActions[i]))
{
return false;
}

if (!AddFlagFromBoolElement(processingElem, "Track6DOF", Processing6DOFTracking, *processingActions[i]))
if (!addFlagFromBoolElement(processingElem, "Track6DOF", Processing6DOFTracking, *processingActions[i]))
{
return false;
}

if (!AddFlagFromBoolElement(processingElem, "ForceData", ProcessingForceData, *processingActions[i]))
if (!addFlagFromBoolElement(processingElem, "ForceData", ProcessingForceData, *processingActions[i]))
{
return false;
}

if (mMajorVersion > 1 || mMinorVersion > 11)
{
if (!AddFlagFromBoolElement(processingElem, "GazeVector", ProcessingGazeVector, *processingActions[i]))
if (!addFlagFromBoolElement(processingElem, "GazeVector", ProcessingGazeVector, *processingActions[i]))
{
return false;
}
}

if (i != 1) //Not RtProcessingSettings
{
if (!AddFlagFromBoolElement(processingElem, "ExportTSV", ProcessingExportTSV, *processingActions[i]))
if (!addFlagFromBoolElement(processingElem, "ExportTSV", ProcessingExportTSV, *processingActions[i]))
{
return false;
}

if (!AddFlagFromBoolElement(processingElem, "ExportC3D", ProcessingExportC3D, *processingActions[i]))
if (!addFlagFromBoolElement(processingElem, "ExportC3D", ProcessingExportC3D, *processingActions[i]))
{
return false;
}

if (!AddFlagFromBoolElement(processingElem, "ExportMatlabFile", ProcessingExportMatlabFile,
if (!addFlagFromBoolElement(processingElem, "ExportMatlabFile", ProcessingExportMatlabFile,
*processingActions[i]))
{
return false;
}

if (mMajorVersion > 1 || mMinorVersion > 11)
{
if (!AddFlagFromBoolElement(processingElem, "ExportAviFile", ProcessingExportAviFile,
if (!addFlagFromBoolElement(processingElem, "ExportAviFile", ProcessingExportAviFile,
*processingActions[i]))
{
return false;
Expand Down
14 changes: 7 additions & 7 deletions Tests/SkeletonParametersTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,13 @@ namespace

std::vector<CRTProtocol::SSettingsSkeleton> CreateDummySkeletonsNonHierarchical()
{
auto segmentsSkeleton1 = std::vector<CRTProtocol::SSettingsSkeletonSegment>{
{ 0, 0.0f, 1.0f, 2.0f, 0.707000017f, -0.707000017f, 0.0f, 0.0f, "segment1", -1, -1 },
{ 0, 3.0f, 4.0f, 5.0f, 0.707000017f, 0.707000017f, 0.0f, 0.0f, "segment3", 0, 1 }
};
auto segmentsSkeleton2 = std::vector<CRTProtocol::SSettingsSkeletonSegment>{
{ 0, 0.0f, 1.0f, 2.0f, 0.707000017f, 0.0f, 0.707000017f, 0.0f, "segment2", -1, -1 }
};
auto segmentsSkeleton1 = std::vector<CRTProtocol::SSettingsSkeletonSegment>({
{ { 0, 0.0f, 1.0f, 2.0f, 0.707000017f, -0.707000017f, 0.0f, 0.0f }, "segment1", -1, -1 },
{ { 0, 3.0f, 4.0f, 5.0f, 0.707000017f, 0.707000017f, 0.0f, 0.0f }, "segment3", 0, 1 }
});
auto segmentsSkeleton2 = std::vector<CRTProtocol::SSettingsSkeletonSegment>({
{ { 0, 0.0f, 1.0f, 2.0f, 0.707000017f, 0.0f, 0.707000017f, 0.0f }, "segment2", -1, -1 }
});

CRTProtocol::SSettingsSkeleton skeleton1 = { "skeleton1", segmentsSkeleton1 };
CRTProtocol::SSettingsSkeleton skeleton2 = { "skeleton2", segmentsSkeleton2 };
Expand Down