From a864cffc1911aed5265fc4f828fd68979e3cefdf Mon Sep 17 00:00:00 2001 From: cxl Date: Wed, 1 Jul 2020 19:38:23 +0000 Subject: [PATCH] Geom: Fixed issue with Coords git-svn-id: svn://ultimatepp.org/upp/trunk@14649 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Geom/Coords/GeomCoords.h | 6 ++++-- uppsrc/Geom/Coords/method.cpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/uppsrc/Geom/Coords/GeomCoords.h b/uppsrc/Geom/Coords/GeomCoords.h index e905e8c45..e11c40838 100644 --- a/uppsrc/Geom/Coords/GeomCoords.h +++ b/uppsrc/Geom/Coords/GeomCoords.h @@ -126,7 +126,8 @@ GeomRefCon::~GeomRefCon() if(t && t->GetRefCount() == 1) RefMemStat::App().Remove(typeid(*t).name(), t->GetAllocIndex()); #endif//REF_DEBUG - t->Release(); + if(t) + t->Release(); } template @@ -139,7 +140,8 @@ GeomRefCon& GeomRefCon::operator = (const GeomRefCon& rp) if(old && old->GetRefCount() == 1) RefMemStat::App().Remove(typeid(*old).name(), old->GetAllocIndex()); #endif//REF_DEBUG - old->Release(); + if(old) + old->Release(); return *this; } diff --git a/uppsrc/Geom/Coords/method.cpp b/uppsrc/Geom/Coords/method.cpp index 8d60415e2..eb7fa26b3 100644 --- a/uppsrc/Geom/Coords/method.cpp +++ b/uppsrc/Geom/Coords/method.cpp @@ -850,7 +850,7 @@ GisCoords GisCoords::GetEPSG(int code) default: return GisCoords(); } - gc->ident = NFormat("EPSG:%d", code); + gc->ident = Format("EPSG:%d", code); gc->SyncArgs(); return GisCoords(gc); }