Merge branch 'master' of github.com:gwaldron/osgearth

jasonbeverage · jasonbeverage · commit 85d84d3e464a · 2026-03-04T09:48:55.000-05:00
diff --git a/src/osgEarth/Decals.cpp b/src/osgEarth/Decals.cpp
@@ -311,7 +311,7 @@ DecalDecorator::setBindings(Util::ShaderPackage& package) const
 void
 DecalDecorator::dirtyUniforms()
 {
-    for (int i = 0; i < _globjects.size(); ++i)
+    for (unsigned i = 0; i < _globjects.size(); ++i)
     {
         _globjects[i].dirty = true;
     }
diff --git a/src/osgEarth/Elevation.cpp b/src/osgEarth/Elevation.cpp
@@ -279,12 +279,12 @@ NormalMapGenerator::createNormalMap(const TileKey& key, const Map* map, unsigned
         double dv = 1.0 / (double)(tileSize - 1);
 
         // Process interior pixels only (excluding edges that need external sampling)
-        for (int t = 1; t < tileSize - 1; ++t)
+        for (int t = 1; t < (int)tileSize - 1; ++t)
         {
             double v = (double)t / (double)(tileSize - 1);
             double y_or_lat = ex.yMin() + v * ex.height();
 
-            for (int s = 1; s < tileSize - 1; ++s)
+            for (int s = 1; s < (int)tileSize - 1; ++s)
             {
                 double u = (double)s / (double)(tileSize - 1);
                 double x_or_lon = ex.xMin() + u * ex.width();
@@ -330,28 +330,28 @@ NormalMapGenerator::createNormalMap(const TileKey& key, const Map* map, unsigned
         double r = res.getValue();
 
         // bottom row
-        for (int s = 0; s < tileSize; ++s)
+        for (int s = 0; s < (int)tileSize; ++s)
         {
             double u = (double)s / (double)(tileSize - 1);
             double x = ex.xMin() + u * ex.width();
             w.vectorToSample.emplace_back(x, ex.yMin() - r, 0, r);
         }
         // top row
-        for (int s = 0; s < tileSize; ++s)
+        for (int s = 0; s < (int)tileSize; ++s)
         {
             double u = (double)s / (double)(tileSize - 1);
             double x = ex.xMin() + u * ex.width();
             w.vectorToSample.emplace_back(x, ex.yMax() + r, 0, r);
         }
         // left column
-        for (int t = 0; t < tileSize; ++t)
+        for (int t = 0; t < (int)tileSize; ++t)
         {
             double v = (double)t / (double)(tileSize - 1);
             double y = ex.yMin() + v * ex.height();
             w.vectorToSample.emplace_back(ex.xMin() - r, y, 0, r);
         }
         // right column
-        for (int t = 0; t < tileSize; ++t)
+        for (int t = 0; t < (int)tileSize; ++t)
         {
             double v = (double)t / (double)(tileSize - 1);
             double y = ex.yMin() + v * ex.height();
@@ -390,12 +390,12 @@ NormalMapGenerator::createNormalMap(const TileKey& key, const Map* map, unsigned
         double dy = srs->transformDistance(res, Units::METERS, 0.0);
 
         // Process all edge pixels
-        for (int t = 0; t < tileSize; ++t)
+        for (int t = 0; t < (int)tileSize; ++t)
         {
-            for (int s = 0; s < tileSize; ++s)
+            for (int s = 0; s < (int)tileSize; ++s)
             {
                 // Skip interior pixels - they were already processed
-                if (t > 0 && t < tileSize - 1 && s > 0 && s < tileSize - 1)
+                if (t > 0 && t < (int)tileSize - 1 && s > 0 && s < (int)tileSize - 1)
                     continue;
 
                 double u = (double)s / (double)(tileSize - 1);
diff --git a/src/osgEarth/ElevationLayer.cpp b/src/osgEarth/ElevationLayer.cpp
@@ -255,7 +255,7 @@ ElevationLayer::assembleHeightField(const TileKey& key, ProgressCallback* progre
             auto mosaic = new osg::HeightField();
             mosaic->allocate(cols, rows);
             auto& heights = mosaic->getHeightList();
-            for(int i=0; i<cols*rows; ++i)
+            for(unsigned i=0; i<cols*rows; ++i)
                 heights[i] = NO_DATA_VALUE;
 
             // Working set of points. it's much faster to xform an entire vector all at once.
@@ -301,9 +301,9 @@ ElevationLayer::assembleHeightField(const TileKey& key, ProgressCallback* progre
             }
 
             // Mosaic our sources into a single output image.
-            for (int row = 0; row < rows; ++row)
+            for (unsigned row = 0; row < rows; ++row)
             {
-                for (int col = 0; col < cols; ++col)
+                for (unsigned col = 0; col < cols; ++col)
                 {
                     int i = row * cols + col;
                     auto& h = mosaic->getHeight(col, row);
diff --git a/src/osgEarth/Feature b/src/osgEarth/Feature
@@ -230,6 +230,7 @@ namespace osgEarth
         void set(const std::string& name, const char* value);
         void set(const std::string& name, double value);
         void set(const std::string& name, std::int64_t value);
+        void set(const std::string& name, int value) { set(name, static_cast<std::int64_t>(value)); }
         void set(const std::string& name, bool value);
         void set(const std::string& name, const AttributeValue& value);
 
diff --git a/src/osgEarth/GDAL.cpp b/src/osgEarth/GDAL.cpp
@@ -1419,7 +1419,7 @@ GDAL_detail::Driver::createHeightField(const TileKey& key, unsigned tileSize, Pr
 
             if (!hasNoDataValue)
             {
-                double ri, ci, realPart;
+                double ri, ci;
 
                 GDALRIOResampleAlg alg =
                     gdalOptions().interpolation() == INTERP_AVERAGE ? GRIORA_Average : // note: broken
@@ -1502,9 +1502,9 @@ GDAL_detail::Driver::createHeightField(const TileKey& key, unsigned tileSize, Pr
 
             // flip the raster, and scale by linear units
             int halfHeight = tileSize / 2;
-            for (int t = 0; t < tileSize; ++t)
+            for (int t = 0; t < (int)tileSize; ++t)
             {
-                for (int s = 0; s < tileSize; ++s)
+                for (int s = 0; s < (int)tileSize; ++s)
                 {
                     if (t < halfHeight)
                         std::swap(hf_raw[t * tileSize + s], hf_raw[(tileSize - t - 1) * tileSize + s]);
@@ -2305,10 +2305,10 @@ osgEarth::GDAL_detail::heightFieldToTiff(const osg::HeightField* hf)
     std::vector<float> heights;
     heights.reserve(width * height);
     // Flip the heightfield to match the GDAL orientation
-    for (unsigned int r = 0; r < height; ++r)
+    for (int r = 0; r < height; ++r)
     {
-        unsigned int inv_r = height - r - 1;
-        for (unsigned int c = 0; c < width; ++c)
+        int inv_r = height - r - 1;
+        for (int c = 0; c < width; ++c)
         {
             heights.push_back(hf->getHeight(c, inv_r));
         }
diff --git a/src/osgEarth/ObjectIndex.cpp b/src/osgEarth/ObjectIndex.cpp
@@ -148,7 +148,7 @@ ObjectIndex::tagDrawable(osg::Drawable* drawable, ObjectID id) const
     {
         line->setVertexAttribArray(_attribLocation, ids);
         auto size = line->size();
-        for (int i = 0; i < size; ++i)
+        for (int i = 0; i < (int)size; ++i)
             line->pushVertexAttrib(ids.get(), id);
     }
 }
diff --git a/src/osgEarth/TMS.cpp b/src/osgEarth/TMS.cpp
@@ -1436,14 +1436,14 @@ TMSElevationLayer::createHeightFieldImplementation(const TileKey& key, ProgressC
         key.getExtent().getBounds(xmin, ymin, xmax, ymax);
 
         osg::Vec4f pixel;
-        for (int c = 0; c < getTileSize(); c++)
+        for (int c = 0; c < (int)getTileSize(); c++)
         {
             if (progress && progress->isCanceled())
                 return {};
             
             double u = (double)c / (double)(getTileSize() - 1);
             double x = xmin + u * (xmax - xmin);
-            for (int r = 0; r < getTileSize(); r++)
+            for (int r = 0; r < (int)getTileSize(); r++)
             {
                 double v = (double)r / (double)(getTileSize() - 1);
                 double y = ymin + v * (ymax - ymin);
diff --git a/src/osgEarth/XYZ.cpp b/src/osgEarth/XYZ.cpp
@@ -350,14 +350,14 @@ XYZElevationLayer::createHeightFieldImplementation(const TileKey& key, ProgressC
         key.getExtent().getBounds(xmin, ymin, xmax, ymax);
 
         osg::Vec4f pixel;
-        for (int c = 0; c < getTileSize(); c++)
+        for (int c = 0; c < (int)getTileSize(); c++)
         {
             if (progress && progress->isCanceled())
                 return {};
 
             double u = (double)c / (double)(getTileSize() - 1);
             double x = xmin + u * (xmax - xmin);
-            for (int r = 0; r < getTileSize(); r++)
+            for (int r = 0; r < (int)getTileSize(); r++)
             {
                 double v = (double)r / (double)(getTileSize() - 1);
                 double y = ymin + v * (ymax - ymin);
diff --git a/src/osgEarth/XYZFeatureSource.cpp b/src/osgEarth/XYZFeatureSource.cpp
@@ -377,8 +377,8 @@ Status
 XYZFeatureSource::insert(const TileKey& key, const FeatureList& features, bool overwrite)
 {
     OE_SOFT_ASSERT_AND_RETURN(key.valid(), Status::AssertionFailure);
-    OE_SOFT_ASSERT_AND_RETURN(key.getLOD() >= getMinLevel(), Status::ConfigurationError);
-    OE_SOFT_ASSERT_AND_RETURN(key.getLOD() <= getMaxLevel(), Status::ConfigurationError);
+    OE_SOFT_ASSERT_AND_RETURN((int)key.getLOD() >= getMinLevel(), Status::ConfigurationError);
+    OE_SOFT_ASSERT_AND_RETURN((int)key.getLOD() <= getMaxLevel(), Status::ConfigurationError);
     OE_SOFT_ASSERT_AND_RETURN(ci_equals(options().format().value(), "json"), Status::ConfigurationError);
 
     auto url = createURL(Query(key));
diff --git a/src/osgEarthDrivers/fastdxt/FastDXTImageProcessor.cpp b/src/osgEarthDrivers/fastdxt/FastDXTImageProcessor.cpp
@@ -64,9 +64,9 @@ void padImageToMultipleOf4(osg::Image* input)
 
     osg::Vec4 pixel;
 
-    for (unsigned t = 0; t < read.t(); ++t)
+    for (int t = 0; t < read.t(); ++t)
     {
-        for (unsigned s = 0; s < read.s(); ++s)
+        for (int s = 0; s < read.s(); ++s)
         {
             read(pixel, s, t);
             write(pixel, s, t);

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ DecalDecorator::setBindings(Util::ShaderPackage& package) const`
`311`	`311`	`void`
`312`	`312`	`DecalDecorator::dirtyUniforms()`
`313`	`313`	`{`
`314`		`- for (int i = 0; i < _globjects.size(); ++i)`
	`314`	`+ for (unsigned i = 0; i < _globjects.size(); ++i)`
`315`	`315`	`{`
`316`	`316`	`_globjects[i].dirty = true;`
`317`	`317`	`}`
Original file line number	Diff line number	Diff line change
`@@ -279,12 +279,12 @@ NormalMapGenerator::createNormalMap(const TileKey& key, const Map* map, unsigned`
`279`	`279`	`double dv = 1.0 / (double)(tileSize - 1);`
`280`	`280`
`281`	`281`	`// Process interior pixels only (excluding edges that need external sampling)`
`282`		`- for (int t = 1; t < tileSize - 1; ++t)`
	`282`	`+ for (int t = 1; t < (int)tileSize - 1; ++t)`
`283`	`283`	`{`
`284`	`284`	`double v = (double)t / (double)(tileSize - 1);`
`285`	`285`	`double y_or_lat = ex.yMin() + v * ex.height();`
`286`	`286`
`287`		`- for (int s = 1; s < tileSize - 1; ++s)`
	`287`	`+ for (int s = 1; s < (int)tileSize - 1; ++s)`
`288`	`288`	`{`
`289`	`289`	`double u = (double)s / (double)(tileSize - 1);`
`290`	`290`	`double x_or_lon = ex.xMin() + u * ex.width();`
`@@ -330,28 +330,28 @@ NormalMapGenerator::createNormalMap(const TileKey& key, const Map* map, unsigned`
`330`	`330`	`double r = res.getValue();`
`331`	`331`
`332`	`332`	`// bottom row`
`333`		`- for (int s = 0; s < tileSize; ++s)`
	`333`	`+ for (int s = 0; s < (int)tileSize; ++s)`
`334`	`334`	`{`
`335`	`335`	`double u = (double)s / (double)(tileSize - 1);`
`336`	`336`	`double x = ex.xMin() + u * ex.width();`
`337`	`337`	`w.vectorToSample.emplace_back(x, ex.yMin() - r, 0, r);`
`338`	`338`	`}`
`339`	`339`	`// top row`
`340`		`- for (int s = 0; s < tileSize; ++s)`
	`340`	`+ for (int s = 0; s < (int)tileSize; ++s)`
`341`	`341`	`{`
`342`	`342`	`double u = (double)s / (double)(tileSize - 1);`
`343`	`343`	`double x = ex.xMin() + u * ex.width();`
`344`	`344`	`w.vectorToSample.emplace_back(x, ex.yMax() + r, 0, r);`
`345`	`345`	`}`
`346`	`346`	`// left column`
`347`		`- for (int t = 0; t < tileSize; ++t)`
	`347`	`+ for (int t = 0; t < (int)tileSize; ++t)`
`348`	`348`	`{`
`349`	`349`	`double v = (double)t / (double)(tileSize - 1);`
`350`	`350`	`double y = ex.yMin() + v * ex.height();`
`351`	`351`	`w.vectorToSample.emplace_back(ex.xMin() - r, y, 0, r);`
`352`	`352`	`}`
`353`	`353`	`// right column`
`354`		`- for (int t = 0; t < tileSize; ++t)`
	`354`	`+ for (int t = 0; t < (int)tileSize; ++t)`
`355`	`355`	`{`
`356`	`356`	`double v = (double)t / (double)(tileSize - 1);`
`357`	`357`	`double y = ex.yMin() + v * ex.height();`
`@@ -390,12 +390,12 @@ NormalMapGenerator::createNormalMap(const TileKey& key, const Map* map, unsigned`
`390`	`390`	`double dy = srs->transformDistance(res, Units::METERS, 0.0);`
`391`	`391`
`392`	`392`	`// Process all edge pixels`
`393`		`- for (int t = 0; t < tileSize; ++t)`
	`393`	`+ for (int t = 0; t < (int)tileSize; ++t)`
`394`	`394`	`{`
`395`		`- for (int s = 0; s < tileSize; ++s)`
	`395`	`+ for (int s = 0; s < (int)tileSize; ++s)`
`396`	`396`	`{`
`397`	`397`	`// Skip interior pixels - they were already processed`
`398`		`- if (t > 0 && t < tileSize - 1 && s > 0 && s < tileSize - 1)`
	`398`	`+ if (t > 0 && t < (int)tileSize - 1 && s > 0 && s < (int)tileSize - 1)`
`399`	`399`	`continue;`
`400`	`400`
`401`	`401`	`double u = (double)s / (double)(tileSize - 1);`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ ElevationLayer::assembleHeightField(const TileKey& key, ProgressCallback* progre`
`255`	`255`	`auto mosaic = new osg::HeightField();`
`256`	`256`	`mosaic->allocate(cols, rows);`
`257`	`257`	`auto& heights = mosaic->getHeightList();`
`258`		`- for(int i=0; i<cols*rows; ++i)`
	`258`	`+ for(unsigned i=0; i<cols*rows; ++i)`
`259`	`259`	`heights[i] = NO_DATA_VALUE;`
`260`	`260`
`261`	`261`	`// Working set of points. it's much faster to xform an entire vector all at once.`
`@@ -301,9 +301,9 @@ ElevationLayer::assembleHeightField(const TileKey& key, ProgressCallback* progre`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`// Mosaic our sources into a single output image.`
`304`		`- for (int row = 0; row < rows; ++row)`
	`304`	`+ for (unsigned row = 0; row < rows; ++row)`
`305`	`305`	`{`
`306`		`- for (int col = 0; col < cols; ++col)`
	`306`	`+ for (unsigned col = 0; col < cols; ++col)`
`307`	`307`	`{`
`308`	`308`	`int i = row * cols + col;`
`309`	`309`	`auto& h = mosaic->getHeight(col, row);`
Original file line number	Diff line number	Diff line change
`@@ -1419,7 +1419,7 @@ GDAL_detail::Driver::createHeightField(const TileKey& key, unsigned tileSize, Pr`
`1419`	`1419`
`1420`	`1420`	`if (!hasNoDataValue)`
`1421`	`1421`	`{`
`1422`		`- double ri, ci, realPart;`
	`1422`	`+ double ri, ci;`
`1423`	`1423`
`1424`	`1424`	`GDALRIOResampleAlg alg =`
`1425`	`1425`	`gdalOptions().interpolation() == INTERP_AVERAGE ? GRIORA_Average : // note: broken`
`@@ -1502,9 +1502,9 @@ GDAL_detail::Driver::createHeightField(const TileKey& key, unsigned tileSize, Pr`
`1502`	`1502`
`1503`	`1503`	`// flip the raster, and scale by linear units`
`1504`	`1504`	`int halfHeight = tileSize / 2;`
`1505`		`- for (int t = 0; t < tileSize; ++t)`
	`1505`	`+ for (int t = 0; t < (int)tileSize; ++t)`
`1506`	`1506`	`{`
`1507`		`- for (int s = 0; s < tileSize; ++s)`
	`1507`	`+ for (int s = 0; s < (int)tileSize; ++s)`
`1508`	`1508`	`{`
`1509`	`1509`	`if (t < halfHeight)`
`1510`	`1510`	`std::swap(hf_raw[t * tileSize + s], hf_raw[(tileSize - t - 1) * tileSize + s]);`
`@@ -2305,10 +2305,10 @@ osgEarth::GDAL_detail::heightFieldToTiff(const osg::HeightField* hf)`
`2305`	`2305`	`std::vector<float> heights;`
`2306`	`2306`	`heights.reserve(width * height);`
`2307`	`2307`	`// Flip the heightfield to match the GDAL orientation`
`2308`		`- for (unsigned int r = 0; r < height; ++r)`
	`2308`	`+ for (int r = 0; r < height; ++r)`
`2309`	`2309`	`{`
`2310`		`- unsigned int inv_r = height - r - 1;`
`2311`		`- for (unsigned int c = 0; c < width; ++c)`
	`2310`	`+ int inv_r = height - r - 1;`
	`2311`	`+ for (int c = 0; c < width; ++c)`
`2312`	`2312`	`{`
`2313`	`2313`	`heights.push_back(hf->getHeight(c, inv_r));`
`2314`	`2314`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ ObjectIndex::tagDrawable(osg::Drawable* drawable, ObjectID id) const`
`148`	`148`	`{`
`149`	`149`	`line->setVertexAttribArray(_attribLocation, ids);`
`150`	`150`	`auto size = line->size();`
`151`		`- for (int i = 0; i < size; ++i)`
	`151`	`+ for (int i = 0; i < (int)size; ++i)`
`152`	`152`	`line->pushVertexAttrib(ids.get(), id);`
`153`	`153`	`}`
`154`	`154`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,9 @@ void padImageToMultipleOf4(osg::Image* input)`
`64`	`64`
`65`	`65`	`osg::Vec4 pixel;`
`66`	`66`
`67`		`- for (unsigned t = 0; t < read.t(); ++t)`
	`67`	`+ for (int t = 0; t < read.t(); ++t)`
`68`	`68`	`{`
`69`		`- for (unsigned s = 0; s < read.s(); ++s)`
	`69`	`+ for (int s = 0; s < read.s(); ++s)`
`70`	`70`	`{`
`71`	`71`	`read(pixel, s, t);`
`72`	`72`	`write(pixel, s, t);`