eessppeelllloo/splash
1
0
Fork 0
mirror of https://gitlab.com/splashmapper/splash.git synced 2026-06-16 12:33:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix sanitizer for OSCController unit tests

Browse Source
This commit is contained in:
Emmanuel Durand
2025-09-01 14:35:50 -04:00
committed by Emmanuel Durand
parent 5318fe5708
commit ae344eec22
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/image/image_shmdata.cpp
+1 -1
View File
@@ -311,7 +311,7 @@ void Image_Shmdata::readUncompressedFrame(void* data, int /*data_size*/)
for (uint32_t block = 0; block < _shmdataCopyThreads; ++block)
{
int size = _width * _height * _channels * sizeof(char);
threads.push_back(std::async(std::launch::async, [=, this]() {
threads.push_back(std::async(std::launch::async, [=]() {
int sizeOfBlock; // We compute the size of the block, to handle image size non divisible by _shmdataCopyThreads
if (size - size / _shmdataCopyThreads * block < 2 * size / _shmdataCopyThreads)
sizeOfBlock = size - size / _shmdataCopyThreads * block;
tests/unit_tests/controller/controller_osc.cpp
+3 -7
View File
@@ -46,7 +46,7 @@ TEST_CASE("OSCController: setObjectCallback")
argv[6] = reinterpret_cast<lo_arg*>(string);
REQUIRE(types.size() == argv.size());
int result = oscController.setObjectCallback(path.c_str(), types.c_str(), argv.data(), 7, nullptr, &oscController);
int result = oscController.setObjectCallback(path.c_str(), types.c_str(), argv.data(), types.size(), nullptr, &oscController);
REQUIRE(result == 0);
}
@@ -68,7 +68,7 @@ TEST_CASE("OSCController: setObjectsOfTypeCallback")
argv[6] = reinterpret_cast<lo_arg*>(string);
REQUIRE(types.size() == argv.size());
int result = oscController.setObjectsOfTypeCallback(path.c_str(), types.c_str(), argv.data(), 7, nullptr, &oscController);
int result = oscController.setObjectsOfTypeCallback(path.c_str(), types.c_str(), argv.data(), types.size(), nullptr, &oscController);
REQUIRE(result == 0);
}
@@ -89,7 +89,7 @@ TEST_CASE("OSCController: setWorldCallback")
argv[5] = reinterpret_cast<lo_arg*>(string);
REQUIRE(types.size() == argv.size());
int result = oscController.setWorldCallback(path.c_str(), types.c_str(), argv.data(), 6, nullptr, &oscController);
int result = oscController.setWorldCallback(path.c_str(), types.c_str(), argv.data(), types.size(), nullptr, &oscController);
REQUIRE(result == 0);
}
@@ -115,10 +115,6 @@ TEST_CASE("OSCController: argsToValues")
Values result = oscController.argsToValues(types, argv, 0);
REQUIRE(result == expectedValues);
types = "sssdd";
result = oscController.argsToValues(types, argv, 0);
REQUIRE(result != expectedValues);
types = "sddi";
result = oscController.argsToValues(types, argv, 0);
REQUIRE(result == Values());