Merge pull request #1322 from fspindle/fix_jenkins_ros2_ci

Fix jenkins ros2 ci
lagadic · Feb 1, 2024 · 628daab · 628daab
2 parents 8849631 + e08afbe
commit 628daab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
 

diff --git 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<uint16_t> &buffer, vpImage<uint16_t> &I_Bay
     }
   }
 }
-#endif
 
 static void convertTo(const vpImage<uint16_t> &I_RGBA_16U, vpImage<vpRGBa> &I_RGBA_8U, int divisor = 1 << (12 - 8))
 {
@@ -931,7 +930,6 @@ static double computePSNR(const vpImage<vpRGBa> &I_RGBA_8U, const vpImage<vpRGBa
   return 10 * std::log10(255 * 255 / mse);
 }
 
-#if (VISP_HAVE_DATASET_VERSION >= 0x030500)
 static bool readBinaryFile(const std::string &filename, std::vector<uint16_t> &buffer)
 {
   std::FILE *f = std::fopen(filename.c_str(), "rb");