From 57162398e8a95831ce7651ab4a41e2d057c9a297 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Thu, 12 Nov 2015 16:36:04 +0100
Subject: [PATCH] BUG: mantis-1020: apply original patch and use plain assert
---
.../Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx
index f2200ddd29..bbaf51aec9 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx
@@ -143,10 +143,12 @@ inline
void otb::ogr::Feature::SetGeometryDirectly(UniqueGeometryPtr geometry)
{
CheckInvariants();
+#if !defined(NDEBUG)
OGRGeometry * g = geometry.get();
+#endif
UncheckedSetGeometryDirectly(otb::move(geometry));
- itkAssertOrThrowMacro((m_Feature->GetGeometryRef() == g), "The new geometry hasn't been set as expected");
- itkAssertOrThrowMacro(!geometry, "UniqueGeometryPtr hasn't released its pointer");
+ assert((m_Feature->GetGeometryRef() == g) && "The new geometry hasn't been set as expected");
+ assert(!geometry && "UniqueGeometryPtr hasn't released its pointer");
}
inline
--
GitLab