From a41fec9569296c12230309b5133e4cab482bd68a Mon Sep 17 00:00:00 2001
From: Daniel Emminizer <3845830+emminizer@users.noreply.github.com>
Date: Fri, 10 Jan 2025 08:13:59 -0500
Subject: [PATCH] MetaTile: Fixed erroneous typename usage (#2685)
---
src/osgEarth/MetaTile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/osgEarth/MetaTile b/src/osgEarth/MetaTile
index cdf6a0ec47..e35c1cee01 100644
--- a/src/osgEarth/MetaTile
+++ b/src/osgEarth/MetaTile
@@ -176,8 +176,8 @@ namespace osgEarth { namespace Util
osg::Matrix _scale_bias; // scale/bias matrix of _centerKey
unsigned _width, _height;
- typename Tile* getTile(int tx, int ty);
- bool getTileAndPixelCoords(double u, double v, typename Tile*& tile, double& s, double& t);
+ Tile* getTile(int tx, int ty);
+ bool getTileAndPixelCoords(double u, double v, Tile*& tile, double& s, double& t);
};
template<typename T>
@@ -452,7 +452,7 @@ namespace osgEarth { namespace Util
int ty = (int)v;
// Anchor:
- typename Tile* p00_tile = getTile(tx, ty);
+ Tile* p00_tile = getTile(tx, ty);
if (!p00_tile)
return false;
@@ -485,7 +485,7 @@ namespace osgEarth { namespace Util
}
// Neighbors:
- typename Tile* p10_tile = p00_tile;
+ Tile* p10_tile = p00_tile;
double p10_s = p00_s + delta_s, p10_t = p00_t;
if (p10_s >= (double)_width || p10_s < 0)
{
@@ -493,7 +493,7 @@ namespace osgEarth { namespace Util
p10_s -= (double)_width * delta_s;
}
- typename Tile* p01_tile = p00_tile;
+ Tile* p01_tile = p00_tile;
double p01_s = p00_s, p01_t = p00_t + delta_t;
if (p01_t >= _height || p01_t < 0)
{
@@ -501,7 +501,7 @@ namespace osgEarth { namespace Util
p01_t -= (double)_height * (double)delta_t;
}
- typename Tile* p11_tile = p00_tile;
+ Tile* p11_tile = p00_tile;
double p11_s = p00_s + delta_s, p11_t = p00_t + delta_t;
int ntx = tx, nty = ty;
if (p11_s >= (double)_width || p11_s < 0)