diff --git a/src/image/image_shmdata.cpp b/src/image/image_shmdata.cpp index a00b64d9..3c773ed2 100644 --- a/src/image/image_shmdata.cpp +++ b/src/image/image_shmdata.cpp @@ -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; diff --git a/tests/unit_tests/controller/controller_osc.cpp b/tests/unit_tests/controller/controller_osc.cpp index 32a06481..4aaeaa22 100644 --- a/tests/unit_tests/controller/controller_osc.cpp +++ b/tests/unit_tests/controller/controller_osc.cpp @@ -46,7 +46,7 @@ TEST_CASE("OSCController: setObjectCallback") argv[6] = reinterpret_cast(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(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(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());