From 37f98cf3e82be3fa21fb690284ae6d3c362ae320 Mon Sep 17 00:00:00 2001 From: Fabien Spindler Date: Thu, 1 Feb 2024 17:29:03 +0100 Subject: [PATCH 1/2] Fix warning reported by jenkins ros2 ci misleading-indentation https://build.ros2.org/job/Idev__visp__ubuntu_jammy_amd64/91/gcc/folder.-561058806/ --- modules/core/src/tools/file/basisu_miniz.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/core/src/tools/file/basisu_miniz.h b/modules/core/src/tools/file/basisu_miniz.h index e296bc6323..0b3cc551a2 100644 --- a/modules/core/src/tools/file/basisu_miniz.h +++ b/modules/core/src/tools/file/basisu_miniz.h @@ -1605,10 +1605,11 @@ static void tdefl_optimize_huffman_table(tdefl_compressor *d, int table_num, int mz_uint bits = b; mz_uint len = l; MZ_ASSERT(bits <= ((1U << len) - 1U)); \ d->m_bit_buffer |= (bits << d->m_bits_in); d->m_bits_in += len; \ while (d->m_bits_in >= 8) { \ - if (d->m_pOutput_buf < d->m_pOutput_buf_end) \ + if (d->m_pOutput_buf < d->m_pOutput_buf_end) { \ *d->m_pOutput_buf++ = (mz_uint8)(d->m_bit_buffer); \ d->m_bit_buffer >>= 8; \ d->m_bits_in -= 8; \ + } \ } \ } MZ_MACRO_END From e08afbec125efe1ff25d3abb16613293d0cdec61 Mon Sep 17 00:00:00 2001 From: Fabien Spindler Date: Thu, 1 Feb 2024 17:33:50 +0100 Subject: [PATCH 2/2] Fix jenkins ros2 ci error on unused-function https://build.ros2.org/job/Idev__visp__ubuntu_jammy_amd64/91/gcc/folder.1443869009/ --- modules/core/test/image-with-dataset/testColorConversion.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/core/test/image-with-dataset/testColorConversion.cpp b/modules/core/test/image-with-dataset/testColorConversion.cpp index bb8f721dd7..f3d2e61ee8 100644 --- a/modules/core/test/image-with-dataset/testColorConversion.cpp +++ b/modules/core/test/image-with-dataset/testColorConversion.cpp @@ -903,7 +903,6 @@ static void col2im(const std::vector &buffer, vpImage &I_Bay } } } -#endif static void convertTo(const vpImage &I_RGBA_16U, vpImage &I_RGBA_8U, int divisor = 1 << (12 - 8)) { @@ -931,7 +930,6 @@ static double computePSNR(const vpImage &I_RGBA_8U, const vpImage= 0x030500) static bool readBinaryFile(const std::string &filename, std::vector &buffer) { std::FILE *f = std::fopen(filename.c_str(), "rb");