From 8c05017bee2527f81966f82045d3fd1e9eea7db2 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Thu, 12 Nov 2015 11:29:26 +0100
Subject: [PATCH] BUG: mantis-1020: revert patches
---
.../Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx
index 19748640c6..f2200ddd29 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx
@@ -143,11 +143,9 @@ inline
void otb::ogr::Feature::SetGeometryDirectly(UniqueGeometryPtr geometry)
{
CheckInvariants();
- #if !defined(NDEBUG)
OGRGeometry * g = geometry.get();
- itkAssertOrThrowMacro((m_Feature->GetGeometryRef() == g), "The new geometry hasn't been set as expected");
- #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");
}
--
GitLab