Merging dev into master

ossimlabs · Jul 21, 2017 · e36a1c0 · e36a1c0
2 parents 310dd60 + 10474e6
commit e36a1c0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/ossimGui/DataManager.cpp b/src/ossimGui/DataManager.cpp
@@ -1086,10 +1086,10 @@ bool ossimGui::DataManager::intersectRays(NodeListType& nodes)
 
                // Populate sensor model set
                ossimRefPtr<ossimImageGeometry> geom = ivtg->getGeom();
-               if (geom != NULL)
+               if (geom)
                {
                   proj.push_back(geom->getProjection());
-                  if (proj.back() != NULL)
+                  if (proj.back())
                   {
                      ossimSensorModel* m = dynamic_cast<ossimSensorModel*>(proj.back().get());
                      if(m)

diff --git 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<DataManager::Node> node)
 {
-   if (node != NULL)
+   if (node)
    {
       ossimDpt sPt(syncPt->x(), syncPt->y());
       m_dataManager->syncImagesTo(sPt, node);