From 80e99eb73716bdf13da1ee400a0cea378b5a03e0 Mon Sep 17 00:00:00 2001 From: oscarkramer Date: Tue, 18 Jul 2017 14:33:34 -0400 Subject: [PATCH 1/2] Added boolean operator to ossimRefPtr and corrected resulting ambiguities --- src/ossimGui/DataManager.cpp | 2 +- src/ossimGui/DataManagerWidget.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ossimGui/DataManager.cpp b/src/ossimGui/DataManager.cpp index a82b77d..fd3ccb5 100644 --- a/src/ossimGui/DataManager.cpp +++ b/src/ossimGui/DataManager.cpp @@ -1086,7 +1086,7 @@ bool ossimGui::DataManager::intersectRays(NodeListType& nodes) // Populate sensor model set ossimRefPtr geom = ivtg->getGeom(); - if (geom != NULL) + if (geom) { proj.push_back(geom->getProjection()); if (proj.back() != NULL) diff --git a/src/ossimGui/DataManagerWidget.cpp b/src/ossimGui/DataManagerWidget.cpp index b4e82e6..8897405 100644 --- a/src/ossimGui/DataManagerWidget.cpp +++ b/src/ossimGui/DataManagerWidget.cpp @@ -4024,7 +4024,7 @@ bool ossimGui::DataManagerWidget::miAutoMeas(DataManager::NodeListType& nodes) // Multi-image syncronization void ossimGui::DataManagerWidget::miSync(ossimGui::RegPoint* syncPt, ossimRefPtr node) { - if (node != NULL) + if (node) { ossimDpt sPt(syncPt->x(), syncPt->y()); m_dataManager->syncImagesTo(sPt, node); From 10474e68a1fa15244cc480de7d961553bd97d0f7 Mon Sep 17 00:00:00 2001 From: oscarkramer Date: Wed, 19 Jul 2017 10:35:41 -0400 Subject: [PATCH 2/2] Fixed mac compile error associated with new ossimRefPtr bool operator --- src/ossimGui/DataManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ossimGui/DataManager.cpp b/src/ossimGui/DataManager.cpp index fd3ccb5..7caf1a5 100644 --- a/src/ossimGui/DataManager.cpp +++ b/src/ossimGui/DataManager.cpp @@ -1089,7 +1089,7 @@ bool ossimGui::DataManager::intersectRays(NodeListType& nodes) if (geom) { proj.push_back(geom->getProjection()); - if (proj.back() != NULL) + if (proj.back()) { ossimSensorModel* m = dynamic_cast(proj.back().get()); if(m)