Merge branch 'fix-warning' into 'develop'

Warning and Test fixes

See merge request orfeotoolbox/otb!548

Modules/Core/Metadata/src/otbCosmoImageMetadataInterface.cxx

@@ -25,7 +25,14 @@
 #include "otbMacro.h"
 #include "itkMetaDataObject.h"
 #include "otbImageKeywordlist.h"
+#if defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include "ossim/ossimTimeUtilities.h"
+#pragma GCC diagnostic pop
+#else
+#include "ossim/ossimTimeUtilities.h"
+#endif
 
 //useful constants
 #include <otbMath.h>

Modules/Core/Metadata/src/otbSentinel1ImageMetadataInterface.cxx

@@ -25,7 +25,14 @@
 #include "otbMacro.h"
 #include "itkMetaDataObject.h"
 #include "otbImageKeywordlist.h"
+#if defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include "ossim/ossimTimeUtilities.h"
+#pragma GCC diagnostic pop
+#else
+#include "ossim/ossimTimeUtilities.h"
+#endif
 
 //useful constants
 #include <otbMath.h>

Modules/Filtering/Convolution/test/CMakeLists.txt

@@ -46,7 +46,7 @@ otb_add_test(NAME bfTvConvolutionImageFilter COMMAND otbConvolutionTestDriver
 if(ITK_USE_FFTWD)
 
 if(MSVC AND (CMAKE_SIZEOF_VOID_P EQUAL "4"))
-  message(WARNING "Disable bfTvOverlapSaveConvolutionImageFilter")
+  message(WARNING "Disable OverlapSaveConvolution tests")
 else()
 otb_add_test(NAME bfTvOverlapSaveConvolutionImageFilter COMMAND otbConvolutionTestDriver
   --compare-image ${EPSILON_7}
@@ -56,7 +56,6 @@ otb_add_test(NAME bfTvOverlapSaveConvolutionImageFilter COMMAND otbConvolutionTe
   ${INPUTDATA}/QB_Suburb.png
   ${TEMP}/bfTvOverlapSaveConvolutionImageFilter.tif
   )
-endif()
 
 otb_add_test(NAME bfTvCompareOverlapSaveAndClassicalConvolutionWithGaborFilter COMMAND otbConvolutionTestDriver
   --compare-image ${EPSILON_7}
@@ -74,6 +73,8 @@ otb_add_test(NAME bfTvCompareOverlapSaveAndClassicalConvolutionWithGaborFilter C
   )
 endif()
 
+endif()
+
 otb_add_test(NAME bfTvGaborFilterGenerator COMMAND otbConvolutionTestDriver
   --compare-image ${EPSILON_7}
   ${BASELINE}/bfGaborFilterGeneratorTest.tif