diff --git a/include/osgTerrain/DataSet b/include/osgTerrain/DataSet index 9aafe5a58..8b36d2c6f 100644 --- a/include/osgTerrain/DataSet +++ b/include/osgTerrain/DataSet @@ -1161,7 +1161,7 @@ class OSGTERRAIN_EXPORT DataSet : public osg::Referenced static void setNotifyOffset(int level); - static int setNotifyOffset(); + static int getNotifyOffset(); CompositeDestination* createDestinationGraph(CompositeDestination* parent, diff --git a/src/osgTerrain/DataSet.cpp b/src/osgTerrain/DataSet.cpp index f15d0a749..1564880b2 100644 --- a/src/osgTerrain/DataSet.cpp +++ b/src/osgTerrain/DataSet.cpp @@ -53,7 +53,7 @@ using namespace osgTerrain; static int s_notifyOffset = 0; void DataSet::setNotifyOffset(int level) { s_notifyOffset = level; } -int DataSet::setNotifyOffset() { return s_notifyOffset; } +int DataSet::getNotifyOffset() { return s_notifyOffset; } inline std::ostream& my_notify(osg::NotifySeverity level) { return osg::notify(osg::NotifySeverity(s_notifyOffset+level)); } @@ -1269,8 +1269,11 @@ DataSet::Source* DataSet::Source::doReproject(const std::string& filename, osg:: psWO->pfnTransformer = pfnTransformer; psWO->pTransformerArg = hTransformArg; - psWO->pfnProgress = GDALTermProgress; - + if(osg::isNotifyEnabled(osg::NotifySeverity(osg::INFO + getNotifyOffset()))) + psWO->pfnProgress = GDALTermProgress; + else + psWO->pfnProgress = GDALDummyProgress; + /* -------------------------------------------------------------------- */ /* Setup band mapping. */ /* -------------------------------------------------------------------- */