Merge branch 'master' of https://gitlab.orfeo-toolbox.org/remote_modules/diapotb into logger_python

include/otbSARDEMPolygonsAnalysisImageFilter.txx

@@ -53,8 +53,6 @@ namespace otb
   SARDEMPolygonsAnalysisImageFilter< TImageIn ,TImageOut, TImageDEM, TImageSAR, TFunction >
   ::SetSARImageKeyWorList(ImageKeywordlist sarImageKWL)
   {
-    // Check if sarImageKWL not NULL
-    assert(&sarImageKWL && "SAR Image Metadata don't exist.");
     m_SarImageKwl = sarImageKWL;
   }
   

include/otbSARDEMProjectionImageFilter.txx

@@ -94,8 +94,6 @@ void
 SARDEMProjectionImageFilter< TImageIn ,TImageOut >
 ::SetSARImageKeyWorList(ImageKeywordlist sarImageKWL)
 {
-  // Check if sarImageKWL not NULL
-  assert(&sarImageKWL && "SAR Image Metadata don't exist.");
   m_SarImageKwl = sarImageKWL;
 }
 

include/otbSARDerampImageFilter.txx

@@ -153,7 +153,7 @@ namespace otb
     for (std::size_t listId=0; listId!= nbLists ; ++listId) 
       {
 	const int pos = sprintf(fmRatePrefix_, "%s%zu.", FM_PREFIX.c_str(), (listId+1));
-	assert(pos > 0 && pos < sizeof(fmRatePrefix_));
+	assert(pos > 0 && (unsigned long) pos < sizeof(fmRatePrefix_));
 	const std::string FMPrefix(fmRatePrefix_, pos);
 
 	FMRateRecordType fmRateRecord;
@@ -183,7 +183,7 @@ namespace otb
     for (std::size_t listId=0; listId!= nbLists ; ++listId) 
       {
 	const int pos = sprintf(dcfPrefix_, "%s%zu.", DCF_PREFIX.c_str(), (listId+1));
-	assert(pos > 0 && pos < sizeof(dcfPrefix_));
+	assert(pos > 0 && (unsigned long) pos < sizeof(dcfPrefix_));
 	const std::string DCFPrefix(dcfPrefix_, pos);
 
 	DCFRecordType dcfRecord;

include/otbSARDopplerCentroidFreqImageFilter.txx

@@ -91,7 +91,7 @@ namespace otb
     for (std::size_t listId=0; listId!= nbLists ; ++listId) 
       {
 	const int pos = sprintf(fmRatePrefix_, "%s%zu.", FM_PREFIX.c_str(), (listId+1));
-	assert(pos > 0 && pos < sizeof(fmRatePrefix_));
+	assert(pos > 0 && (unsigned long) pos < sizeof(fmRatePrefix_));
 	const std::string FMPrefix(fmRatePrefix_, pos);
 
 	FMRateRecordType fmRateRecord;
@@ -121,7 +121,7 @@ namespace otb
     for (std::size_t listId=0; listId!= nbLists ; ++listId) 
       {
 	const int pos = sprintf(dcfPrefix_, "%s%zu.", DCF_PREFIX.c_str(), (listId+1));
-	assert(pos > 0 && pos < sizeof(dcfPrefix_));
+	assert(pos > 0 && (unsigned long) pos < sizeof(dcfPrefix_));
 	const std::string DCFPrefix(dcfPrefix_, pos);
 
 	DCFRecordType dcfRecord;

include/otbSARStreamingDEMInformationFilter.h

@@ -473,8 +473,6 @@ public:
 
   void SetSARImageKeyWorList(ImageKeywordlist sarImageKWL)
   {
-    // Check if sarImageKWL not NULL
-    assert(&sarImageKWL && "SAR Image Metadata don't exist.");
     m_SarImageKwl = sarImageKWL;
   }