diff --git a/include/otbSARDEMPolygonsAnalysisImageFilter.txx b/include/otbSARDEMPolygonsAnalysisImageFilter.txx index ebdd171f93056b084e4f5d9ff0b69aa80b3337a4..b722880b103e83d32587f81e16dd3064e7b0186c 100644 --- a/include/otbSARDEMPolygonsAnalysisImageFilter.txx +++ b/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; } diff --git a/include/otbSARDEMProjectionImageFilter.txx b/include/otbSARDEMProjectionImageFilter.txx index d70299e22e0f2620fcf878fc91f5f83f35d80945..df9bfa394a659c8d41c79639898665e7273f56a9 100644 --- a/include/otbSARDEMProjectionImageFilter.txx +++ b/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; } diff --git a/include/otbSARDerampImageFilter.txx b/include/otbSARDerampImageFilter.txx index 62fb588488f7ec3059e9880b6f4cd1204e53d3af..de399193ae6c1ecdb5ef15c41d711762ebaca511 100644 --- a/include/otbSARDerampImageFilter.txx +++ b/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; diff --git a/include/otbSARDopplerCentroidFreqImageFilter.txx b/include/otbSARDopplerCentroidFreqImageFilter.txx index 8d57b0dbfb737a9cbdd6143326af455a64c49594..1c5184faf76f7ef5e5394d356ae6e2b8c817ac8b 100644 --- a/include/otbSARDopplerCentroidFreqImageFilter.txx +++ b/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; diff --git a/include/otbSARStreamingDEMInformationFilter.h b/include/otbSARStreamingDEMInformationFilter.h index c4edad830e145e5c4a3e9f96a062e0b6722a0519..8577e356a6338bbdb308e4b5d820c60f1e6dbef1 100644 --- a/include/otbSARStreamingDEMInformationFilter.h +++ b/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; }