Fix some compiler warnings

gwaldron · Oct 19, 2023 · 7c9e9b3 · 7c9e9b3
1 parent 3707321
commit 7c9e9b3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/osgEarth/Threading.cpp b/src/osgEarth/Threading.cpp
@@ -803,7 +803,7 @@ JobArena::runJobs()
             // See if we no longer need this thread because the
             // target concurrency has been reduced
             ScopedMutexLock quitLock(_quitMutex);
-            if (_targetConcurrency < _metrics->concurrency)
+            if ((int)_targetConcurrency < _metrics->concurrency)
             {
                 _metrics->concurrency--;
                 break;
@@ -820,7 +820,7 @@ JobArena::startThreads()
     OE_INFO << LC << "Arena \"" << _name << "\" concurrency=" << _targetConcurrency << std::endl;
 
     // Not enough? Start up more
-    while(_metrics->concurrency < _targetConcurrency)
+    while(_metrics->concurrency < (int)_targetConcurrency)
     {
         _metrics->concurrency++;
 

diff --git a/src/osgEarth/TileLayer.cpp b/src/osgEarth/TileLayer.cpp
@@ -899,7 +899,7 @@ TileLayer::getBestAvailableTileKey(
         ScopedWriteLock lock(_data_mutex);
         if (!_dataExtentsIndex) // Double check
         {
-            OE_INFO << LC << "Building data extents index with " << _dataExtents.size() << " extents" << std::endl;
+            OE_DEBUG << LC << "Building data extents index with " << _dataExtents.size() << " extents" << std::endl;
             DataExtentsIndex* dataExtentsIndex = new DataExtentsIndex();
             for (auto de = _dataExtents.begin(); de != _dataExtents.end(); ++de)
             {

diff --git a/src/osgEarth/Utils.cpp b/src/osgEarth/Utils.cpp
@@ -490,11 +490,11 @@ GeometryValidator::apply(osg::Geometry& geom)
         osg::DrawArrays* da = dynamic_cast<osg::DrawArrays*>(pset);
         if ( da )
         {
-            if ( da->getFirst() >= numVerts )
+            if ( da->getFirst() >= (GLint)numVerts )
             {
                 OE_NOTICE << LC << "DrawArrays: first > numVerts" << std::endl;
             }
-            if ( da->getFirst()+da->getCount() > numVerts )
+            if ( da->getFirst()+da->getCount() > (GLint)numVerts )
             {
                 OE_NOTICE << LC << "DrawArrays: first/count out of bounds" << std::endl;
             }

diff --git a/src/osgEarthDrivers/engine_rex/TileNodeRegistry.cpp b/src/osgEarthDrivers/engine_rex/TileNodeRegistry.cpp
@@ -256,7 +256,7 @@ TileNodeRegistry::collectDormantTiles(
 
         if (tile->getDoNotExpire() == false &&
             tile->getLastTraversalTime() < oldestAllowableTime &&
-            tile->getLastTraversalFrame() < oldestAllowableFrame &&
+            tile->getLastTraversalFrame() < (int)oldestAllowableFrame &&
             tile->getLastTraversalRange() > farthestAllowableRange &&
             tile->areSiblingsDormant())
         {

diff --git a/src/osgEarthDrivers/fastdxt/FastDXTImageProcessor.cpp b/src/osgEarthDrivers/fastdxt/FastDXTImageProcessor.cpp
@@ -129,7 +129,7 @@ class FastDXTProcessor : public osgDB::ImageProcessor
 
             // interate over mipmap levels:
             unsigned int numLevels = mipmapped->getNumMipmapLevels();
-            for (int level = 0; level < numLevels; ++level)
+            for (unsigned level = 0; level < numLevels; ++level)
             {
                 int level_s = sourceImage->s() >> level;
                 int level_t = sourceImage->t() >> level;